Changeset 114 for trunk/VUT/Ogre

Timestamp:

05/27/05 18:59:23 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/Ogre

Files:

• include/OgreVisibilityOctreeSceneManager.h (modified) (2 diffs)
• include/OgreVisibilityOptionsManager.h (modified) (1 diff)
• include/OgreVisibilityTerrainSceneManager.h (modified) (2 diffs)
• src/OgreVisibilityOctreeSceneManager.cpp (modified) (6 diffs)
• src/OgreVisibilityTerrainSceneManager.cpp (modified) (5 diffs)

trunk/VUT/Ogre/include/OgreVisibilityOctreeSceneManager.h

@@ -52 +52 @@
         //writes out stats into the Ogre log file
         void WriteLog();
-
+        /** Render a set of objects, see renderSingleObject for param definitions 
+                Override so we can handle delayed rendering of transparent objects
+        */
+        virtual void renderObjects(const RenderPriorityGroup::TransparentRenderablePassList& objs, 
+            bool doLightIteration, const LightList* manualLightList = 0);
 protected:
         
@@ -60 +64 @@
         bool mUseVisibilityCulling;
         bool mShowVisualization;
+        bool mRenderTransparentObjects;
         bool mVisualizeCulledNodes;
 
-        int mRenderNodesForViz;
+        bool mRenderNodesForViz;
+        bool mRenderNodesContentForViz;
 };
 

trunk/VUT/Ogre/include/OgreVisibilityOptionsManager.h

@@ -10 +10 @@
         
 /**
-        Helper class for setting and getting different visibility options.
+        Helper class for setting and getting different options directly
+        related to visibility culling.
 */
 class VisibilityOptionsManager

trunk/VUT/Ogre/include/OgreVisibilityTerrainSceneManager.h

@@ -51 +51 @@
         GtpVisibility::VisibilityManager *getVisibilityManager();
 
+        /** Render a set of objects, see renderSingleObject for param definitions 
+                Override so we can handle delayed rendering of transparent objects
+        */
+        virtual void renderObjects(const RenderPriorityGroup::TransparentRenderablePassList& objs, 
+            bool doLightIteration, const LightList* manualLightList = 0);
 protected:
         
@@ -62 +67 @@
         bool mUseVisibilityCulling;
         bool mShowVisualization;
+        bool mRenderTransparentObjects;
+        bool mVisualizeCulledNodes;
+
         bool mRenderNodesForViz;
         bool mRenderNodesContentForViz;
-        bool mVisualizeCulledNodes;
 };
 

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -17 +17 @@
 mShowVisualization(false),
 mRenderNodesForViz(false),
-mVisualizeCulledNodes(false)
+mVisualizeCulledNodes(false),
+mRenderTransparentObjects(false)
 {
         mHierarchyInterface = 
@@ -92 +93 @@
 void VisibilityOctreeSceneManager::_findVisibleObjects(Camera* cam, bool onlyShadowCasters)
 {
-        // if shadow pass => render only shadow casters
+        // 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 
-        // in _renderVisibibleObjects 
+        // in _renderVisibibleObjects
         if (!mUseVisibilityCulling)
         {
@@ -103 +104 @@
                 return; 
         }
-        
+
+        //-- show visibile scene nodes and octree bounding boxes from last frame
         if (mShowVisualization)
     {
+                // add player camera for visualization purpose
+                try {
+                        Camera *c;
+                        if ((c = getCamera("PlayerCam")) != NULL)
+                        {
+                                getRenderQueue()->addRenderable(c);
+                        }   
+        }
+        catch(...)
+        {
+            // ignore
+        }
                 
-                for ( BoxList::iterator it = mBoxes.begin(); it != mBoxes.end(); ++it )
+                if (mRenderNodesForViz || mRenderNodesContentForViz)
+                {
+                        // 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)
+                        {
+                                if (mRenderNodesForViz)
+                                {
+                                        getRenderQueue()->addRenderable(*it);
+                                }
+                                if (mRenderNodesContentForViz) 
+                                {
+                                        (*it)->_addToRenderQueue(cam, getRenderQueue(), false);
+                                }
+                        }
+                }
+                for (BoxList::iterator it = mBoxes.begin(); it != mBoxes.end(); ++it)
                 {
                         getRenderQueue()->addRenderable(*it);
                 }
         }
-
-        mBoxes.clear();
-    mVisible.clear();
+        
+        mVisible.clear();
+    mBoxes.clear();
 }
 //-----------------------------------------------------------------------
@@ -142 +176 @@
         if (key == "RenderNodesForViz")
         {
-                mRenderNodesForViz = (*static_cast<const int *>(val));
+                mRenderNodesForViz = (*static_cast<const bool *>(val));
                 return true;
         }
@@ -165 +199 @@
                 return true;
         }
+
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 setOption(key, val) || OctreeSceneManager::setOption(key, val);
@@ -200 +235 @@
 {
         return mVisibilityManager;
+}
+//-----------------------------------------------------------------------
+void VisibilityOctreeSceneManager::renderObjects(const RenderPriorityGroup::TransparentRenderablePassList& objs, 
+            bool doLightIteration, const LightList* manualLightList)
+{
+        if (mRenderTransparentObjects)
+        {
+                OctreeSceneManager::renderObjects(objs, doLightIteration, manualLightList);
+        }
 }
 //-----------------------------------------------------------------------

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -21 +21 @@
 mRenderNodesForViz(false),
 mRenderNodesContentForViz(false),
-mVisualizeCulledNodes(false)
+mVisualizeCulledNodes(false),
+mRenderTransparentObjects(false)
 {
         mHierarchyInterface = 
                 new OctreeHierarchyInterface(this, mDestRenderSystem);
 
-        //mDisplayNodes = true;
+    //mDisplayNodes = true;
         //mShowBoundingBoxes = true;
 
@@ -71 +72 @@
                 {
                         // change node material so it is better suited for visualization
-                        MaterialPtr nodeMat = MaterialManager::getSingleton().getByName("Core/NodeMaterial");
+                        /*MaterialPtr nodeMat = MaterialManager::getSingleton().getByName("Core/NodeMaterial");
                         nodeMat->setAmbient(1, 1, 0);
                         nodeMat->setLightingEnabled(true);
-                        nodeMat->getTechnique(0)->getPass(0)->removeAllTextureUnitStates();
+                        nodeMat->getTechnique(0)->getPass(0)->removeAllTextureUnitStates();*/
 
                         for (NodeList::iterator it = mVisible.begin(); it != mVisible.end(); ++it)
@@ -113 +114 @@
         if (!mUseVisibilityCulling || mShowVisualization)
         {       
-                //mDestRenderSystem->unbindGpuProgram(GPT_VERTEX_PROGRAM);
-                //mDestRenderSystem->unbindGpuProgram(GPT_FRAGMENT_PROGRAM);
                 TerrainSceneManager::_renderVisibleObjects();
         
@@ -248 +247 @@
         return mVisibilityManager;
 }
-
 //-----------------------------------------------------------------------
 void VisibilityTerrainSceneManager::WriteLog()
@@ -264 +262 @@
         LogManager::getSingleton().logMessage(d.str());
 }
-
+//-----------------------------------------------------------------------
+void VisibilityTerrainSceneManager::renderObjects(const RenderPriorityGroup::TransparentRenderablePassList& objs, 
+            bool doLightIteration, const LightList* manualLightList)
+{
+        if (mRenderTransparentObjects)
+        {
+                OctreeSceneManager::renderObjects(objs, doLightIteration, manualLightList);
+        }
+}
 
 } // namespace Ogre