Changeset 949 for GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src

Timestamp:

05/11/06 10:19:54 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• OgreIlluminationManager.cpp (modified) (3 diffs)
• OgreSharedRuns.cpp (modified) (1 diff)
• RenderTechniques/OgreCausticCasterRenderTechnique.cpp (modified) (2 diffs)
• RenderTechniques/OgreCausticRecieverRenderTechnique.cpp (modified) (1 diff)
• RenderTechniques/OgreDepthShadowRecieverRenderTechnique.cpp (modified) (1 diff)
• RenderingRuns/OgreCausticCubeMapRenderingRun.cpp (modified) (3 diffs)
• RenderingRuns/OgrePhotonMapRenderingRun.cpp (modified) (2 diffs)

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

@@ -158 +158 @@
 }
 
+void OgreIlluminationManager::initTechniques(Entity* e)
+{
+        OgreSharedRuns* sharedruns = 0;
+        
+        for(unsigned int s = 0; s < e->getNumSubEntities(); s++)
+        {
+                SubEntity* sube = e->getSubEntity(s);
+
+                Material* mat = sube->getMaterial().getPointer();
+                
+                OgreRenderable* rend = 0;       
+                OgreTechniqueGroup* group = 0;
+        
+                for(unsigned int t = 0 ; t < mat->getNumTechniques() ; t++)
+                {
+                        Technique* tech = mat->getTechnique(t);
+
+                        for(unsigned int p = 0; p< tech->getNumPasses(); p++)
+                        {
+                                Pass* pass = tech->getPass(p);
+
+                                std::vector<IllumTechniqueParams*>& techniques = pass->getIllumTechniques();
+                                std::vector<IllumTechniqueParams*>::iterator i = techniques.begin(); 
+                                std::vector<IllumTechniqueParams*>::iterator iend = techniques.end();
+                                
+                                while( i != iend)
+                                {
+                                        IllumTechniqueParams* params = *i;
+                                        
+                                        if(rend == 0)
+                                        {
+                                                rend = new OgreRenderable(e, s);
+                                                group = new OgreTechniqueGroup();
+                                                sube->setRenderTechniqueGroup(group);                                                   
+                                                
+                                                if( sharedruns == 0)
+                                                {                                                                       
+                                                        sharedruns  = new OgreSharedRuns();
+                                                        addSharedRuns(sharedruns);
+                                                }
+
+                                                group->addSharedRun(sharedruns);
+                                                sharedruns->addRenderable(rend);
+                                                sharedruns->updateBounds();
+                                        }
+                                        
+                                        createTechnique(params, pass, rend, sharedruns); 
+
+                                        i++;
+                                }
+                        }
+                }
+        }
+
+                
+}
 
 void OgreIlluminationManager::initTechniques()
@@ -170 +226 @@
                         Entity* e = (Entity*) o;
 
-                        OgreSharedRuns* sharedruns = 0;
+                /*      OgreSharedRuns* sharedruns = 0;
                         
                         for(unsigned int s = 0; s < e->getNumSubEntities(); s++)
@@ -222 +278 @@
                         }
 
+                */
+                        initTechniques(e);
                 }
         }

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

@@ -36 +36 @@
                 sharedRuns[runType]->update(frameNum);
         */
-        getRun(runType)->update(frameNum);
+        RenderingRun* run = getRun(runType);
+        
+        if(run->update(frameNum))
+                runUpdated(runType, run);
 }
 

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

@@ -23 +23 @@
 {       
         this->photonMapMaterialName = photonMapMaterialName;
-        this->causticMapMaterialName = causticMapMaterialName;
+        
+        String newMaterialName = causticMapMaterialName + parentRenderable->getName() + "_clone";
+        Material* mat = (Material*) MaterialManager::getSingleton().getByName(causticMapMaterialName).getPointer();
+        Material* newMat = mat->clone(newMaterialName).getPointer();
+        this->causticMapMaterialName = newMat->getName();
+        //this->causticMapMaterialName =causticMapMaterialName;
+                
         this->photonMapTexID = photonMapTexID;
         
@@ -63 +69 @@
         }
 }
-
+void OgreCausticCasterRenderTechnique::distanceCubeMapRunUpdated(RenderingRun* run)
+{
+        if(useDistance)
+        {
+                OgrePhotonMapRenderingRun* photonrun = (OgrePhotonMapRenderingRun*) 
+                                        sharedRuns->getRun(ILLUMRUN_PHOTONMAP)->asOgreRenderingRun();
+                photonrun->distanceCubeMapUpdated(sharedRuns->getRun(ILLUMRUN_DISTANCE_CUBEMAP));
+        }
+}
 void OgreCausticCasterRenderTechnique::causticCubeMapRunChanged(RenderingRun* run)
 {

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

@@ -58 +58 @@
 
                 newpass->setSceneBlending(SBF_DEST_COLOUR, SBF_ONE);
+                newpass->setDepthBias(5);
                 //newpass->setSceneBlending(SBT_ADD);
                 

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

@@ -54 +54 @@
 
                 newpass->setSceneBlending(SBT_MODULATE);
-                
+                newpass->setDepthBias(5);
                 techn->movePass(lastpass, index);                       
         }

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

@@ -21 +21 @@
         this->materialName =  materialName;
         this->photonMapTexId = photonMapTexId;
+
+        spriteSetName = name + String("_pixelSpriteSet");
         
         createCausticCubeMap();
@@ -40 +42 @@
         String photonMapName = ((OgrePhotonMapRenderingRun*) run->asOgreRenderingRun())->getPhotonMapTextureName();
         mat->getTechnique(0)->getPass(0)->getTextureUnitState(photonMapTexId)->setTextureName(photonMapName);
+
+        //rt = TextureManager::getSingleton().getByName(photonMapName);
+        LogManager::getSingleton().logMessage(LML_NORMAL, name + " map: " + photonMapName + " material: " + mat->getName());
 }
 
@@ -59 +64 @@
         renderPixelSprites(materialName, rt, tex->getWidth(), tex->getHeight());
 
-        //rt->writeContentsToFile("caucube" + StringConverter::toString(facenum) + ".dds");
+        //rt->writeContentsToFile("caucube" + this->name + StringConverter::toString(facenum) + ".dds");
 }
 

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

@@ -78 +78 @@
         static int framecount = 0;
         String filename = "photon";
-        filename.append(StringConverter::toString(framecount));
+        filename.append(this->name);
+        //filename.append(StringConverter::toString(framecount));
         filename.append(".png");
         rt->writeContentsToFile(filename);
@@ -135 +136 @@
         mat->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName(cubemapname);
 }
+
+void OgrePhotonMapRenderingRun::distanceCubeMapUpdated(RenderingRun* run)
+{
+        Material* mat = (Material*) MaterialManager::getSingleton().getByName(materialName).getPointer();
+        OgreDistanceCubeMapRenderingRun* cuberun =(OgreDistanceCubeMapRenderingRun*) (run->asOgreRenderingRun());
+        String cubemapname = cuberun->getDistanceCubeMapTextureName();
+        GpuProgramParametersSharedPtr fpParams = mat->getTechnique(0)->getPass(0)->getFragmentProgramParameters();
+        Vector3 center = ((OgreSharedRuns*) sharedRuns)->getRootPosition(ILLUMRUN_DISTANCE_CUBEMAP);
+        fpParams->setNamedConstant("lastCenter",center);
+}