Changeset 2292 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src

Timestamp:

03/26/07 18:49:17 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src

Files:

• OgreOctreeHierarchyInterface.cpp (modified) (10 diffs)
• Plugin_VisibilitySceneManager.vcproj (modified) (1 diff)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOctreeHierarchyInterface.cpp

@@ -1 +1 @@
 #include "OgreOctreeHierarchyInterface.h"
-//#include "OgreVisibilityOctreeSceneManager.h"
 #include <OgreOctree.h>
 #include <OgreLogManager.h>
@@ -70 +69 @@
                 int z = i & 1;
         
-                //std::stringstream d; d << x << " " << y << " " << z;
-                //Ogre::LogManager::getSingleton().logMessage(d.str());
-
                 if ((child = octree->mChildren[x][y][z]) != NULL)
                 {
@@ -78 +74 @@
                 }
         }
-
-        //std::stringstream str; str << "nodes: " << nodes.size();
-        //Ogre::LogManager::getSingleton().logMessage(str.str());
 
         if (nodes.empty())
@@ -87 +80 @@
         int r = (int)(((float)rand() / RAND_MAX) * ((float)nodes.size() - 0.5f));
 
-        //std::stringstream str2;
-        //str2 << "rand: " << r;
-        //Ogre::LogManager::getSingleton().logMessage(str2.str());
-
         return GetRandomLeaf(nodes[r]);
-        // assume that at least one child is not NULL ...
-        /*while (!child)
-        {
-                int mask = (int) (rand() * 8.0f);
-                child = octree->mChildren[(mask & 4) / 4][(mask & 2) / 2][mask & 1];
-        }
-
-        return GetRandomLeaf(child);*/
-}
-//-----------------------------------------------------------------------
-void OctreeHierarchyInterface::TraverseNode2(GtpVisibility::HierarchyNode *node)
-{
-        ++ mNumTraversedNodes;
-
-        Octree *octree = static_cast<Octree *>(node);
-
-        // if we come across some renderable geometry => render it
-        //if (!octree->mNodes.empty())
-        //{
-                RenderNodeRecursive(node);
-        //}
-
-/*
-                // render everything from here
-                if (octree->isOctreeFullyVisible())
-                {               
-                        RenderNodeRecursive(node);
-                        return;
-                }
-
-                RenderNode(node);
-        }
-                
-        // if not all subtrees are empty
-        if (!IsLeaf(node))
-        {
-                Octree *nextChild;
-
-                if ((nextChild = octree->mChildren[0][0][0]) != NULL)
-                        mDistanceQueue->push(nextChild);
-                if ((nextChild = octree->mChildren[0][0][1]) != NULL)
-                        mDistanceQueue->push(nextChild);
-                if ((nextChild = octree->mChildren[0][1][0]) != NULL)
-                        mDistanceQueue->push(nextChild);
-                if ((nextChild = octree->mChildren[0][1][1]) != NULL)
-                mDistanceQueue->push(nextChild);
-                if ((nextChild = octree->mChildren[1][0][0]) != NULL)
-                        mDistanceQueue->push(nextChild);
-                if ((nextChild = octree->mChildren[1][0][1]) != NULL)
-                        mDistanceQueue->push(nextChild);
-                if ((nextChild = octree->mChildren[1][1][0]) != NULL)
-                        mDistanceQueue->push(nextChild);
-                if ((nextChild = octree->mChildren[1][1][1]) != NULL)
-                        mDistanceQueue->push(nextChild);
-        }
-        */
 }
 //-----------------------------------------------------------------------
@@ -168 +101 @@
         const Vector3 bmax = static_cast<Octree *>(node)->mBox.getMaximum();
 
-        const Vector3 pos = (bmax - bmin) * 0.5 + bmin;
-        
-/*      std::stringstream d; 
-        d << "a: " << (mCameraPosition - pos).squaredLength() 
-          << " b: " << (mCullCamera->getDerivedPosition() - pos).squaredLength();
-        LogManager::getSingleton().logMessage(d.str());*/
+        const Vector3 pos = (bmax - bmin) * 0.5f + bmin;
+        
         return (mCameraPosition - pos).squaredLength();
 }
@@ -206 +135 @@
 }
 //-----------------------------------------------------------------------
