Changeset 2410 for GTP/trunk/Lib

Timestamp:

06/05/07 14:26:57 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src

Files:

• OgreRenderingRun.cpp (modified) (1 diff)
• RenderingRuns/OgreDepthShadowMapRenderingRun.cpp (modified) (7 diffs)
• RenderingRuns/OgrePMWeightComputeRenderingRun.cpp (modified) (1 diff)

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/OgreRenderingRun.cpp

@@ -330 +330 @@
         sm->setFindVisibleObjects(false);
         target->update();
+        sm->getRenderQueue()->clear();
         sm->setFindVisibleObjects(lastFindVisible);
 }

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderingRuns/OgreDepthShadowMapRenderingRun.cpp

@@ -29 +29 @@
         {
                 depthMapTexture = createCubeRenderTexture(name, light->getPosition(), resolutionX,PF_FLOAT16_RGBA,0,ColourValue::White);
+                for(int i = 0; i < 6; i++)
+                        depthMapTexture->getBuffer(i, 0).getPointer()->getRenderTarget()->getViewport(0)->setSkiesEnabled(false);
+                
                 if(OgreIlluminationManager::getSingleton().getBlurShadowMap(light->getType()))
                 blurredDepthMapTexture = createCubeRenderTexture(blurredname, light->getPosition(), resolutionX,PF_FLOAT16_RGBA,0,ColourValue::White);
@@ -88 +91 @@
                 if(triggeredMaterial != "")//a trigger is associated
                         materialToSet = triggeredMaterial;
-        }
+        
+        }       
+        
         Technique* techn = ((Material*)MaterialManager::getSingleton().getByName(       materialToSet ).getPointer())->getTechnique(0);
         *ppTech = techn;        
@@ -97 +102 @@
 {
         refreshLight(frameNum);
-
-        RenderQueue* rq = Root::getSingleton()._getCurrentSceneManager()->getRenderQueue();             
-        rq->setRenderableListener(this);
-
+        
         if(light->getType() == Light::LT_POINT)
         {               
@@ -114 +116 @@
         }       
 
-        rq->setRenderableListener(0);
+        
 }
 
@@ -128 +130 @@
         
         //setMaterialForVisibles(materialName, cam, true, false, triggerName);
-        
+        RenderQueue* rq = Root::getSingleton()._getCurrentSceneManager()->getRenderQueue();             
+        rq->setRenderableListener(this);
+
         rt->update();
 
@@ -134 +138 @@
         
         //rt->writeContentsToFile("shadowmap_" + StringConverter::toString(facenum) + ".dds");
+
+        rq->setRenderableListener(0);
 
         if(OgreIlluminationManager::getSingleton().getBlurShadowMap(light->getType()))
@@ -154 +160 @@
         
         //setMaterialForVisibles(materialName, depthMapCamera, true, false, triggerName);       
-        
+        RenderQueue* rq = Root::getSingleton()._getCurrentSceneManager()->getRenderQueue();             
+        rq->setRenderableListener(this);
+
         rt->update();
         
         //restoreMaterials();
-        
+        rq->setRenderableListener(0);
+
         if(OgreIlluminationManager::getSingleton().getBlurShadowMap(light->getType()))
         {

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderingRuns/OgrePMWeightComputeRenderingRun.cpp

@@ -92 +92 @@
                         Vector3 lightPos = light->getDerivedPosition();
                         Vector3 lightDir = light->getDerivedDirection();
+                        lightDir.normalise();
                         Radian lightAngle = light->getSpotlightOuterAngle();