Changeset 112 for trunk/VUT/Ogre

Timestamp:

05/25/05 18:28:46 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/Ogre

Files:

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

trunk/VUT/Ogre/include/OgreOctreeHierarchyInterface.h

@@ -43 +43 @@
         unsigned int LastVisited(GtpVisibility::HierarchyNode *node) const;
 
+        void VisualizeCulledNode(GtpVisibility::HierarchyNode *node, 
+                                                         GtpVisibility::CullingType type);
+
 protected:
         /** Returns pointer to the bounding box of the node.

trunk/VUT/Ogre/include/OgrePlatformHierarchyInterface.h

@@ -86 +86 @@
 
 protected:
+        /** materials for visualizing frustum and query culled nodes */
+        void CreateCulledNodeMaterials();
+
         /** A pass that prepares an occlusion query.
                 @remark disables depth write, colour write, lighting,

trunk/VUT/Ogre/include/OgreSceneNodeHierarchyInterface.h

@@ -35 +35 @@
 
         AxisAlignedBox *GetBoundingBox(GtpVisibility::HierarchyNode *node);
+
+        void VisualizeCulledNode(GtpVisibility::HierarchyNode *node, 
+                                                        GtpVisibility::CullingType type);
 };
 

trunk/VUT/Ogre/include/OgreVisibilityOctreeSceneManager.h

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

trunk/VUT/Ogre/include/OgreVisibilitySceneManager.h

@@ -59 +59 @@
         bool mUseVisibilityCulling;
         bool mShowVisualization;
+
+        bool mVisualizeCulledNodes;
 };
 } // namespace Ogre

trunk/VUT/Ogre/include/OgreVisibilityTerrainSceneManager.h

@@ -63 +63 @@
         bool mShowVisualization;
         bool mRenderNodesForViz;
+        bool mVisualizeCulledNodes;
 };
 

trunk/VUT/Ogre/src/OgreOctreeHierarchyInterface.cpp

@@ -142 +142 @@
         return &mBox;
 }
+//-----------------------------------------------------------------------
+void OctreeHierarchyInterface::VisualizeCulledNode(GtpVisibility::HierarchyNode *node, 
+                                                                                                   GtpVisibility::CullingType type)
+{
+        WireBoundingBox *box = static_cast<Octree *>(node)->getWireBoundingBox();
 
+        if (type == GtpVisibility::FRUSTUM_CULLED)
+        {
+                box->setMaterial("FrustumCulledNodesMaterial");
+        }
+        else // type == GtpVisibility::QUERY_CULLED
+        {
+                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();
+        
+}
+//-----------------------------------------------------------------------
+void PlatformHierarchyInterface::CreateCulledNodeMaterials()
+{
+        // 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));
+        }
+
+        // material for query culled nodes
+        MaterialPtr mat2 = MaterialManager::getSingleton().getByName("QueryCulledNodesMaterial");
+
+        if (mat2.isNull())
+        {
+                mat2 = 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));         
+        }
 }
 //-----------------------------------------------------------------------
@@ -162 +194 @@
         // Set colour write mode off
         mRenderSystem->_setColourBufferWriteEnabled(false, false, false, false);
-        // Set colour write mode pff
-    mRenderSystem->_setColourBufferWriteEnabled(false, false, false, false);
 }
 //-----------------------------------------------------------------------
@@ -177 +207 @@
 {
         mOnlyShadowCasters = onlyShadowCasters;
-        mDummy = mOnlyShadowCasters ;
+        //mIsShadowPass = mOnlyShadowCasters ;
 }
 //-----------------------------------------------------------------------

trunk/VUT/Ogre/src/OgreSceneContentGenerator.cpp

@@ -87 +87 @@
 {
         Matrix3 mat;
-        mat.FromEulerAnglesYXZ(Degree(rotation.x),//.valueRadians(), 
-                                                   Degree(rotation.y),//.valueRadians(), 
-                                                   Degree(rotation.z));//.valueRadians());
+        mat.FromEulerAnglesYXZ(Degree(rotation.x), Degree(rotation.y),
+                                                   Degree(rotation.z));
 
         return GenerateSceneObject(position, Quaternion(mat), objName);

trunk/VUT/Ogre/src/OgreSceneNodeHierarchyInterface.cpp

@@ -124 +124 @@
         return &mBox;
 }
+//-----------------------------------------------------------------------
+void SceneNodeHierarchyInterface::VisualizeCulledNode(GtpVisibility::HierarchyNode *node, 
+                                                                                                          GtpVisibility::CullingType type)
+{
+        // TODO
+}
 } // namespace Ogre     

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -12 +12 @@
 VisibilityOctreeSceneManager::VisibilityOctreeSceneManager(
         GtpVisibility::VisibilityManager *visManager)
-: mVisibilityManager(visManager), mUseVisibilityCulling(true),
-mShowVisualization(false)
+: 
+mVisibilityManager(visManager), 
+mUseVisibilityCulling(true),
+mShowVisualization(false),
+mRenderNodesForViz(false),
+mVisualizeCulledNodes(false)
 {
         mHierarchyInterface = 
@@ -37 +41 @@
                                                         mCullCamera ? getCamera("CullCamera") : NULL);
 
-        // call initframe to reset culling manager stats
-        mVisibilityManager->GetCullingManager()->InitFrame();
-
-        // standard terrain scenemanager rendering without hierarchical culling
-        if (!mUseVisibilityCulling || mShowVisualization)
-        {       
-                OctreeSceneManager::_renderVisibleObjects();
-                return;
-        } 
+        if (!mShowVisualization)
+        {
+                // two cameras (one for culling, one for rendering)
+                mHierarchyInterface->InitFrame(mOctree, mCameraInProgress, 
+                                                                mCullCamera ? getCamera("CullCamera") : NULL);
+
+                // call initframe to reset culling manager stats
+                mVisibilityManager->GetCullingManager()->InitFrame(mVisualizeCulledNodes);
+        }
         
         //-- hierarchical culling
@@ -136 +140 @@
                 return true;
         }
+        if (key == "RenderNodesForViz")
+        {
+                mRenderNodesForViz = (*static_cast<const bool *>(val));
+                return true;
+        }
+        if (key == "SkyBoxEnabled")
+        {
+                mSkyBoxEnabled = (*static_cast<const bool *>(val));
+                return true;
+        }
+        if (key == "SkyPlaneEnabled")
+        {
+                mSkyPlaneEnabled = (*static_cast<const bool *>(val));
+                return true;
+        }
+        if (key == "SkyDomeEnabled")
+        {
+                mSkyDomeEnabled = (*static_cast<const bool *>(val));
+                return true;
+        }
+        if (key == "VisualizeCulledNodes")
+        {
+                mVisualizeCulledNodes = (*static_cast<const bool *>(val));
+                return true;
+        }
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 setOption(key, val) || OctreeSceneManager::setOption(key, val);

trunk/VUT/Ogre/src/OgreVisibilitySceneManager.cpp

@@ -38 +38 @@
 void VisibilitySceneManager::_renderVisibleObjects()
 {
-        // two cameras (one for culling, one for rendering)
-        mHierarchyInterface->InitFrame(mSceneRoot, mCameraInProgress);
+        if (!mShowVisualization)
+        {
+                // two cameras (one for culling, one for rendering)
+                mHierarchyInterface->InitFrame(mSceneRoot, mCameraInProgress);
 
-        // call initframe to reset culling manager stats
-        mVisibilityManager->GetCullingManager()->InitFrame();
+                // call initframe to reset culling manager stats
+                mVisibilityManager->GetCullingManager()->InitFrame(mVisualizeCulledNodes);
+        }
 
         // standard terrain scenemanager rendering without hierarchical culling
@@ -48 +51 @@
         {       
                 SceneManager::_renderVisibleObjects();
+        
                 return;
         } 
-        
+
         //-- hierarchical culling
         // the objects of different layers (e.g., background, scene, 

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -19 +19 @@
 mUseVisibilityCulling(true),
 mShowVisualization(false),
-mRenderNodesForViz(false)
+mRenderNodesForViz(false),
+mVisualizeCulledNodes(false)
 {
         mHierarchyInterface = 
@@ -66 +67 @@
                 for (NodeList::iterator it = mVisible.begin(); it != mVisible.end(); ++it)
                 {
+                        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);
 
@@ -85 +96 @@
 void VisibilityTerrainSceneManager::_renderVisibleObjects()
 {
-
         if (!mShowVisualization)
         {
@@ -93 +103 @@
 
                 // call initframe to reset culling manager stats
-                mVisibilityManager->GetCullingManager()->InitFrame();
-        }
-
+                mVisibilityManager->GetCullingManager()->InitFrame(mVisualizeCulledNodes);
+        }
+        
         // standard terrain scenemanager rendering without hierarchical culling
         if (!mUseVisibilityCulling || mShowVisualization)
@@ -184 +194 @@
         {
                 mSkyDomeEnabled = (*static_cast<const bool *>(val));
+                return true;
+        }
+        if (key == "VisualizeCulledNodes")
+        {
+                mVisualizeCulledNodes = (*static_cast<const bool *>(val));
                 return true;
         }