Changeset 2259 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Timestamp:

03/18/07 01:27:51 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreBvHierarchyInterface.h (modified) (1 diff)
• include/OgreKdTreeHierarchyInterface.h (modified) (1 diff)
• include/OgreOctreeHierarchyInterface.h (modified) (1 diff)
• include/OgreSceneNodeHierarchyInterface.h (modified) (1 diff)
• src/OgreOctreeHierarchyInterface.cpp (modified) (3 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreBvHierarchyInterface.h

@@ -97 +97 @@
         void TraverseNode2(GtpVisibility::HierarchyNode *node) {}
         bool IsNodeFullyVisible(GtpVisibility::HierarchyNode *node) const { return false;}
+        GtpVisibility::HierarchyNode *GetRandomLeaf(GtpVisibility::HierarchyNode *root) { return NULL;}
 };
 

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTreeHierarchyInterface.h

@@ -96 +96 @@
         void DetermineFullVisibility(GtpVisibility::HierarchyNode *node) const {}
 
-        void TraverseNode2(GtpVisibility::HierarchyNode *node);
+        void TraverseNode2(GtpVisibility::HierarchyNode *node) {}
 
-        HierarchyNode *GetRandomLeaf() { return NULL;}
+        GtpVisibility::HierarchyNode *GetRandomLeaf(GtpVisibility::HierarchyNode *root) { return NULL;}
 
         bool IsNodeFullyVisible(GtpVisibility::HierarchyNode *node) const { return false;}
+
 };
 

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreOctreeHierarchyInterface.h

@@ -55 +55 @@
         void TraverseNode2(GtpVisibility::HierarchyNode *node);
 
-        HierarchyNode *GetRandomLeaf();
+        GtpVisibility::HierarchyNode *GetRandomLeaf(GtpVisibility::HierarchyNode *node);
 
         bool IsNodeFullyVisible(GtpVisibility::HierarchyNode *node) const;
 
+        void RenderNodeRecursive(GtpVisibility::HierarchyNode *node);
+
+
 protected:
+
         /** Returns pointer to the bounding box of the node.
                 @param node current hierarchy node

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreSceneNodeHierarchyInterface.h

@@ -48 +48 @@
         void DetermineFullVisibility(GtpVisibility::HierarchyNode *node) const {}
         void TraverseNode2(GtpVisibility::HierarchyNode *node) {}
-        HierarchyNode *GetRandomLeaf() { return NULL;}
+        GtpVisibility::HierarchyNode *GetRandomLeaf(GtpVisibility::HierarchyNode *root) { return NULL;}
         bool IsNodeFullyVisible(GtpVisibility::HierarchyNode *node) const { return false;}
 

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

@@ -51 +51 @@
 }
 //-----------------------------------------------------------------------
-HierarchyNode *OctreeHierarchyInterface::GetRandomLeaf() 
+GtpVisibility::HierarchyNode *OctreeHierarchyInterface::GetRandomLeaf(GtpVisibility::HierarchyNode *root) 
 { 
-        return NULL;
-}
-//-----------------------------------------------------------------------
-bool OctreeHierarchyInterface::GIsNodeFullyVisible(GtpVisibility::HierarchyNode *node) const
-{
-        return static_cast<Octree *>(node)->isOctreeFullyVisible();
+        if (IsLeaf(root))
+                return root;
+
+        Octree *octree = static_cast<Octree *>(root);
+
+        int mask = (int) (rand() * 8);
+        
+        // random decision
+        Octree *child = octree->mChildren[mask & 1][mask & 2][mask & 3];
+
+        return GetRandomLeaf(child);
 }
 //-----------------------------------------------------------------------
@@ -214 +219 @@
 }
 //-----------------------------------------------------------------------
+void OctreeHierarchyInterface::RenderNodeRecursive(GtpVisibility::HierarchyNode *node)
+{
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        Octree *octant = static_cast<Octree *>(node);
+
+        if (octant->lastRendered() != mFrameId)
+        {
+                octant->setLastRendered(mFrameId);
+                OctreeSceneManager *ocm = 
+                        static_cast<OctreeSceneManager *>(mSceneManager);
+
+                ocm->_renderOctantRecursive(mCamera, 
+                                                                        octant, 
+                                                                        mOnlyShadowCasters, 
+                                                                        mLeavePassesInQueue);
+
+                mVisibleNodes.push_back(node);
+        }
+#endif  
+}
+//-----------------------------------------------------------------------
 bool OctreeHierarchyInterface::IsNodeVisible(GtpVisibility::HierarchyNode *node) const
 {
@@ -223 +249 @@
 }
 //-----------------------------------------------------------------------
+bool OctreeHierarchyInterface::IsNodeFullyVisible(GtpVisibility::HierarchyNode *node) const
+{
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        return static_cast<Octree *>(node)->isOctreeFullyVisible();
+#else
+        return true;
+#endif
+}
+//-----------------------------------------------------------------------
 unsigned int OctreeHierarchyInterface::LastVisited(GtpVisibility::HierarchyNode *node) const
 {