Changeset 343 for trunk/VUT/Ogre/src

Timestamp:

10/20/05 18:49:11 (19 years ago)

Author:

mattausch

Message:

added switch between NV and ARB queries in the render system and in the demos.
Fixed render queue bug: when clearing queue, we traversed through all priority groups
to clear the passmaps. This became very slow because had to traverse many elements (over 1000
for city demo). Now all we destroy the priority groups for each rendering (per hierarchy node).

Location:

trunk/VUT/Ogre/src

Files:

• OgreOctreeHierarchyInterface.cpp (modified) (1 diff)
• OgreVisibilityOctreeSceneManager.cpp (modified) (3 diffs)
• OgreVisibilityTerrainSceneManager.cpp (modified) (1 diff)

trunk/VUT/Ogre/src/OgreOctreeHierarchyInterface.cpp

@@ -106 +106 @@
         }
 #endif
+        
 }
 //-----------------------------------------------------------------------

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -237 +237 @@
 void VisibilityOctreeSceneManager::_renderVisibleObjects()
 {
+        
+                //InitVisibilityCulling(mCameraInProgress);
+                //mVisibilityManager->ApplyVisibilityCulling();
+
+                if(1){
         InitDepthPass();          // create material for depth pass
         InitItemBufferPass(); // create material for item buffer pass
@@ -340 +345 @@
         // reset ambient light
         setAmbientLight(savedAmbient);
-        
+}       
         getRenderQueue()->clear(); // finally clear render queue
         OGRE_DELETE(mRenderQueue); // HACK: should be cleared before...
         //WriteLog(); // write out stats
+
 }
 
@@ -428 +434 @@
                 return true;
         }
+        if (key == "UseArbQueries")
+        {
+                bool useArbQueries = (*static_cast<const bool *>(val));
+
+                if (useArbQueries)
+                {
+                        mHierarchyInterface->DeleteQueries();
+                        mDestRenderSystem->setConfigOption("ArbQueries", "Yes");
+                }
+                else
+                {
+                        mHierarchyInterface->DeleteQueries();
+                        mDestRenderSystem->setConfigOption("ArbQueries", "No");
+                }
+        }
+
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 setOption(key, val) || OctreeSceneManager::setOption(key, val);

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -434 +434 @@
         }
 
+        if (key == "UseArbQueries")
+        {
+                bool useArbQueries = (*static_cast<const bool *>(val));
+
+                if (useArbQueries)
+                {
+                        mHierarchyInterface->DeleteQueries();
+                        mDestRenderSystem->setConfigOption("ArbQueries", "Yes");
+                }
+                else
+                {
+                        mHierarchyInterface->DeleteQueries();
+                        mDestRenderSystem->setConfigOption("ArbQueries", "No");
+                }
+        }
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 setOption(key, val) || TerrainSceneManager::setOption(key, val);