Changeset 1644

Timestamp:

10/19/06 12:24:18 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule

Files:

• include/OgreRenderingRun.h (modified) (1 diff)
• scripts/OgreIllumModule.vcproj (modified) (4 diffs)
• src/OgreRenderingRun.cpp (modified) (5 diffs)

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

@@ -46 +46 @@
         */
         std::map<Renderable*, String> visibleObjects;
+        String terrainMaterial;
         /**
                 @brief fulls screen quad plane used in full screen quad rendering

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/scripts/OgreIllumModule.vcproj

@@ -21 +21 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
-                                AdditionalIncludeDirectories=""$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\OgreMain\include";..\include;..\include\RenderingRuns;..\include\RenderTechniques;..\..\IllumModule\include;..\..\IllumModule\include\RenderingRuns;..\..\IllumModule\include\RenderTechniques"
+                                AdditionalIncludeDirectories=""$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\OgreMain\include";..\include;..\include\RenderingRuns;..\include\RenderTechniques;..\..\IllumModule\include;..\..\IllumModule\include\RenderingRuns;..\..\IllumModule\include\RenderTechniques;"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include\""
                                 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;GAMETOOLS_ILLUMINATION_MODULE"
                                 MinimalRebuild="TRUE"
@@ -37 +37 @@
                                 Name="VCLibrarianTool"
                                 AdditionalDependencies="IllumModule.lib OgreMain_d.lib"
-                                AdditionalLibraryDirectories="..\..\IllumModule\bin\Debug;"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)""/>
+                                AdditionalLibraryDirectories="..\..\IllumModule\bin\Debug;"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)""/>
                         <Tool
                                 Name="VCMIDLTool"/>
@@ -75 +75 @@
                                 OptimizeForProcessor="2"
                                 OptimizeForWindowsApplication="TRUE"
-                                AdditionalIncludeDirectories="&quot;$(OGRE_PATH)\Samples\Common\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;..\include;..\include\RenderingRuns;..\include\RenderTechniques;..\..\IllumModule\include;..\..\IllumModule\include\RenderingRuns;..\..\IllumModule\include\RenderTechniques"
+                                AdditionalIncludeDirectories="&quot;$(OGRE_PATH)\Samples\Common\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;..\include;..\include\RenderingRuns;..\include\RenderTechniques;..\..\IllumModule\include;..\..\IllumModule\include\RenderingRuns;..\..\IllumModule\include\RenderTechniques;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\include\&quot;"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;GAMETOOLS_ILLUMINATION_MODULE"
                                 StringPooling="TRUE"
@@ -92 +92 @@
                                 Name="VCLibrarianTool"
                                 AdditionalDependencies="IllumModule.lib OgreMain.lib"
-                                AdditionalLibraryDirectories="..\..\IllumModule\bin\Release;&quot;$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)&quot;"/>
+                                AdditionalLibraryDirectories="..\..\IllumModule\bin\Release;&quot;$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)&quot;"/>
                         <Tool
                                 Name="VCMIDLTool"/>

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

@@ -1 +1 @@
 #include "OgreRenderingrun.h"
 #include "OgreIlluminationManager.h"
+#include "OgreTerrainSceneManager.h"
 
 MovablePlane* OgreRenderingRun::fullScreenQuad = NULL;
@@ -121 +122 @@
 void OgreRenderingRun::setMaterialForRenderables(String& materialName, RenderQueue* rq,  bool solidsonly)
 {
+        SceneManager* sm = Ogre::Root::getSingleton()._getCurrentSceneManager();
+        if(sm->getTypeName()==TerrainSceneManagerFactory::FACTORY_TYPE_NAME)
+        {
+                terrainMaterial = ((TerrainSceneManager*)sm)->getTerrainMaterial()->getName();
+                ((TerrainSceneManager*)sm)->setCustomMaterial(materialName);
+        }
+
         RenderQueue::QueueGroupIterator queueIt = rq->_getQueueGroupIterator();
    
@@ -153 +161 @@
         }
 
-        SceneManager* sm = Ogre::Root::getSingleton()._getCurrentSceneManager();
         sm->setFindVisibleObjects(false);       
 }
@@ -178 +185 @@
 void OgreRenderingRun::restoreMaterials()
 {
+        SceneManager* sm = Ogre::Root::getSingleton()._getCurrentSceneManager();
+        if(sm->getTypeName()==TerrainSceneManagerFactory::FACTORY_TYPE_NAME)
+                ((TerrainSceneManager*)sm)->setCustomMaterial(terrainMaterial);
+        
+
         std::map<Renderable*, String>::iterator it = visibleObjects.begin();
         std::map<Renderable*, String>::iterator itend = visibleObjects.end();
@@ -189 +201 @@
         visibleObjects.clear();
 
-        SceneManager* sm = Ogre::Root::getSingleton()._getCurrentSceneManager();
         sm->setFindVisibleObjects(true);
 }