Changeset 86 for trunk/VUT/Ogre

Timestamp:

05/06/05 01:39:32 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/Ogre

Files:

• include/OgrePlatformHierarchyInterface.h (modified) (1 diff)
• include/OgrePlatformOcclusionQuery.h (modified) (1 diff)
• include/OgreSolidHalfBoundingBox.h (modified) (2 diffs)
• resources/VisibilityDemo.overlay (modified) (2 diffs)
• src/OgreOctreeHierarchyInterface.cpp (modified) (2 diffs)
• src/OgrePlatformHierarchyInterface.cpp (modified) (5 diffs)
• src/OgrePlatformOcclusionQuery.cpp (modified) (2 diffs)
• src/OgreSolidHalfBoundingBox.cpp (modified) (2 diffs)
• src/OgreVisibilityOctreeSceneManager.cpp (modified) (1 diff)
• src/OgreVisibilityOptionsManager.cpp (modified) (2 diffs)
• src/OgreVisibilityTerrainSceneManager.cpp (modified) (1 diff)

trunk/VUT/Ogre/include/OgrePlatformHierarchyInterface.h

@@ -65 +65 @@
         /** Issue a occlusion query for this node. 
                 @param node the current hierarchy node
+                @param wasVisible if the node was visible in the last frame
                 @returns occlusion query for this node
         */
-        GtpVisibility::OcclusionQuery *IssueOcclusionQuery(GtpVisibility::HierarchyNode *node);
+        GtpVisibility::OcclusionQuery *IssueOcclusionQuery(
+                GtpVisibility::HierarchyNode *node, const bool wasVisible);
 
 protected:

trunk/VUT/Ogre/include/OgrePlatformOcclusionQuery.h

@@ -20 +20 @@
         virtual ~PlatformOcclusionQuery();
 
-        virtual unsigned int GetQueryResult() const;
-        virtual bool ResultAvailable() const;
+        virtual bool GetQueryResult(unsigned int &queryResult,
+                const bool waitForResult) const;
         virtual void BeginQuery() const;
         virtual void EndQuery() const;

trunk/VUT/Ogre/include/OgreSolidHalfBoundingBox.h

@@ -16 +16 @@
 
         SolidHalfBoundingBox();
-        /** Sets up the first or second half of a solid bounding box.
+        /** Sets up the first or second half of a the solid box.
                 @param aab the axis aligned bounding box
                 @param isFirstHalf if it is the first or the second half
@@ -22 +22 @@
         void SetupBoundingBox(const AxisAlignedBox& aabb, const bool isFirstHalf);
         
-protected:
-    /** Builds the wireframe line list.
+        /** Builds the wireframe line list.
                 @param aab the axis aligned bounding box for setting up the vertices
                 @param first or second half of the box
     */
         void SetupBoundingBoxVertices(const AxisAlignedBox& aab, const bool isFirstHalf);
