Changeset 113 for trunk/VUT/Ogre

Timestamp:

05/27/05 11:56:51 (19 years ago)

Author:

mattausch

Message:

fixed problems with visualization

Location:

trunk/VUT/Ogre

Files:

• include/OgreVisibilityOctreeSceneManager.h (modified) (1 diff)
• include/OgreVisibilityTerrainSceneManager.h (modified) (2 diffs)
• src/OgreOctreeHierarchyInterface.cpp (modified) (2 diffs)
• src/OgrePlatformHierarchyInterface.cpp (modified) (3 diffs)
• src/OgreVisibilityOctreeSceneManager.cpp (modified) (1 diff)
• src/OgreVisibilityTerrainSceneManager.cpp (modified) (5 diffs)

trunk/VUT/Ogre/include/OgreVisibilityOctreeSceneManager.h

@@ -60 +60 @@
         bool mUseVisibilityCulling;
         bool mShowVisualization;
-        bool mRenderNodesForViz;
         bool mVisualizeCulledNodes;
+
+        int mRenderNodesForViz;
 };
 

trunk/VUT/Ogre/include/OgreVisibilityTerrainSceneManager.h

@@ -50 +50 @@
         */
         GtpVisibility::VisibilityManager *getVisibilityManager();
-        
+
 protected:
         
@@ -63 +63 @@
         bool mShowVisualization;
         bool mRenderNodesForViz;
+        bool mRenderNodesContentForViz;
         bool mVisualizeCulledNodes;
 };

trunk/VUT/Ogre/src/OgreOctreeHierarchyInterface.cpp

@@ -3 +3 @@
 #include <OgreOctree.h>
 #include <OgreLogManager.h>
-
+#include <OgreStringConverter.h>
 #include <windows.h>
 
@@ -156 +156 @@
                 box->setMaterial("QueryCulledNodesMaterial");
         }
+
         static_cast<OctreeSceneManager *>(mSceneManager)->getBoxes()->push_back(box);
-        //LogManager::getSingleton().logMessage("pushing box");
 }
 } // namespace Ogre

trunk/VUT/Ogre/src/OgrePlatformHierarchyInterface.cpp

@@ -12 +12 @@
 mCamera(NULL), mCullCamera(NULL), mOnlyShadowCasters(false)
 {
-        CreateCulledNodeMaterials();
-        
 }
 //-----------------------------------------------------------------------
@@ -20 +18 @@
         // material for frustum culled nodes
         MaterialPtr mat = MaterialManager::getSingleton().getByName("FrustumCulledNodesMaterial");
