Changeset 2055 for GTP/trunk/Lib/Illum
- Timestamp:
- 01/24/07 21:45:00 (18 years ago)
- Location:
- GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderTechniques/OgreCausticRecieverRenderTechnique.cpp
r1722 r2055 44 44 45 45 GpuProgramParameters* Vparams = newpass->getVertexProgramParameters().getPointer(); 46 Vparams->setNamedAutoConstant(" worldViewProj",46 Vparams->setNamedAutoConstant("WorldViewProj", 47 47 GpuProgramParameters::ACT_WORLDVIEWPROJ_MATRIX); 48 Vparams->setNamedAutoConstant(" world",48 Vparams->setNamedAutoConstant("World", 49 49 GpuProgramParameters::ACT_WORLD_MATRIX); 50 50 GpuProgramParameters* Fparams = newpass->getFragmentProgramParameters().getPointer(); … … 159 159 //reset parameters 160 160 maxcasters = 1; 161 causticVertexProgram = "G ameTools/Caustic/DefaultVS";162 causticFragmentProgram = "G ameTools/Caustic/DefaultPS";161 causticVertexProgram = "GTP/Basic/Shaded_VS"; 162 causticFragmentProgram = "GTP/Caustic/GatherCaustic_Cube_PS"; 163 163 164 164 parseParams(params); -
GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderingRuns/OgreCubeMapRenderingRun.cpp
r1930 r2055 84 84 { 85 85 setMaterialForVisibles(environmentMaterial, cam); 86 sm->_queueSkiesForRendering(cam);86 //sm->_queueSkiesForRendering(cam); 87 87 } 88 88 else -
GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/RenderingRuns/OgreReducedCubeMapRenderingRun.cpp
r1055 r2055 37 37 ->getRenderTarget(); 38 38 39 Material* mat = (Material*) MaterialManager::getSingleton().getByName("G ameTools/CubeMap/Reduce").getPointer();39 Material* mat = (Material*) MaterialManager::getSingleton().getByName("GTP/Diffuse/ReduceCubeMap").getPointer(); 40 40 GpuProgramParametersSharedPtr fpParams = mat->getTechnique(0)->getPass(0)->getFragmentProgramParameters(); 41 41 fpParams->setNamedConstant("nFace",facenum); 42 42 // mat->getTechnique(0)->getPass(0)->setFragmentProgramParameters(fpParams); 43 43 44 renderFullscreenQuad("G ameTools/CubeMap/Reduce", rt);44 renderFullscreenQuad("GTP/Diffuse/ReduceCubeMap", rt); 45 45 46 46 //rt->writeContentsToFile("cubbereduce" + StringConverter::toString(facenum) + ".dds"); … … 94 94 void OgreReducedCubeMapRenderingRun::colorCubeMapChanged(String& newMapName) 95 95 { 96 Material* mat = (Material*) MaterialManager::getSingleton().getByName("G ameTools/CubeMap/Reduce").getPointer();96 Material* mat = (Material*) MaterialManager::getSingleton().getByName("GTP/Diffuse/ReduceCubeMap").getPointer(); 97 97 mat->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName(newMapName); 98 98 /*
Note: See TracChangeset
for help on using the changeset viewer.