+
+protected:
+   
         /** 
                 Sets the material used for occlusion queries. 

trunk/VUT/Ogre/resources/VisibilityDemo.overlay

@@ -10 +10 @@
                 top 5
                 width 450
-                height 55
+                height 60
                 material Core/StatsBlockCenter
                 border_size 1 1 1 1
@@ -69 +69 @@
                         left 155
                         top 20
+                        width 90
+                        height 30
+                        font_name TrebuchetMSBold
+                        char_height 16
+                        caption :
+                        colour_top 0.5 0.7 0.5
+                        colour_bottom 0.3 0.5 0.3
+                }
+                element TextArea(Example/Visibility/UseOptimization)
+                {
+                        metrics_mode pixels
+                        left 5
+                        top 35
+                        width 90
+                        height 30
+                        font_name TrebuchetMSBold
+                        char_height 16
+                        caption [O] Optimization
+                        colour_top 0.5 0.7 0.5
+                        colour_bottom 0.3 0.5 0.3
+                }
+                element TextArea(Example/Visibility/UseOptimizationInfo)
+                {
+                        metrics_mode pixels
+                        left 155
+                        top 35
                         width 90
                         height 30

trunk/VUT/Ogre/src/OgreOctreeHierarchyInterface.cpp

@@ -57 +57 @@
                                                                                                   GtpVisibility::HierarchyNode *node2) const
 {
-        // matt: change this (inefficient)
-        AxisAlignedBox box1, box2;
-
-        static_cast<Octree *>(node1)->_getCullBounds(&box1);
-        static_cast<Octree *>(node2)->_getCullBounds(&box2);
-
-        return GetSquaredViewDepth(mCamera, &box1) > GetSquaredViewDepth(mCamera, &box2);
+        return GetSquaredViewDepth(mCamera, &static_cast<Octree *>(node1)->mBox) > 
+                   GetSquaredViewDepth(mCamera, &static_cast<Octree *>(node2)->mBox);
 }
 //-----------------------------------------------------------------------
@@ -70 +65 @@
 {
         Vector3 mid = ((box->getMinimum() - box->getMaximum()) * 0.5) + box->getMinimum();
-        return (cam->getDerivedPosition() - mid).squaredLength();                                                                   
+        // use nearest point rather than midpoint
+        Vector3 camPos = cam->getDerivedPosition();
+
+        Vector3 minPos(camPos.x < mid.x ? box->getMinimum().x : box->getMaximum().x,
+                                   camPos.y < mid.y ? box->getMinimum().y : box->getMaximum().y,
+                                   camPos.z < mid.z ? box->getMinimum().z : box->getMaximum().z);
+        
+        return (camPos - minPos).squaredLength();                                                                   
 }
 //-----------------------------------------------------------------------

trunk/VUT/Ogre/src/OgrePlatformHierarchyInterface.cpp

@@ -6 +6 @@
 #include "OgrePlatformHierarchyInterface.h"
 #include "OgrePlatformOcclusionQuery.h"
+#include <windows.h>
 
 namespace Ogre {
@@ -33 +34 @@
 void PlatformHierarchyInterface::RenderBoundingBox(AxisAlignedBox *box)
 {
+        static RenderOperation ro;
+
+        //TODO: this should be the full bounding box
+        SolidHalfBoundingBox *halfbox = GetSolidHalfBoundingBox();
+        
+        mRenderSystem->_setWorldMatrix(Ogre::Matrix4::IDENTITY);
+        mSceneManager->useRenderableViewProjMode(halfbox);
+    mSceneManager->setPass(halfbox->getTechnique()->getPass(0));
+
         // Render two halfes of the bounding box (using triangle fans)
         for(int halfIdx = 0; halfIdx < 2; ++halfIdx)
         {
-                //TODO: this should be the full bounding box
-                SolidHalfBoundingBox *halfbox = GetSolidHalfBoundingBox();
-                halfbox->SetupBoundingBox(*box, halfIdx == 1);
+                halfbox->SetupBoundingBoxVertices(*box, halfIdx == 1);
                                 
-                mRenderSystem->_setWorldMatrix(Ogre::Matrix4::IDENTITY);
-                
-                static RenderOperation ro;
-
-        mSceneManager->useRenderableViewProjMode(halfbox);
-                mSceneManager->setPass(GetSolidHalfBoundingBox()->getTechnique()->getPass(0));
                 halfbox->getRenderOperation(ro);
                 ro.srcRenderable = halfbox;
-                mRenderSystem->_render(ro);
+                mRenderSystem->_render(ro);     
         }
 }
@@ -70 +72 @@
 {
         GtpVisibility::HierarchyInterface::InitFrame(root);
+        mPreviousNode = NULL;
         SetCamera(cam);
 }
@@ -94 +97 @@
 //-----------------------------------------------------------------------
 GtpVisibility::OcclusionQuery *PlatformHierarchyInterface::IssueOcclusionQuery(
-        GtpVisibility::HierarchyNode *node) 
+        GtpVisibility::HierarchyNode *node, const bool wasVisible) 
 {
         // get next available test id
@@ -102 +105 @@
         query->BeginQuery();
                         
-        RenderBoundingBox(GetBoundingBox(node));
+        // if leaf and was visible => will be rendered anyway, thus we
+        // can also test with the real geometry 
+        if(mUseOptimization && wasVisible && IsLeaf(node))
+        {
+        //      OutputDebugString("Using optimization!!\n");
+                RenderNode(node);
+        }
+        else
+        {
+        //      OutputDebugString("Not optimized!!\n");
+                RenderBoundingBox(GetBoundingBox(node));
+        }
 
         query->EndQuery();

trunk/VUT/Ogre/src/OgrePlatformOcclusionQuery.cpp

@@ -1 +1 @@
 #include "OgrePlatformOcclusionQuery.h"
-
+#include <windows.h>
 namespace Ogre {
 
@@ -24 +24 @@
 }
 //-----------------------------------------------------------------------
-unsigned int PlatformOcclusionQuery::GetQueryResult() const
+bool PlatformOcclusionQuery::GetQueryResult(unsigned int &visiblePixels, 
+                                                                                        const bool waitForResult) const
 {
-        unsigned int visiblePixels = 0;
-        // wait if result not available
-        mHardwareOcclusionQuery->pullOcclusionQuery(&visiblePixels);
-
-        return visiblePixels;
-}
-//-----------------------------------------------------------------------
-bool PlatformOcclusionQuery::ResultAvailable() const
-{
-#ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        return mHardwareOcclusionQuery->resultAvailable();
-#else
-        return true;
-#endif
+        return mHardwareOcclusionQuery->pullOcclusionQuery(&visiblePixels, waitForResult);
 }
 

trunk/VUT/Ogre/src/OgreSolidHalfBoundingBox.cpp

@@ -26 +26 @@
         Vector3 vmin = aab.getMinimum();
                 
-        Real sqLen = std::max(vmax.squaredLength(), vmin.squaredLength());
-    mRadius = Math::Sqrt(sqLen);
+        //Real sqLen = std::max(vmax.squaredLength(), vmin.squaredLength());
+    //mRadius = Math::Sqrt(sqLen);
         
         Real maxx = vmax.x;
@@ -90 +90 @@
 
     // setup the bounding box of this SimpleRenderable
-        setBoundingBox(aabb);
+        //setBoundingBox(aabb);
 }
 //-----------------------------------------------------------------------

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -18 +18 @@
 
         //mDisplayNodes = true;
-        mShowBoundingBoxes = true;
-        mShowBoxes = true;
-        //mMaxDepth = 20;
+        //mShowBoundingBoxes = true;
+        //mShowBoxes = true;
+        mMaxDepth = 20;
 }
 //-----------------------------------------------------------------------

trunk/VUT/Ogre/src/OgreVisibilityOptionsManager.cpp

@@ -20 +20 @@
         {
                 mVisibilityManager->SetVisibilityCullingThreshold(*static_cast<const int *>(val));
-
+                return true;
+        }
+        if (key == "UseOptimization")
+        {
+                mHierarchyInterface->SetUseOptimization(*static_cast<const bool *>(val));
                 return true;
         }
@@ -53 +57 @@
                 return true;
         }
+        
         return false;
 }

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -12 +12 @@
 //namespace GtpVisibility {
 //-----------------------------------------------------------------------
-VisibilityTerrainSceneManager::VisibilityTerrainSceneManager(GtpVisibility::VisibilityManager *visManager)
-:mVisibilityManager(visManager)
+VisibilityTerrainSceneManager::VisibilityTerrainSceneManager(
+        GtpVisibility::VisibilityManager *visManager): mVisibilityManager(visManager)
 {
         mHierarchyInterface = 
                 new OctreeHierarchyInterface(this, mDestRenderSystem);
 
-        setVisibilityManager(visManager);
         //mShowBoxes = true;
         //mDisplayNodes = true;