Changeset 135 for trunk/VUT/Ogre/src

Timestamp:

06/16/05 18:13:33 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/Ogre/src

Files:

• OgreOctreeHierarchyInterface.cpp (modified) (1 diff)
• OgrePlatformHierarchyInterface.cpp (modified) (1 diff)
• OgrePlatformQueryManager.cpp (modified) (14 diffs)
• OgreTerrainContentGenerator.cpp (modified) (1 diff)
• OgreVisibilityTerrainSceneManager.cpp (modified) (3 diffs)

trunk/VUT/Ogre/src/OgreOctreeHierarchyInterface.cpp

@@ -137 +137 @@
         {
                 mPreviousNode = node;
-                static_cast<Octree *>(node)->_getCullBounds(&mBox);
+        //      static_cast<Octree *>(node)->_getCullBounds(&mBox);
+                mBox = static_cast<Octree *>(node)->_getWorldAABB();
         }
 

trunk/VUT/Ogre/src/OgrePlatformHierarchyInterface.cpp

@@ -188 +188 @@
         else
         {
-                // used by the scene manager, because bounding box rendering must be handled
-                // differently
+                // this information is used e.g., by the scene graph, because the bounding box
+                // must be treated differently to the scene geometry during rendering
                 mIsBoundingBoxQuery = true;
 

trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp

@@ -25 +25 @@
                             bool relativeVisibility)
 {
-        if (relativeVisibility)
-                LogManager::getSingleton().logMessage("relative");
-        else
-                LogManager::getSingleton().logMessage("absolute");
-
         // we need access to the scene manager and the rendersystem
         PlatformHierarchyInterface *pfHierarchyInterface = 
@@ -39 +34 @@
         Camera *pCam = const_cast<Camera *>(&camera); 
 
+        bool overlayEnabled = mViewport->getOverlaysEnabled();
+        mViewport->setOverlaysEnabled(false);
         pfHierarchyInterface->GetSceneManager()->_renderScene(pCam, mViewport, false);
 
@@ -53 +50 @@
         GtpVisibility::GeometryList geometryList;
         
-        GtpVisibility::HierarchyNodeList::const_iterator nodeIt, nodeIt_end = nodeList->end();
+        GtpVisibility::HierarchyNodeList::iterator nodeIt, nodeIt_end = nodeList->end();
         // geometry list has still do be built
         GtpVisibility::GeometryList::iterator geometryIt, geometryIt_end;
 
+        // to obtain the correct number of projected pixels, depth write must be disabled
+
+        bool enableDepthWrite = false;
+        // this option must be provided by the scene manager
+        pfHierarchyInterface->GetSceneManager()->setOption("DepthWrite", &enableDepthWrite);
+
+        /* relative visiblity:
+                1) get visible pixels count of objects
+                2) clear frame buffer
+                3) get projected visible pixels count:
+                   test all objects again without depth write (set as option in scene manager)
+                4) calculate ratio between visible vs. projected pixels
+        */
         // for relative visibility we need 2 rendering passes
         int n = relativeVisibility ? 2 : 1;
@@ -63 +73 @@
         {
                 //-- queries for hierarchy nodes
-                for (nodeIt = nodeList->begin(); nodeIt != nodeIt_end; ++nodeIt)
+                for (nodeIt = nodeList->begin(); nodeIt != nodeIt_end; ++nodeIt)                
                 {
                         // TODO: DELETE QUERIES FROM PREVIOUS RENDER
@@ -69 +79 @@
                         
                         // store geometry of the hierarchy node in a geometry list (only once!)
-                        if (i == n - 2)
+                        if (i == 0)
                         {
                                 mHierarchyInterface->GetGeometry(*nodeIt, &geometryList, false);
@@ -83 +93 @@
                 }
 
-                // --- relative visiblity
-                /* 
-                        1) get visible pixels count of objects
-                        2) clear frame buffer
-                        3) get projected visible pixels count:
-                           test all objects again without depth write (set as option in scene manager)
-                        4) calculate ratio between visible vs. projected pixels
-                */
-                if (i == n - 2) // if relativeVisibility, between first and second loop
-                {
-                        pfHierarchyInterface->GetRenderSystem()->clearFrameBuffer(FBT_COLOUR | FBT_DEPTH);
-                }
-
-                // to obtain the correct number of projected pixels, depth write must be disabled
-                bool enableDepthWrite = (i != n - 2);
-
-                // this option must be provided by the scene manager
-                pfHierarchyInterface->GetSceneManager()->setOption("DepthWrite", &enableDepthWrite);
+        
+                pfHierarchyInterface->GetRenderSystem()->clearFrameBuffer(FBT_DEPTH);
         }
 
+        enableDepthWrite = true;
+        // this option must be provided by the scene manager
+        pfHierarchyInterface->GetSceneManager()->setOption("DepthWrite", &enableDepthWrite);
+        
+        mViewport->setOverlaysEnabled(overlayEnabled);
 
         //---- collect results
-        unsigned int visiblePixels;
+        unsigned int visiblePixels = 0;
 
         GtpVisibility::QueryList::iterator visQueryIt, projQueryIt;
@@ -111 +110 @@
         visQueryIt = queryList[0].begin();
         projQueryIt = queryList[1].begin();
+
         
         for (nodeIt = nodeList->begin(); nodeIt != nodeIt_end; ++nodeIt)
         {
                 (*visQueryIt)->GetQueryResult(visiblePixels, true);
-
+        
+                
                 float vis = (float)visiblePixels;
 
@@ -121 +122 @@
                 {
                         (*projQueryIt)->GetQueryResult(visiblePixels, true);
-                        std::stringstream d; d << "relativ " << visiblePixels;
-                        LogManager::getSingleton().logMessage(d.str());
-
+        
                         if (visiblePixels > 0)
                         {                               
@@ -132 +131 @@
 
                 ++visQueryIt;
-
+                
                 // leave nodes with visibilty 0 in queue: 
                 // happens if node is intersected by near plane
@@ -141 +140 @@
         geometryIt_end = geometryList.end();
         
-        /*for (geometryIt = geometryList.begin(); geometryIt != geometryIt_end; ++geometryIt)
+        for (geometryIt = geometryList.begin(); geometryIt != geometryIt_end; ++geometryIt)
         {
-                (*absQueryIt)->GetQueryResult(visiblePixels, true);
+                (*visQueryIt)->GetQueryResult(visiblePixels, true);
+                
 
                 float vis = (float)visiblePixels;
@@ -150 +150 @@
                 if (relativeVisibility)
                 {
-                        (*relQueryIt)->GetQueryResult(visiblePixels, true);
+                        (*projQueryIt)->GetQueryResult(visiblePixels, true);
 
                         if (visiblePixels)
@@ -156 +156 @@
                                 vis /= (float) visiblePixels;
                         }
-                        ++relQueryIt;
+                        ++projQueryIt;
                 }
 
-                ++absQueryIt;
+                ++visQueryIt;
 
                 // approximate depth ordering during rendering => 
@@ -167 +167 @@
                         visibleGeometry->push_back(GtpVisibility::MeshInfo(*geometryIt, vis));
                 }
-        }*/
+        }
 
 }
@@ -176 +176 @@
                                bool relativeVisibility)
 {
-         visibleNodes->push_back(GtpVisibility::NodeInfo(mHierarchyInterface->GetSceneRoot(), 1.0f));
+        
 }
 //-----------------------------------------------------------------------

trunk/VUT/Ogre/src/OgreTerrainContentGenerator.cpp

@@ -70 +70 @@
                                          const Vector3 &rotation, const String& objName, const bool clampToTerrain)
 {
+        
+        if (clampToTerrain)
+        {
+                return GenerateSceneObject(position, rotation, objName);
+        }
+        else
+        {
+                return SceneContentGenerator::GenerateSceneObject(position, rotation, objName);
+        }
+}
+//-----------------------------------------------------------------------
+SceneNode *TerrainContentGenerator::GenerateSceneObject(const Vector3 &position, 
+                                         const Vector3 &rotation, const String& objName)
+{
         Vector3 queryResult;
         // set y to max height so we are sure to be over terrain
         Vector3 pos(position.x, MAX_HEIGHT, position.z);
-
-        if (!clampToTerrain)
-        {
-                return SceneContentGenerator::GenerateSceneObject(queryResult, rotation, objName);
-        }
 
         if (mRayQueryExecutor->executeRayQuery(&queryResult, position, Vector3::NEGATIVE_UNIT_Y))

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -274 +274 @@
         TerrainSceneManager::_renderVisibleObjects();
 
-
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
         _deleteRenderedQueueGroups(false);
@@ -300 +299 @@
         mVisibilityManager->ApplyVisibilityCulling();
 
+        // delete remaining renderables from queue (or all but transparents)
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        _deleteRenderedQueueGroups(mSkipTransparents);
+#endif
 
         // for depth pass: add visible nodes found with the visibility culling
@@ -320 +323 @@
 
         TerrainRenderable::setCurrentRenderLevelIndex(renderLevel);
+        getRenderQueue()->clear();
         //WriteLog(); // write out stats
 }