Changeset 2283

Timestamp:

03/23/07 01:40:24 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (1 diff)
• OnlineCullingCHC/OGRE/src/OgreOctreeHierarchyInterface.cpp (modified) (7 diffs)
• OnlineCullingCHC/src/RandomUpdateCullingManager.cpp (modified) (3 diffs)
• Preprocessing/src/VspBspTree.cpp (modified) (4 diffs)
• Preprocessing/src/VssPreprocessor.cpp (modified) (1 diff)

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

@@ -2025 +2025 @@
                 return;
         }
-Ogre::LogManager::getSingleton().logMessage("here99");
+
     Root::getSingleton()._setCurrentSceneManager(this);
         mActiveQueuedRenderableVisitor->targetSceneMgr = this;

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

@@ -62 +62 @@
         
         std::vector<Octree *> nodes;
-
-        //LogManager::getSingleton().logMessage("***");
+        nodes.reserve(8);
+
         for (int i = 0; i < 8; ++ i)
         {
@@ -70 +70 @@
                 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)
                 {
@@ -76 +79 @@
         }
 
+        //std::stringstream str; str << "nodes: " << nodes.size();
+        //Ogre::LogManager::getSingleton().logMessage(str.str());
+
         if (nodes.empty())
                 return NULL;
 
-        int r = (int) (rand() * (float)nodes.size());
+        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]);
@@ -101 +111 @@
         if (!octree->mNodes.empty())
         {
+                RenderNodeRecursive(node);
+        }
+
+/*
                 // render everything from here
                 if (octree->isOctreeFullyVisible())
@@ -133 +147 @@
                         mDistanceQueue->push(nextChild);
         }
+        */
 }
 //-----------------------------------------------------------------------
@@ -206 +221 @@
         
         Octree *nextChild;
-        //LogManager::getSingleton().logMessage("***");
+        
         for (int i = 0; i < 8; ++ i)
         {
@@ -212 +227 @@
                 int y = (i & 2) / 2;
                 int z = i & 1;
-                Ogre::LogManager::getSingleton().logMessage("y");
-                //std::stringstream d; d << "x " << x << " y " << y << " z " << z;
-                //LogManager::getSingleton().logMessage(d.str());
-
-                if ((nextChild = octant->mChildren[x][y][z]) != NULL)
+                
+                        if ((nextChild = octant->mChildren[x][y][z]) != NULL)
                 {
                         DetermineFullVisibility(nextChild);

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

@@ -33 +33 @@
         /////////////
         //-- PART 1: process finished occlusion queries
-        
+        //mHierarchyInterface->TraverseNode2(mHierarchyInterface->GetHierarchyRoot());
+        //return;
+
         while (!mHierarchyInterface->GetQueue()->empty() || !queryQueue.empty())
         {
@@ -108 +110 @@
                                         continue;
                                 }
-                                if (mHierarchyInterface->IsLeaf(node))
-                                {
-                                        if (mHierarchyInterface->IsNodeVisible(node))
-                                                CullingLogManager::GetSingleton()->LogMessage("u");
-                                        else
-                                                CullingLogManager::GetSingleton()->LogMessage("g");
-                                }
-                                
+                                                                
                                 if (mHierarchyInterface->IsNodeFullyVisible(node))
                                 {
-                                        CullingLogManager::GetSingleton()->LogMessage("here8");
                                         // node fully visible => test only random leaves
                                         for (int i = 0; i < mRandomCandidates; ++ i)
                                         {
-                                                CullingLogManager::GetSingleton()->LogMessage("z");
                                                 HierarchyNode *randomLeaf = mHierarchyInterface->GetRandomLeaf(node);
-                                                CullingLogManager::GetSingleton()->LogMessage("c");
+                                                
                                                 if (!randomLeaf)
                                                         continue;
@@ -136 +129 @@
                                                 queryQueue.push(QueryPair(node, 
                                                         mHierarchyInterface->IssueNodeOcclusionQuery(node)));
-                                                
-                                                        CullingLogManager::GetSingleton()->LogMessage("a");
-                                                mHierarchyInterface->TraverseNode2(node);
-                                                        CullingLogManager::GetSingleton()->LogMessage("b");
                                         }
+
+                                        mHierarchyInterface->TraverseNode2(node);
 
                                         continue;

GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp

@@ -1778 +1778 @@
                 {
                         const int randIdx = 
-                                (int)RandomValue(0, (Real)((int)data.mPolygons->size() - 1));
+                                (int)RandomValue(0, (Real)((float)data.mPolygons->size() - 0.5f));
                         Polygon3 *nextPoly = (*data.mPolygons)[randIdx];
 
@@ -1814 +1814 @@
                 // swap candidate to the end to avoid testing same plane
                 std::swap((*data.mPolygons)[maxIdx], (*data.mPolygons)[candidateIdx]);
-                //Polygon3 *poly = (*data.mPolygons)[(int)RandomValue(0, (int)polys.size() - 1)];
-
+        
                 // evaluate current candidate
                 BspNodeGeometry fGeom, bGeom;
@@ -1895 +1894 @@
 Plane3 VspBspTree::ChooseCandidatePlane(const RayInfoContainer &rays) const
 {
-        const int candidateIdx = (int)RandomValue(0, (Real)((int)rays.size() - 1));
+        const int candidateIdx = (int)RandomValue(0, (Real)((float)rays.size() - 0.5f));
 
         const Vector3 minPt = rays[candidateIdx].ExtrapOrigin();
@@ -2103 +2102 @@
         {
                 const int testIdx = useRand ? 
-                        (int)RandomValue(0, (Real)((int)data.mRays->size() - 1)) : i;
+                        (int)RandomValue(0, (Real)((float)data.mRays->size() - 0.5f)) : i;
                 RayInfo rayInf = (*data.mRays)[testIdx];
 

GTP/trunk/Lib/Vis/Preprocessing/src/VssPreprocessor.cpp

@@ -283 +283 @@
                 Intersectable *sourceObj = mObjects[5];
 
-                const int index = (int)RandomValue(0, (Real)((int)leaves.size() - 1));
+                const int index = (int)RandomValue(0, (Real)((float)leaves.size() - 0.5f));
                 VssTreeLeaf *leaf = leaves[index];