Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 330 vs 331 for /trunk/Source Code/Rendering/Lighting/Light.cpp

Diff revisions: vs.
  @@ -32,7 +32,7 @@
32 32 }
33 33 _shadowProperties._floatValues.set(-1.0f);
34 34
35 - _shadowCamera = New FreeFlyCamera();
35 + _shadowCamera = MemoryManager_NEW FreeFlyCamera();
36 36 _shadowCamera->setMoveSpeedFactor(0.0f);
37 37 _shadowCamera->setTurnSpeedFactor(0.0f);
38 38 _shadowCamera->setFixedYawAxis(true);
  @@ -66,7 +66,7 @@
66 66 return true;
67 67 }
68 68
69 - //SAFE_DELETE(_shadowCamera); <-- deleted by the camera manager
69 + //DELETE(_shadowCamera); <-- deleted by the camera manager
70 70 LightManager::getInstance().removeLight(getGUID());
71 71
72 72 removeShadowMapInfo();
  @@ -200,7 +200,8 @@
200 200 _impostor->renderState().setDrawState( true );
201 201 _lightSGN->addNode( _impostor )->setActive( true );
202 202 }
203 - Material* const impostorMaterialInst = _lightSGN->getChildren().begin()->second->getComponent<RenderingComponent>()->getMaterialInstance();
203 + SceneGraphNode* impostorSGN = _lightSGN->getChildren().begin()->second;
204 + Material* const impostorMaterialInst = impostorSGN->getComponent<RenderingComponent>()->getMaterialInstance();
204 205 impostorMaterialInst->setDiffuse(getDiffuseColor());
205 206 impostorMaterialInst->setAmbient(getDiffuseColor());
206 207
  @@ -215,7 +216,7 @@
215 216 }
216 217
217 218 bool Light::removeShadowMapInfo(){
218 - MemoryManager::SAFE_DELETE( _shadowMapInfo );
219 + MemoryManager::DELETE( _shadowMapInfo );
219 220 return true;
220 221 }
221 222 void Light::updateResolution(I32 newWidth, I32 newHeight){