-void OctreeHierarchyInterface::DetermineFullVisibility(GtpVisibility::HierarchyNode *node) const
+/*void OctreeHierarchyInterface::PullUpFullVisibility(GtpVisibility::HierarchyNode *node) const
 {               
-        Octree *octant = static_cast<Octree *>(node);
-
-        // leaf node: terminate recursion
-        if (IsLeaf(node))
-        {
-                octant->setOctreeFullyVisible(octant->isOctreeVisible());
-                        
-                return;
-        }
-
-        octant->setOctreeFullyVisible(true);
-        
-        Octree *nextChild;
-        
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        Octree *octant = static_cast<Octree *>(node);
+
         for (int i = 0; i < 8; ++ i)
         {
@@ -228 +146 @@
                 int z = i & 1;
                 
-                        if ((nextChild = octant->mChildren[x][y][z]) != NULL)
+                if ((nextChild = octant->mChildren[x][y][z]) != NULL)
                 {
                         DetermineFullVisibility(nextChild);
@@ -236 +154 @@
                 }
         }
+
+        while (octant && !octant->isOctreeVisible())
+        {
+                octant->setOctreeVisible(true);
+                octant = octant->getParent();
+        }
+#endif
+}*/
+//-----------------------------------------------------------------------
+void OctreeHierarchyInterface::DetermineFullVisibility(GtpVisibility::HierarchyNode *node) const
+{               
+        Octree *octant = static_cast<Octree *>(node);
+
+        // leaf node: terminate recursion
+        if (IsLeaf(node))
+        {
+                octant->setOctreeFullyVisible(octant->isOctreeVisible());       
+                return;
+        }
+
+        octant->setOctreeFullyVisible(true);
+        
+        Octree *nextChild;
+        
+        for (int i = 0; i < 8; ++ i)
+        {
+                int x = (i & 4) / 4;
+                int y = (i & 2) / 2;
+                int z = i & 1;
+                
+                if ((nextChild = octant->mChildren[x][y][z]) != NULL)
+                {
+                        DetermineFullVisibility(nextChild);
+                        // this leaf is not fully visible => break
+                        if (!nextChild->isOctreeFullyVisible())
+                                octant->setOctreeFullyVisible(false);
+                }
+        }
 }
 //-----------------------------------------------------------------------
@@ -264 +220 @@
         Octree *octant = static_cast<Octree *>(node);
 
-        if (1)//octant->lastRendered() != mFrameId)
+        if (octant->lastRendered() != mFrameId)
         {
                 octant->setLastRendered(mFrameId);
@@ -351 +307 @@
         }
 }
+//-----------------------------------------------------------------------
+void OctreeHierarchyInterface::CollectLeaves(GtpVisibility::HierarchyNode *root, 
+                                                                                         GtpVisibility::HierarchyNodeContainer &nodes)
+{
+        std::stack<GtpVisibility::HierarchyNode *> tStack;
+        tStack.push(root);
+
+        Octree *child;
+
+        while (!tStack.empty())
+        {
+                GtpVisibility::HierarchyNode *node = tStack.top();
+                tStack.pop();
+
+                if (IsLeaf(node))
+                {
+                        nodes.push_back(node);
+                }
+                else
+                {
+                        Octree *octree = static_cast<Octree *>(node);
+                        
+                        for (int i = 0; i < 8; ++ i)
+                        {
+                                int x = (i & 4) / 4;
+                                int y = (i & 2) / 2;
+                                int z = i & 1;
+        
+                                if ((child = octree->mChildren[x][y][z]) != NULL)
+                                {
+                                        tStack.push(child);
+                                }
+                        }
+                }
+        }
+}
 
 

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/Plugin_VisibilitySceneManager.vcproj

@@ -322 +322 @@
                                 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\Release";"$(OGRE_PATH)\OgreMain\lib\Release";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";..\..\GtpVisibility\lib\Release;..\..\lib\Release;..\lib\Release;"$(OGRE_PATH)\Dependencies\lib\Release";..\..\..\Preprocessing\lib\Release;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;"$(CG_LIB_PATH)";..\..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\Lib\Vis\Preprocessing\MultiLevelRayTracing\RTWorld\Release;..\..\..\..\..\Lib\Vis\Preprocessing\MultiLevelRayTracing\RTScene\Release;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\Release;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\lib\Release"
                                 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def"
-                                GenerateDebugInformation="FALSE"
+                                GenerateDebugInformation="TRUE"
                                 SubSystem="2"
                                 OptimizeReferences="2"