Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 776 vs 777 for /trunk/Source Code/Geometry/Material/Material.cpp

Diff revisions: vs.
  @@ -491,7 +491,7 @@
491 491 if (crtTexture && crtTexture->flushTextureState()) {
492 492 TextureData& data = crtTexture->getData();
493 493 data.setHandleLow(slotValue);
494 - vectorAlg::emplace_back(container, data);
494 + container.addTexture(data);
495 495 }
496 496 }
497 497
  @@ -499,7 +499,6 @@
499 499 const U32 textureCount = to_const_uint(ShaderProgram::TextureUsage::COUNT);
500 500
501 501 if (!GFX_DEVICE.isDepthStage()) {
502 - textureData.reserve(textureCount + _customTextures.size());
503 502 getTextureData(ShaderProgram::TextureUsage::UNIT0, textureData);
504 503 getTextureData(ShaderProgram::TextureUsage::UNIT1, textureData);
505 504 getTextureData(ShaderProgram::TextureUsage::OPACITY, textureData);
  @@ -510,12 +509,12 @@
510 509
511 510 for (std::pair<Texture_ptr, U8>& tex : _customTextures) {
512 511 if (tex.first->flushTextureState()) {
513 - textureData.push_back(tex.first->getData());
514 - textureData.back().setHandleLow(to_uint(tex.second));
512 + TextureData& data = tex.first->getData();
513 + data.setHandleLow(to_uint(tex.second));
514 + textureData.addTexture(data);
515 515 }
516 516 }
517 517 } else {
518 - textureData.reserve(2);
519 518 getTextureData(ShaderProgram::TextureUsage::NORMALMAP, textureData);
520 519 switch(_translucencySource) {
521 520 case TranslucencySource::OPACITY_MAP : {