Changeset 2265

Timestamp:

03/19/07 16:53:07 (17 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/Lib/Illum/IllumModule

Files:

• IllumModule/src/RenderingRuns/CubeMapRenderingRun.cpp (modified) (2 diffs)
• OgreIllumModule/src/OgreIlluminationManager.cpp (modified) (1 diff)
• OgreIllumModule/src/OgreRenderingRun.cpp (modified) (1 diff)
• OgreIllumModule/src/OgreSharedRuns.cpp (modified) (1 diff)
• OgreIllumModule/src/RenderTechniques/OgreCausticCasterRenderTechnique.cpp (modified) (1 diff)
• OgreIllumModule/src/RenderTechniques/OgreCausticRecieverRenderTechnique.cpp (modified) (2 diffs)
• OgreIllumModule/src/RenderTechniques/OgreDistanceCubeMapRenderTechnique.cpp (modified) (1 diff)
• OgreIllumModule/src/RenderingRuns/OgreCubeMapRenderingRun.cpp (modified) (1 diff)
• OgreIllumModule/src/RenderingRuns/OgreFocusingMapRenderingRun.cpp (modified) (1 diff)

GTP/trunk/Lib/Illum/IllumModule/IllumModule/src/RenderingRuns/CubeMapRenderingRun.cpp

@@ -29 +29 @@
 void CubeMapRenderingRun::updateFrame(unsigned long frameNum)
 {
-        if(updateAllFace)
+        if(updateAllFace || updateInterval == 0)
         {
                 for(int i=0;i<6;i++)
@@ -38 +38 @@
         else
         {
-                if(lastupdated == 0 && updateInterval == 0)
-                {
-                        for(int i=0;i<6;i++)
-                        {
-                                updateCubeFace(i);
-                        }
-                }
-                else
-                {
-                        if(faceNeedsUpdate(currentFace))
-                                updateCubeFace(currentFace);
+                if(faceNeedsUpdate(currentFace))
+                        updateCubeFace(currentFace);
 
-                        currentFace = (currentFace + 1) % 6;
-                }
+                currentFace = (currentFace + 1) % 6;            
         }
 }

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

@@ -430 +430 @@
                 fillVisibleList(rq);    
 
-//              int l = visibleObjects.size(); //debug
+                int l = visibleObjects.size(); //debug
                 
                 joinSharedRuns();
 
-//              int ll = sharedRunRoots.size(); //debug
+                int ll = sharedRunRoots.size(); //debug
 
                 //update precomputings                          

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

@@ -111 +111 @@
                 rt->setAutoUpdated(false);
                 v->setBackgroundColour(clearColor);
+                Root::getSingleton()._getCurrentSceneManager()->getRenderQueue()->clear();
+                Root::getSingleton()._getCurrentSceneManager()->setFindVisibleObjects(false);
+        rt->update();
+                Root::getSingleton()._getCurrentSceneManager()->setFindVisibleObjects(true);
                 
                 Root::getSingleton().getRenderSystem()->_setViewport(v);

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

@@ -67 +67 @@
                 sharedRuns[runType]->update(frameNum);
         */
-        RenderingRun* run = getRun(runType);
+        RenderingRun* run = getRoot(runType)->getRun(runType);
         
         if(run->update(frameNum))

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

@@ -256 +256 @@
         photonMapResolution = 64;
         causticCubeMapResolution = 128; 
-        photonMapMaterialName = "GameTools/PhotonMapCaustic";
-        causticMapMaterialName = "GameTools/Cau";
+        photonMapMaterialName = "GTP/Caustic/PhotonMap_HitEnv";
+        causticMapMaterialName = "GTP/Caustic/CauCube_PointSprite";
         photonMapTexID = 0;
         useDistance = true;

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

@@ -49 +49 @@
                                                                         GpuProgramParameters::ACT_WORLD_MATRIX);
                 GpuProgramParameters* Fparams = newpass->getFragmentProgramParameters().getPointer();
-                Fparams->setNamedConstant("cubeMapCameraPosition", Vector3(0,0,0));
+                //Fparams->setNamedConstant("cubeMapCameraPosition", Vector3(0,0,0));
 
                 TextureUnitState* st = newpass->createTextureUnitState();
@@ -59 +59 @@
                 newpass->setSceneBlending(SBF_DEST_COLOUR, SBF_ONE);
                 //newpass->setSceneBlending(SBF_ONE, SBF_ZERO);
-                newpass->setDepthBias(5);
+                newpass->setDepthBias(1);
                 //newpass->setSceneBlending(SBT_ADD);
                 

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

@@ -105 +105 @@
         OgreCubeMapRenderTechniqueFactory::resetParams();
         texID = 1;
-        environmentMaterial = "GameTools/DistanceShader";
-        selfMaterial = "GameTools/DistanceShader";
+        environmentMaterial = "GTP/Basic/Distance";
+        selfMaterial = "GTP/Basic/Distance";
         OgreCubeMapRenderTechniqueFactory::parseParams(params); 
         parseParams(params);

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

@@ -83 +83 @@
                         if(useEnvMaterial)
                         {
-/////////////////////////////////////////////////////////////////
-////   DEBUG
-/////////////////////////////////////////////////////////////////
-/*              Camera* camm = new Camera("tempCAm", sm);
-                TexturePtr texPtr = Ogre::TextureManager::getSingleton().createManual(  "tempRT", 
-                                                                                                                                                        "default",
-                                                                                                                                                        TEX_TYPE_2D,
-                                                                                                                                                        256,
-                                                                                                                                                        256,
-                                                                                                                                                        0,
-                                                                                                                                                        0,
-                                                                                                                                                        PF_FLOAT16_RGBA,
-                                                                                                                                                        TU_RENDERTARGET);
-                camm->setPosition(0,50,0);
-                camm->setAspectRatio(1);
-                camm->setFOVy(Radian(Degree(90)));
-                camm->setNearClipDistance(0.1);
-                camm->setFarClipDistance(1000);
-                Texture* result = texPtr.getPointer();
-                HardwarePixelBuffer* hpb = (result->getBuffer()).getPointer();
-                RenderTarget* rt = hpb->getRenderTarget(0);
-                Viewport* v = rt->addViewport(camm);
-                v->setOverlaysEnabled(false);
-                rt->setAutoUpdated(false);
-                
-                int cnt = sm->_findVisibleObjectsOC(camm, v, false, true, false);
-                int cnt2 = sm->_findVisibleObjectsOC(cam, v, false, true, false);
-                int cnt3 = sm->_findVisibleObjectsOC(camm, cam->getViewport(), false, true, false);
-                int cnt3 = sm->_findVisibleObjectsOC(cam, cam->getViewport(), false, true, false);*/
-///////////////////////////////////////////////////
                                 setMaterialForVisibles(environmentMaterial, cam);
                                 //sm->_queueSkiesForRendering(cam);                             

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

@@ -106 +106 @@
         
         
-        MaterialPtr mat = MaterialManager::getSingleton().getByName("GameTools/FocusingShader");
+        MaterialPtr mat = MaterialManager::getSingleton().getByName("GTP/Basic/Focusing");
         GpuProgramParameters* Vparams = mat->getTechnique(0)->getPass(0)->getVertexProgramParameters().getPointer();
-        Vparams->setNamedConstant("lightTransform", lightMatrix);
+        Vparams->setNamedConstant("LightViewProj", lightMatrix);
                 
-        setMaterialForVisibles(String("GameTools/FocusingShader"), camera);
+        setMaterialForVisibles(String("GTP/Basic/Focusing"), camera);
 
         RenderTarget* rt = focusingTexture->getBuffer().getPointer()->getRenderTarget();