Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 749 vs 750 for /trunk/Source Code/Geometry/Material/Material.cpp

Diff revisions: vs.
  @@ -85,15 +85,14 @@
85 85 }
86 86
87 87 bool Material::frameStarted(const FrameEvent& evt) {
88 - _shadersComputedThisFrame = false;
89 - _totalShaderComputeCountThisFrame = 0;
90 -
91 88 return true;
92 89 }
93 90
94 91 bool Material::frameEnded(const FrameEvent& evt) {
95 92 if (_shadersComputedThisFrame) {
96 93 _totalShaderComputeCount += _totalShaderComputeCountThisFrame;
94 + _totalShaderComputeCountThisFrame = 0;
95 + _shadersComputedThisFrame = false;
97 96 }
98 97
99 98 return true;
  @@ -340,12 +339,12 @@
340 339 }
341 340
342 341
343 - void Material::defaultReflectionTexture(Texture_ptr reflectionPtr, U32 arrayIndex) {
342 + void Material::defaultReflectionTexture(const Texture_ptr& reflectionPtr, U32 arrayIndex) {
344 343 _defaultReflection.first = reflectionPtr;
345 344 _defaultReflection.second = arrayIndex;
346 345 }
347 346
348 - void Material::defaultRefractionTexture(Texture_ptr refractionPtr, U32 arrayIndex) {
347 + void Material::defaultRefractionTexture(const Texture_ptr& refractionPtr, U32 arrayIndex) {
349 348 _defaultRefraction.first = refractionPtr;
350 349 _defaultRefraction.second = arrayIndex;
351 350 }