Changeset 2379

Timestamp:

05/16/07 08:37:09 (17 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule

Files:

• include/OgreIlluminationManager.h (modified) (2 diffs)
• include/OgreRenderingRun.h (modified) (2 diffs)
• include/RenderingRuns/OgreDepthShadowMapRenderingRun.h (modified) (2 diffs)
• include/RenderingRuns/OgreSceneCameraDepthRenderingRun.h (modified) (1 diff)
• src/OgreIlluminationManager.cpp (modified) (2 diffs)
• src/OgreRenderingRun.cpp (modified) (2 diffs)
• src/OgreSharedRuns.cpp (modified) (1 diff)
• src/RenderTechniques/OgreFireRenderTechnique.cpp (modified) (1 diff)
• src/RenderTechniques/OgreSBBRenderTechnique.cpp (modified) (1 diff)
• src/RenderingRuns/OgreDepthShadowMapRenderingRun.cpp (modified) (9 diffs)
• src/RenderingRuns/OgreSceneCameraDepthRenderingRun.cpp (modified) (3 diffs)

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/include/OgreIlluminationManager.h

@@ -4 +4 @@
 #include "OgreTechniqueGroup.h"
 #include "OgreRenderable.h"
-#include "OgreColorCubeMapRenderTechnique.h"
-#include "OgreDistanceCubeMapRenderTechnique.h"
-#include "OgreConvolvedCubeMapRenderTechnique.h"
-#include "OgreCausticCasterRenderTechnique.h"
-#include "OgreCausticReceiverRenderTechnique.h"
-#include "OgreSceneCameraDepthRenderingRun.h"
-#include "OgreSBBRenderTechnique.h"
-#include "OgreDepthShadowMapRenderingRun.h"
-#include "OgreDepthShadowReceiverRenderTechnique.h"
-#include "OgreFireRenderTechnique.h"
-#include "OgreHierarchicalParticleSystemTechnique.h"
-#include "OgreIllumVolumeRenderTechnique.h"
-#include "OgrePhaseTextureRenderingRun.h"
-#include "OgrePathMapRenderTechnique.h"
 
 
@@ -680 +666 @@
                 @brief Sets the fire rendertarget - frame buffer resolution ratio
         */
-        void setFireRenderTargetSize(int size){FireRenderTarget::targetsize = size;}
+        inline void setFireRenderTargetSize(int size);
 
         void freeAllResources();

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/include/OgreRenderingRun.h

@@ -9 +9 @@
         @brief Base class of a RenderingRun in an OGRE environment.     
 */
-class OgreRenderingRun : virtual public RenderingRun
+class OgreRenderingRun : virtual public RenderingRun, public RenderQueue::RenderableListener
 {       
         friend class OgreIlluminationManager;
@@ -33 +33 @@
         */
         OgreRenderingRun* asOgreRenderingRun(){return this;}
+        //inherited
+        bool  renderableQueued (Renderable *rend, uint8 groupID, ushort priority, Technique **ppTech){return true;}
 
 protected:

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/include/RenderingRuns/OgreDepthShadowMapRenderingRun.h

@@ -66 +66 @@
         void freeAllResources();
 
+        bool  renderableQueued (Renderable *rend, uint8 groupID, ushort priority, Technique **ppTech);
+
 protected:      
         /**
@@ -100 +102 @@
         Texture* blurredDepthMapTexture;
         Real lightFarPlane;
+        String triggerName;
         
         //inherited

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/include/RenderingRuns/OgreSceneCameraDepthRenderingRun.h

@@ -40 +40 @@
 
         void freeAllResources();
+
+        bool  renderableQueued (Renderable *rend, uint8 groupID, ushort priority, Technique **ppTech);
+
         
 protected:

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

@@ -6 +6 @@
 #include "OgrePMWeightComputeRenderingRun.h"
 #include "OgreTriggersRenderTechnique.h"
+#include "OgreColorCubeMapRenderTechnique.h"
+#include "OgreDistanceCubeMapRenderTechnique.h"
+#include "OgreConvolvedCubeMapRenderTechnique.h"
+#include "OgreCausticCasterRenderTechnique.h"
+#include "OgreCausticReceiverRenderTechnique.h"
+#include "OgreSceneCameraDepthRenderingRun.h"
+#include "OgreSBBRenderTechnique.h"
+#include "OgreDepthShadowMapRenderingRun.h"
+#include "OgreDepthShadowReceiverRenderTechnique.h"
+#include "OgreFireRenderTechnique.h"
+#include "OgreHierarchicalParticleSystemTechnique.h"
+#include "OgreIllumVolumeRenderTechnique.h"
+#include "OgrePhaseTextureRenderingRun.h"
+#include "OgrePathMapRenderTechnique.h"
+
 
 OgreIlluminationManager* OgreIlluminationManager::instance = NULL;
@@ -787 +802 @@
 }
 
+void OgreIlluminationManager::setFireRenderTargetSize(int size)
+{
+        FireRenderTarget::targetsize = size;
+}
+

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

@@ -43 +43 @@
                                 if(triggerName != "")//we have a trigger here
                                 {
-                                        OgreTechniqueGroup* tg = (OgreTechniqueGroup*)rend->getRenderTechniqueGroup();
-                                        if(tg)
+                                        OgreTechniqueGroup* TG = (OgreTechniqueGroup*)rend->getRenderTechniqueGroup();
+                                        if(TG)
                                         {
-                                                String triggeredMaterial = tg->getMaterialNameForTrigger(triggerName);
+                                                String triggeredMaterial = TG->getMaterialNameForTrigger(triggerName);
                                                 if(triggeredMaterial != "")//a trigger is associated
                                                         materialToSet = triggeredMaterial;
@@ -69 +69 @@
                                 if(triggerName != "")//we have a trigger here
                                 {
-                                        String triggeredMaterial = 
-                                                ((OgreTechniqueGroup*)rend->getRenderTechniqueGroup())
-                                                        ->getMaterialNameForTrigger(triggerName);
-                                        if(triggeredMaterial != "")//a trigger is associated
-                                                materialToSet = triggeredMaterial;
+                                        OgreTechniqueGroup* TG = (OgreTechniqueGroup*)rend->getRenderTechniqueGroup();
+                                        if(TG)
+                                        {
+                                                String triggeredMaterial = TG->getMaterialNameForTrigger(triggerName);
+                                                if(triggeredMaterial != "")//a trigger is associated
+                                                        materialToSet = triggeredMaterial;
+                                        }
                                 }                               
                                 rend->setMaterialName(materialToSet);

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

@@ -1 +1 @@
 #include "..\include\OgreSharedRuns.h"
 #include "OgreIlluminationManager.h"
+#include "OgreRenderingRun.h"
 
 void OgreSharedRuns::freeAllResources()

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderTechniques/OgreFireRenderTechnique.cpp

@@ -2 +2 @@
 #include "OgreTechniqueGroup.h"
 #include "OgreIlluminationManager.h"
+#include "OgreSceneCameraDepthRenderingRun.h"
 
 int FireRenderTarget::targetsize = 2;

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderTechniques/OgreSBBRenderTechnique.cpp

@@ -2 +2 @@
 #include "OgreTechniqueGroup.h"
 #include "OgreIlluminationManager.h"
+#include "OgreSceneCameraDepthRenderingRun.h"
 
 

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

@@ -75 +75 @@
 }
 
+bool  OgreDepthShadowMapRenderingRun::renderableQueued (Renderable *rend, uint8 groupID, ushort priority, Technique **ppTech)
+{
+        OgreTechniqueGroup* TG = (OgreTechniqueGroup*) rend->getRenderTechniqueGroup();
+        if(TG)
+        {
+                String materialToSet = materialName;
+                String triggeredMaterial = TG->getMaterialNameForTrigger(triggerName);
+                if(triggeredMaterial != "")//a trigger is associated
+                        materialToSet = triggeredMaterial;
+                Technique* techn = ((Material*)MaterialManager::getSingleton().getByName(       materialToSet ).getPointer())->getTechnique(0);
+                *ppTech = techn;        
+        }
+        return true;
+}
+
 void OgreDepthShadowMapRenderingRun::updateFrame(unsigned long frameNum)
 {
         refreshLight(frameNum);
 
+        RenderQueue* rq = Root::getSingleton()._getCurrentSceneManager()->getRenderQueue();             
+        rq->setRenderableListener(this);
+
         if(light->getType() == Light::LT_POINT)
-        {
-                //static int currentFace = 0;
-                //updateDepthCubeFace(currentFace);
-                //currentFace = (currentFace+1)%6;
+        {               
                 
-
-                //Timer* t = Root::getSingleton().getTimer();
-                //unsigned long  start =  t->getMicroseconds();         
-                //setMaterialForRenderables(materialName, true);                                
-                //unsigned long  end =  t->getMicroseconds();
-                //double elapsed = (double) (end - start) / 1000.0;
-                //LogManager::getSingleton().logMessage(String("MaterialSetTime: ") + name + " : " + StringConverter::toString(Real(elapsed)) + " ms");
-                //visibleObjects.clear();
-
                 for(int i = 0; i < 6 ; i++)
-                        updateDepthCubeFace(i);
-
-                //start =  t->getMicroseconds();
-                
-                restoreMaterials();
-
-                //end =  t->getMicroseconds();
-                //elapsed = (double) (end - start) / 1000000.0;
-                //LogManager::getSingleton().logMessage(String("MaterialRestoreTime: ") + name + " : " +  StringConverter::toString(Real(elapsed)) + " ms");    
+                        updateDepthCubeFace(i);         
+
+                //restoreMaterials();
         }
         else
@@ -109 +109 @@
                 updateDepthMap();
         }       
+
+        rq->setRenderableListener(0);
 }
 
@@ -114 +116 @@
 {       
         Vector3 lightpos = light->getDerivedPosition();                 
-        String triggerName = "ILLUM_TRIGGER_SM_POINT";  
                 
         RenderTarget* rt = depthMapTexture->getBuffer(facenum, 0).getPointer()->getRenderTarget();      
@@ -122 +123 @@
         
         
-        setMaterialForVisibles(materialName, cam, true, false, triggerName);
+        //setMaterialForVisibles(materialName, cam, true, false, triggerName);
         
         rt->update();
@@ -144 +145 @@
 void OgreDepthShadowMapRenderingRun::updateDepthMap()
 {
-        String triggerName;
-        switch(light->getType())
-        {
-        case Light::LT_DIRECTIONAL:
-                triggerName = "ILLUM_TRIGGER_SM_DIRECTIONAL";
-                break;
-        case Light::LT_SPOTLIGHT:
-                triggerName = "ILLUM_TRIGGER_SM_SPOT";
-                break;  
-        }
-        setMaterialForVisibles(materialName, depthMapCamera, true, false, triggerName); 
+        
         RenderTarget* rt = depthMapTexture->getBuffer().getPointer()->getRenderTarget();        
         Viewport* vp = rt->getViewport(0);
         
+        //setMaterialForVisibles(materialName, depthMapCamera, true, false, triggerName);       
+        
         rt->update();
-        restoreMaterials();
+        
+        //restoreMaterials();
         
         if(OgreIlluminationManager::getSingleton().getBlurShadowMap(light->getType()))
@@ -184 +178 @@
 void OgreDepthShadowMapRenderingRun::refreshLight(unsigned long frameNum)
 {
-        
         if(light!= 0)
         {
@@ -191 +184 @@
                 if(light->getType() == Light::LT_DIRECTIONAL)
                 {
+                        triggerName = "ILLUM_TRIGGER_SM_DIRECTIONAL";
                         Camera* viewcam = OgreIlluminationManager::getSingleton().getMainCamera();                      
                         
@@ -296 +290 @@
                 else if(light->getType() == Light::LT_SPOTLIGHT)
                 {
+                        triggerName = "ILLUM_TRIGGER_SM_SPOT";
                         Camera* viewcam = OgreIlluminationManager::getSingleton().getMainCamera();                      
                         
@@ -428 +423 @@
                 {
                         lightFarPlane = light->getAttenuationRange();
+                        triggerName = "ILLUM_TRIGGER_SM_POINT";         
                         //no other adjustment needed                    
                 }

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

@@ -1 +1 @@
 #include "OgreSceneCameraDepthRenderingRun.h"
+#include "OgreTechniqueGroup.h"
 
 
@@ -40 +41 @@
 }
 
+bool  OgreSceneCameraDepthRenderingRun::renderableQueued (Renderable *rend, uint8 groupID, ushort priority, Technique **ppTech)
+{
+        if((*ppTech)->isTransparent())
+                return false;
+
+        OgreTechniqueGroup* TG = (OgreTechniqueGroup*) rend->getRenderTechniqueGroup();
+        if(TG)
+        {
+                String materialToSet = String("GTP/Basic/CameraDepth");
+                String triggeredMaterial = TG->getMaterialNameForTrigger("ILLUM_TRIGGER_CAMERADEPTH");
+                if(triggeredMaterial != "")//a trigger is associated
+                        materialToSet = triggeredMaterial;
+                Technique* techn = ((Material*)MaterialManager::getSingleton().getByName(       materialToSet ).getPointer())->getTechnique(0);
+                *ppTech = techn;        
+        }
+        return true;
+}
+
 void OgreSceneCameraDepthRenderingRun::updateFrame(unsigned long frameNum)
 {
         
-        setMaterialForVisibles(String("GTP/Basic/CameraDepth"), playerCamera, false, true, "ILLUM_TRIGGER_CAMERADEPTH");
-        
+        //setMaterialForVisibles(String("GTP/Basic/CameraDepth"), playerCamera, false, true, "ILLUM_TRIGGER_CAMERADEPTH");
+        RenderQueue* rq = Root::getSingleton()._getCurrentSceneManager()->getRenderQueue();             
+        rq->setRenderableListener(this);
+
         RenderTarget* rt = depthTexture->getBuffer().getPointer()->getRenderTarget();
 
@@ -60 +81 @@
         //rt->writeContentsToFile("cameraDepth.bmp");
         
-        restoreMaterials();
+        //restoreMaterials();
 
         sharedRuns->getRoot()->restoreVisibility();
+        rq->setRenderableListener(0);
 }