Changeset 92 for trunk/VUT/Ogre

Timestamp:

05/11/05 15:29:32 (20 years ago)

Author:

mattausch

Message:

exchanged halfbounding box with full bounding box

Location:

trunk/VUT/Ogre

Files:

• include/OgrePlatformHierarchyInterface.h (modified) (2 diffs)
• include/OgreSolidBoundingBox.h (added)
• include/OgreSolidHalfBoundingBox.h (modified) (1 diff)
• include/OgreVisibilityOctreeSceneManager.h (modified) (1 diff)
• include/OgreVisibilityTerrainSceneManager.h (modified) (1 diff)
• scripts/Plugin_VisibilitySceneManager.vcproj (modified) (2 diffs)
• src/OgrePlatformHierarchyInterface.cpp (modified) (5 diffs)
• src/OgreSolidBoundingBox.cpp (added)
• src/OgreVisibilityOctreeSceneManager.cpp (modified) (3 diffs)

trunk/VUT/Ogre/include/OgrePlatformHierarchyInterface.h

@@ -7 +7 @@
 #include <OgreRenderSystem.h>
 
-#include "OgreSolidHalfBoundingBox.h"
+//#include "OgreSolidHalfBoundingBox.h"
+#include "OgreSolidBoundingBox.h"
 #include "HierarchyInterface.h"
 #include "OgrePlatformOcclusionQuery.h"
@@ -81 +82 @@
         /** Returns pointer to current renderable half bounding box geometry
         */
-        SolidHalfBoundingBox *GetSolidHalfBoundingBox();
+        //SolidHalfBoundingBox *GetSolidHalfBoundingBox();
+        /** Returns pointer to current renderable bounding box geometry
+        */
+        SolidBoundingBox *GetSolidBoundingBox();
 
         /** one renderable half of an aabb. 
         */
-        SolidHalfBoundingBox *mSolidHalfBoundingBox;
+        SolidBoundingBox *mSolidBoundingBox;
 
         SceneManager *mSceneManager;

trunk/VUT/Ogre/include/OgreSolidHalfBoundingBox.h

@@ -6 +6 @@
 namespace Ogre {
 
-/** Allows the rendering of one half of a solid bounding box.
+/** The renderable of one half of a solid bounding box.
     @remarks
-        This class builds a wireframe renderable from a given aabb. A pointer to this class can be
+        This class builds a solid renderable from a given aabb. A pointer to this class can be
                 added to a render queue to display the bounding box of an object.
 */

trunk/VUT/Ogre/include/OgreVisibilityOctreeSceneManager.h

@@ -50 +50 @@
         GtpVisibility::VisibilityManager *getVisibilityManager( void );
 
+        //writes out into the Ogre log file
+        void WriteLog();
+
 protected:
         

trunk/VUT/Ogre/include/OgreVisibilityTerrainSceneManager.h

@@ -53 +53 @@
         GtpVisibility::VisibilityManager *getVisibilityManager();
         
+        //writes out statis into the Ogre log file
+        void WriteLog();
+
 protected:
-
+        
         OctreeHierarchyInterface *mHierarchyInterface;
         GtpVisibility::VisibilityManager *mVisibilityManager;

trunk/VUT/Ogre/scripts/Plugin_VisibilitySceneManager.vcproj

@@ -196 +196 @@
                                 </File>
                                 <File
+                                        RelativePath="..\include\OgreSolidBoundingBox.h">
+                                </File>
+                                <File
                                         RelativePath="..\include\OgreSolidHalfBoundingBox.h">
                                 </File>
@@ -216 +219 @@
                                 <File
                                         RelativePath="..\src\OgreSceneNodeHierarchyInterface.cpp">
+                                </File>
+                                <File
+                                        RelativePath="..\src\OgreSolidBoundingBox.cpp">
                                 </File>
                                 <File

trunk/VUT/Ogre/src/OgrePlatformHierarchyInterface.cpp

@@ -1 @@
-//#include <OgreMath.h>
-//#include <OgreIteratorWrappers.h>
 #include <OgreCamera.h>
 
-#include "OgreSolidHalfBoundingBox.h"
+//#include "OgreSolidHalfBoundingBox.h"
+#include "OgreSolidBoundingBox.h"
 #include "OgrePlatformHierarchyInterface.h"
 #include "OgrePlatformOcclusionQuery.h"
@@ -12 +11 @@
 //-----------------------------------------------------------------------
 PlatformHierarchyInterface::PlatformHierarchyInterface(SceneManager *sm, RenderSystem *rsys):
-mSceneManager(sm), mRenderSystem(rsys), mSolidHalfBoundingBox(NULL)
+mSceneManager(sm), mRenderSystem(rsys), mSolidBoundingBox(NULL)/*, mSolidHalfBoundingBox(NULL)*/
 {
 }
@@ -20 +19 @@
         DeleteQueries();
 
-        if(mSolidHalfBoundingBox)
-                delete mSolidHalfBoundingBox;
+        if(mSolidBoundingBox)
+                delete mSolidBoundingBox;
 }
 //-----------------------------------------------------------------------