-        MaterialPtr baseWhite = MaterialManager::getSingleton().getByName("BaseWhiteNoLighting");
+        
         if (mat.isNull())
         {
                 mat = MaterialManager::getSingleton().create("FrustumCulledNodesMaterial", 
                         ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
-
-                //baseWhite.get()->copyDetailsTo(mat);
-                //mat->setColourWriteEnabled(true);
-                mat->setLightingEnabled(false);
-                //mat->setAmbient(ColourValue(1,0,0));
+                mat->createTechnique()->createPass();
+                
+                mat->getTechnique(0)->getPass(0)->setAmbient(1,0,0);
+                mat->getTechnique(0)->getPass(0)->setLightingEnabled(true);
+                //mat->getTechnique(0)->getPass(0)->setDepthCheckEnabled(false);
+                
+                mat->load();
         }
 
         // material for query culled nodes
-        MaterialPtr mat2 = MaterialManager::getSingleton().getByName("QueryCulledNodesMaterial");
-
-        if (mat2.isNull())
-        {
-                mat2 = MaterialManager::getSingleton().create("QueryCulledNodesMaterial", 
+        mat = MaterialManager::getSingleton().getByName("QueryCulledNodesMaterial");
+
+        if (mat.isNull())
+        {
+                mat = MaterialManager::getSingleton().create("QueryCulledNodesMaterial", 
                         ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
-                //baseWhite.get()->copyDetailsTo(mat2);
-        //      mat2->setColourWriteEnabled(true);
-                mat2->setLightingEnabled(false);
-                //mat2->setAmbient(ColourValue(0,0,1));         
+                mat->createTechnique()->createPass();
+                
+                mat->getTechnique(0)->getPass(0)->setAmbient(0,0,1);
+                mat->getTechnique(0)->getPass(0)->setLightingEnabled(true);
+                mat->load();
         }
 }
@@ -126 +127 @@
                 SetCullCamera(cam);
         }
+
+        CreateCulledNodeMaterials();
 }
 //-----------------------------------------------------------------------

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -142 +142 @@
         if (key == "RenderNodesForViz")
         {
-                mRenderNodesForViz = (*static_cast<const bool *>(val));
+                mRenderNodesForViz = (*static_cast<const int *>(val));
                 return true;
         }

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -20 +20 @@
 mShowVisualization(false),
 mRenderNodesForViz(false),
+mRenderNodesContentForViz(false),
 mVisualizeCulledNodes(false)
 {
@@ -39 +40 @@
 void VisibilityTerrainSceneManager::_findVisibleObjects(Camera* cam, bool onlyShadowCasters)
 {
+        // only shadow casters will be rendered in shadow texture pass
         mHierarchyInterface->SetOnlyShadowCasters(onlyShadowCasters);
+
         // does nothing if hierarchical culling is used =>
         // we interleave identification and rendering of objects 
@@ -64 +67 @@
             // ignore
         }
-                                
-                for (NodeList::iterator it = mVisible.begin(); it != mVisible.end(); ++it)
+                
+                if (mRenderNodesForViz || mRenderNodesContentForViz)
                 {
-                        MaterialPtr mp = (*it)->getMaterial();
-                        
-                        mp.get()->setLightingEnabled(false);
-                        mp.get()->setAmbient(ColourValue(1,0,0));
-                        mp.get()->setDiffuse(ColourValue(1,1,1));
-                        mp.get()->setSpecular(ColourValue(1,1,1));
-                        
-                        mp.get()->getTechnique(0)->getPass(0)->removeAllTextureUnitStates();
-                        //*mp = MaterialManager::getSingleton().getByName("BaseWhiteNoLighting");
-                        //(*it)->setMaterialName("BaseWhiteNoLighting");
-                        getRenderQueue()->addRenderable(*it);
-
-                        if (mRenderNodesForViz)
+                        // change node material so it is better suited for visualization
+                        MaterialPtr nodeMat = MaterialManager::getSingleton().getByName("Core/NodeMaterial");
+                        nodeMat->setAmbient(1, 1, 0);
+                        nodeMat->setLightingEnabled(true);
+                        nodeMat->getTechnique(0)->getPass(0)->removeAllTextureUnitStates();
+
+                        for (NodeList::iterator it = mVisible.begin(); it != mVisible.end(); ++it)
                         {
-                                (*it)->_addToRenderQueue(cam, getRenderQueue(), false);
+                                if (mRenderNodesForViz)
+                                {
+                                        getRenderQueue()->addRenderable(*it);
+                                }
+                                if (mRenderNodesContentForViz) 
+                                {
+                                        (*it)->_addToRenderQueue(cam, getRenderQueue(), false);
+                                }
                         }
                 }
@@ -109 +113 @@
         if (!mUseVisibilityCulling || mShowVisualization)
         {       
+                //mDestRenderSystem->unbindGpuProgram(GPT_VERTEX_PROGRAM);
+                //mDestRenderSystem->unbindGpuProgram(GPT_FRAGMENT_PROGRAM);
                 TerrainSceneManager::_renderVisibleObjects();
         
@@ -179 +185 @@
         {
                 mRenderNodesForViz = (*static_cast<const bool *>(val));
+                return true;
+        }
+        if (key == "RenderNodesContentForViz")
+        {
+                mRenderNodesContentForViz = (*static_cast<const bool *>(val));
                 return true;
         }