Changeset 2055

Timestamp:

01/24/07 21:45:00 (17 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• RenderTechniques/OgreCausticRecieverRenderTechnique.cpp (modified) (2 diffs)
• RenderingRuns/OgreCubeMapRenderingRun.cpp (modified) (1 diff)
• RenderingRuns/OgreReducedCubeMapRenderingRun.cpp (modified) (2 diffs)

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

@@ -44 +44 @@
                 
                 GpuProgramParameters* Vparams = newpass->getVertexProgramParameters().getPointer();
-                Vparams->setNamedAutoConstant("worldViewProj",
+                Vparams->setNamedAutoConstant("WorldViewProj",
                                                                         GpuProgramParameters::ACT_WORLDVIEWPROJ_MATRIX);
-                Vparams->setNamedAutoConstant("world",
+                Vparams->setNamedAutoConstant("World",
                                                                         GpuProgramParameters::ACT_WORLD_MATRIX);
                 GpuProgramParameters* Fparams = newpass->getFragmentProgramParameters().getPointer();
@@ -159 +159 @@
         //reset parameters
         maxcasters = 1;
-        causticVertexProgram = "GameTools/Caustic/DefaultVS";
-        causticFragmentProgram = "GameTools/Caustic/DefaultPS";
+        causticVertexProgram = "GTP/Basic/Shaded_VS";
+        causticFragmentProgram = "GTP/Caustic/GatherCaustic_Cube_PS";
 
         parseParams(params);

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

@@ -84 +84 @@
                         {
                                 setMaterialForVisibles(environmentMaterial, cam);
-                                sm->_queueSkiesForRendering(cam);                               
+                                //sm->_queueSkiesForRendering(cam);                             
                         }
                         else

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

@@ -37 +37 @@
                                                         ->getRenderTarget();
         
-        Material*  mat = (Material*) MaterialManager::getSingleton().getByName("GameTools/CubeMap/Reduce").getPointer();
+        Material*  mat = (Material*) MaterialManager::getSingleton().getByName("GTP/Diffuse/ReduceCubeMap").getPointer();
         GpuProgramParametersSharedPtr fpParams = mat->getTechnique(0)->getPass(0)->getFragmentProgramParameters(); 
         fpParams->setNamedConstant("nFace",facenum); 
 //      mat->getTechnique(0)->getPass(0)->setFragmentProgramParameters(fpParams); 
         
-        renderFullscreenQuad("GameTools/CubeMap/Reduce", rt);
+        renderFullscreenQuad("GTP/Diffuse/ReduceCubeMap", rt);
         
         //rt->writeContentsToFile("cubbereduce" + StringConverter::toString(facenum) + ".dds");
@@ -94 +94 @@
 void OgreReducedCubeMapRenderingRun::colorCubeMapChanged(String& newMapName)
 {
-        Material*  mat = (Material*) MaterialManager::getSingleton().getByName("GameTools/CubeMap/Reduce").getPointer();
+        Material*  mat = (Material*) MaterialManager::getSingleton().getByName("GTP/Diffuse/ReduceCubeMap").getPointer();
         mat->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName(newMapName);
 /*