@@ -37 +36 @@
 
         //TODO: this should be the full bounding box
-        SolidHalfBoundingBox *halfbox = GetSolidHalfBoundingBox();
+        SolidBoundingBox *solidBox = GetSolidBoundingBox();
         
         mRenderSystem->_setWorldMatrix(Ogre::Matrix4::IDENTITY);
-        mSceneManager->useRenderableViewProjMode(halfbox);
-    mSceneManager->setPass(halfbox->getTechnique()->getPass(0));
+        mSceneManager->useRenderableViewProjMode(solidBox);
+    mSceneManager->setPass(solidBox->getTechnique()->getPass(0));
+
+        solidBox->SetupBoundingBoxVertices(*box);
+                                
+        solidBox->getRenderOperation(ro);
+        ro.srcRenderable = solidBox;
+        mRenderSystem->_render(ro);
 
         // Render two halfes of the bounding box (using triangle fans)
-        for(int halfIdx = 0; halfIdx < 2; ++halfIdx)
+        /*for(int halfIdx = 0; halfIdx < 2; ++halfIdx)
         {
-                halfbox->SetupBoundingBoxVertices(*box, halfIdx == 1);
+                solidBox->SetupBoundingBoxVertices(*box, halfIdx == 1);
                                 
-                halfbox->getRenderOperation(ro);
-                ro.srcRenderable = halfbox;
+                solidBox->getRenderOperation(ro);
+                ro.srcRenderable = solidBox;
                 mRenderSystem->_render(ro);
-        }
+        }*/
 }
 //-----------------------------------------------------------------------
@@ -121 +126 @@
 }
 //-----------------------------------------------------------------------
-SolidHalfBoundingBox *PlatformHierarchyInterface::GetSolidHalfBoundingBox()
+SolidBoundingBox *PlatformHierarchyInterface::GetSolidBoundingBox()
 {
-        if(!mSolidHalfBoundingBox)
-                mSolidHalfBoundingBox = new SolidHalfBoundingBox;
+        if(!mSolidBoundingBox)
+                mSolidBoundingBox = new SolidBoundingBox;
 
-        return mSolidHalfBoundingBox;
+        return mSolidBoundingBox;
 }
 

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -5 +5 @@
 #include <OgreRenderSystem.h>
 #include <OgreCamera.h>
+#include <OgreLogManager.h>
 
 #include <windows.h>
@@ -73 +74 @@
         clearSpecialCaseRenderQueues();
         SceneManager::_renderVisibleObjects();
+
+        // write out stats
+        WriteLog();
 }
 //-----------------------------------------------------------------------
@@ -141 +145 @@
         return mVisibilityManager;
 }
+void VisibilityOctreeSceneManager::WriteLog()
+{
+        std::stringstream d;
 
+        d << "Algorithm type: " << mVisibilityManager->GetCullingManagerType() << ", "
+          << "Hierarchy nodes: " << mNumOctreeNodes << ", " << "Traversed nodes: " << mHierarchyInterface->GetNumTraversedNodes() << ", "
+          << "Rendered nodes: " << mHierarchyInterface->GetNumRenderedNodes() << ", "
+          << "Query culled nodes: " << mVisibilityManager->GetCullingManager()->GetNumQueryCulledNodes() << ", "
+          << "Frustum culled nodes: " << mVisibilityManager->GetCullingManager()->GetNumFrustumCulledNodes() << ", "
+      << "Queries issued: " << mVisibilityManager->GetCullingManager()->GetNumQueriesIssued() << "\n";
+
+        LogManager::getSingleton().logMessage(d.str());
+}
 }   // namespace Ogre