Changeset 2281

Timestamp:

03/22/07 18:51:14 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC

Files:

• OGRE/src/OgreOctreeHierarchyInterface.cpp (modified) (1 diff)
• src/RandomUpdateCullingManager.cpp (modified) (3 diffs)

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

@@ -58 +58 @@
         Octree *octree = static_cast<Octree *>(root);
 
-        int mask = (int) (rand() * 8.0f);
-        
         // random decision
         Octree *child = NULL;
         
-        while (!child)
+        std::vector<Octree *> nodes;
+
+        //LogManager::getSingleton().logMessage("***");
+        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)
+                {
+                        nodes.push_back(child);
+                }
+        }
+
+        if (nodes.empty())
+                return NULL;
+
+        int r = (int) (rand() * (float)nodes.size());
+
+        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);
+        }
+
+        return GetRandomLeaf(child);*/
 }
 //-----------------------------------------------------------------------

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/RandomUpdateCullingManager.cpp

@@ -33 +33 @@
         /////////////
         //-- PART 1: process finished occlusion queries
-        CullingLogManager::GetSingleton()->LogMessage("here55");
+        
         while (!mHierarchyInterface->GetQueue()->empty() || !queryQueue.empty())
         {
@@ -111 +111 @@
                                 {
                                         if (mHierarchyInterface->IsNodeVisible(node))
-                                                Ogre::LogManager::getSingleton().logMessage("u");
+                                                CullingLogManager::GetSingleton()->LogMessage("u");
                                         else
-                                                Ogre::LogManager::getSingleton().logMessage("g");
+                                                CullingLogManager::GetSingleton()->LogMessage("g");
                                 }
                                 
                                 if (mHierarchyInterface->IsNodeFullyVisible(node))
-                                {Ogre::LogManager::getSingleton().logMessage("here8");
+                                {
+                                        CullingLogManager::GetSingleton()->LogMessage("here8");
                                         // node fully visible => test only random leaves
                                         for (int i = 0; i < mRandomCandidates; ++ i)
                                         {
-                                                Ogre::LogManager::getSingleton().logMessage("z");
+                                                CullingLogManager::GetSingleton()->LogMessage("z");
                                                 HierarchyNode *randomLeaf = mHierarchyInterface->GetRandomLeaf(node);
+                                                CullingLogManager::GetSingleton()->LogMessage("c");
+                                                if (!randomLeaf)
+                                                        continue;
 
                                                 mHierarchyInterface->SetNodeVisible(randomLeaf, false);
@@ -133 +137 @@
                                                         mHierarchyInterface->IssueNodeOcclusionQuery(node)));
                                                 
+                                                        CullingLogManager::GetSingleton()->LogMessage("a");
                                                 mHierarchyInterface->TraverseNode2(node);
+                                                        CullingLogManager::GetSingleton()->LogMessage("b");
                                         }