Changeset 130 for trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

Timestamp:

06/14/05 02:50:05 (19 years ago)

Author:

mattausch

Message:

added visibility queries

File:

• trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp (modified) (10 diffs)

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -24 +24 @@
 mDelayRenderTransparents(true),
 mUseDepthPass(false),
-mRenderItemBuffer(true),
+mRenderItemBuffer(false),
 mCurrentEntityId(0)
 {
         mHierarchyInterface = new OctreeHierarchyInterface(this, mDestRenderSystem);
-
+        mQueryManager = new PlatformQueryManager(mHierarchyInterface, mCurrentViewport);
+
+        mVisibilityManager->SetQueryManager(mQueryManager);
         //mDisplayNodes = true;
         //mShowBoundingBoxes = true;
@@ -87 +89 @@
                 mHierarchyInterface = NULL;
         }
+        if (mQueryManager)
+        {
+                delete mQueryManager;
+                mQueryManager = NULL;
+        }
 }
 //-----------------------------------------------------------------------
 void VisibilityTerrainSceneManager::ShowVisualization(Camera *cam)
 {
-        LogManager::getSingleton().logMessage("***********VISUALIZATION************");
         // add player camera for visualization purpose
         try 
@@ -189 +195 @@
                 setAmbientLight(ColourValue(1,1,1,1));
         }
-
-        LogManager::getSingleton().logMessage("***********FIND OBJECTS************");
-        getRenderQueue()->clear();
+        //getRenderQueue()->clear();
 
         //-- show visible scene nodes and octree bounding boxes from last frame
@@ -221 +225 @@
 void VisibilityTerrainSceneManager::_renderVisibleObjects()
 {
-        /*
-        std::stringstream d;
-        d << "Terrain render level: " << TerrainRenderable::getCurrentRenderLevelIndex();
-        LogManager::getSingleton().logMessage(d.str());
-
         // increase terrain renderlevel
         int renderLevel = TerrainRenderable::getCurrentRenderLevelIndex() + 1;
@@ -233 +232 @@
                 renderLevel = 0;
         }
-*/
+
         // visualization: apply standard rendering
         if (mShowVisualization)
         {       
                 TerrainSceneManager::_renderVisibleObjects();
-        //      TerrainRenderable::setCurrentRenderLevelIndex(renderLevel);
+                TerrainRenderable::setCurrentRenderLevelIndex(renderLevel);
                 return;
         }
-
-        LogManager::getSingleton().logMessage("***********RENDER OBJECTS************");
 
         InitDepthPass();        // create material for depth pass
@@ -309 +306 @@
         TerrainSceneManager::_renderVisibleObjects();
 
-        //TerrainRenderable::setCurrentRenderLevelIndex(renderLevel);
+        TerrainRenderable::setCurrentRenderLevelIndex(renderLevel);
         //WriteLog(); // write out stats
 }
@@ -374 +371 @@
         // notifiy that frame has ended so terrain render level can be reset for correct
         // terrain rendering
-/*      if (key == "TerrainLevelIdx")
+        if (key == "TerrainLevelIdx")
         {
                 TerrainRenderable::setCurrentRenderLevelIndex((*static_cast<const int *>(val)));
                 return true;
-        }*/
+        }
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 setOption(key, val) || TerrainSceneManager::setOption(key, val);
@@ -507 +504 @@
                                 //<< ", renderable name: " << irend->
                                 RenderSingleObjectForItemBuffer(*irend, ipass->first);
-                                RenderSingleObjectForOcclusionQuery(
+                                //RenderSingleObjectForOcclusionQuery(
                 }
         }
@@ -562 +559 @@
         //LogManager::getSingleton().logMessage("has vertex program");
         Pass *usedPass = setPass(mItemBufferPass); 
-//Pass *usedPass = setPass(pass);
+        //Pass *usedPass = setPass(pass);
         std::stringstream d;
         d << "item buffer id: " << rend->getId() << ", col: " << col;
@@ -571 +568 @@
 }
 //-----------------------------------------------------------------------
-Entity* VisibilityTerrainSceneManager::createEntity(const String& entityName, const String& meshName)
+GtpVisibility::VisibilityManager *VisibilityTerrainSceneManager::GetVisibilityManager()
+{
+        return mVisibilityManager;
+}
+//-----------------------------------------------------------------------
+Entity* VisibilityTerrainSceneManager::createEntity(const String& entityName, 
+                                                                                                        const String& meshName)
 {
         Entity *ent = SceneManager::createEntity(entityName, meshName);
 
-        for (int i = 0; i < ent->getNumSubEntities(); ++i)
+        for (int i = 0; i < (int)ent->getNumSubEntities(); ++i)
         {
                 ent->getSubEntity(i)->setId(mCurrentEntityId ++);