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

Timestamp:

03/22/07 11:48:21 (18 years ago)

Author:

mattausch

Message:

worked on randomupdatemanager

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreOctreeHierarchyInterface.h (modified) (1 diff)
• src/OgreOcclusionCullingSceneManager.cpp (modified) (2 diffs)
• src/OgreOctreeHierarchyInterface.cpp (modified) (3 diffs)
• src/OgrePlatformHierarchyInterface.cpp (modified) (2 diffs)
• src/OgreSceneContentGenerator.cpp (modified) (1 diff)
• src/OgreTerrainContentGenerator.cpp (modified) (1 diff)
• src/Plugin_VisibilitySceneManager.vcproj (modified) (2 diffs)

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

@@ -16 +16 @@
         
         /** Sets the number of nodes in this octree 
-                @remark do not confuse this with the OctreeNode class which is derived from SceneNode
+                @remark do not confuse this with the OctreeNode class 
+                which is derived from SceneNode.
                 @param num number of nodes in the octree
         */

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

@@ -1928 +1928 @@
 
                 ivReader.buildTree(this, node);
-                
                 ivReader.collapse();
-
+                
                 std::stringstream d; 
                 d << "loaded " << filename << " in " << timer->getMilliseconds() * 1e-3 << " secs";
@@ -1937 +1936 @@
                 PlatformManager::getSingleton().destroyTimer(timer);
 
-                //-- bake into static geometry
                 /*if (USE_STATIC_GEOMETRY)
                 {
+                        //-- bake into static geometry
                         BakeSceneIntoStaticGeometry("staticVienna", "Vienna");
                 }*/

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

@@ -58 +58 @@
         Octree *octree = static_cast<Octree *>(root);
 
-        int mask = (int) (rand() * 8);
+        int mask = (int) (rand() * 8.0f);
         
         // random decision
-        Octree *child = octree->mChildren[mask & 1][mask & 2][mask & 3];
+        Octree *child = NULL;
+        
+        while (!child)
+                child = octree->mChildren[(mask & 4) / 4][(mask & 2) / 2][mask & 1];
 
         return GetRandomLeaf(child);
@@ -173 +176 @@
         {
                 octant->setOctreeFullyVisible(octant->isOctreeVisible());
+                        
                 return;
         }
 
-        octant->setOctreeFullyVisible(false);
-
+        octant->setOctreeFullyVisible(true);
+        
         Octree *nextChild;
-
+        //LogManager::getSingleton().logMessage("***");
         for (int i = 0; i < 8; ++ i)
         {
-                int x = i & 4;
-                int y = i & 2;
+                int x = (i & 4) / 4;
+                int y = (i & 2) / 2;
                 int z = i & 1;
+
+                //std::stringstream d; d << "x " << x << " y " << y << " z " << z;
+                //LogManager::getSingleton().logMessage(d.str());
 
                 if ((nextChild = octant->mChildren[x][y][z]) != NULL)
                 {
                         DetermineFullVisibility(nextChild);
+                        // this leaf is not fully visible => break
                         if (!nextChild->isOctreeFullyVisible())
-                        return;
+                                octant->setOctreeFullyVisible(false);
                 }
         }
-
-        // all children fully visible => pull up
-        octant->setOctreeFullyVisible(true);
 }
 //-----------------------------------------------------------------------
@@ -295 +300 @@
         }
 
-        //static_cast<OctreeSceneManager *>(mSceneManager)->getBoxes()->push_back(box);
         static_cast<OctreeSceneManager *>(mSceneManager)->getBoxes()->push_back(box);
 }

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

@@ -95 +95 @@
         static RenderOperation ro;
 
-        //LogManager::getSingleton().logMessage("here66");
         SolidBoundingBox *solidBox = GetSolidBoundingBox();
         
@@ -182 +181 @@
         GtpVisibility::HierarchyNode *node, 
         const bool wasVisible) 
-{//LogManager::getSingleton().logMessage("here6960");
+{
         // get next available test id
         GtpVisibility::OcclusionQuery *query = GetNextOcclusionQuery();

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

@@ -157 +157 @@
                 return false;
 
-        //mSceneNodes.clear(); // reset list of objects
-
-        while (!ifstr.eof()) 
+        while (1)
         {
                 ifstr.getline(line, 256);
+
+                if (ifstr.eof())
+                        break;
+
                 sscanf(line, "%s %f %f %f %f %f %f %f %f %f %f", objName, 
                         &position.x, &position.y, &position.z,

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

@@ -43 +43 @@
         return false;
 }
+
 
 /*******************************************************/

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

@@ -26 +26 @@
                                 RuntimeLibrary="3"
                                 EnableFunctionLevelLinking="TRUE"
-                                RuntimeTypeInfo="TRUE"
+                                RuntimeTypeInfo="FALSE"
                                 UsePrecompiledHeader="2"
                                 WarningLevel="3"
@@ -113 +113 @@
                                 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;..\..\..\..\..\..\..\NonGTP\Zlib\lib;"..\..\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\lib\$(ConfigurationName)""
                                 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def"
-                                GenerateDebugInformation="FALSE"
+                                GenerateDebugInformation="TRUE"
                                 SubSystem="2"
                                 OptimizeReferences="2"