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

Timestamp:

01/31/07 01:51:57 (18 years ago)

Author:

mattausch

Message:

worked on integration manual

Location:

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

Files:

• OgreBvHierarchy.cpp (modified) (2 diffs)
• OgreBvHierarchyInterface.cpp (modified) (1 diff)
• OgreBvHierarchySceneManager.cpp (modified) (1 diff)
• OgreKdTree.cpp (modified) (2 diffs)
• OgreKdTreeHierarchyInterface.cpp (modified) (1 diff)
• OgreKdTreeSceneManager.cpp (modified) (2 diffs)
• OgreMeshInstance.cpp (modified) (2 diffs)
• OgreOcclusionCullingSceneManager.cpp (modified) (8 diffs)
• OgreOcclusionQueriesQueryManager.cpp (modified) (1 diff)
• OgreOctreeHierarchyInterface.cpp (modified) (2 diffs)
• OgrePlatformQueryManager.cpp (modified) (3 diffs)

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

@@ -1536 +1536 @@
                         it != leaf->mBvhRenderables.end(); it ++)
                 {
-                        SceneNode *sn = dynamic_cast<SceneNode *>(*it);
+                        SceneNode *sn = static_cast<SceneNode *>(*it);
 
                         if (sn != exclude)
@@ -1618 +1618 @@
                 while (it != end)
                 {
-                        scenenode = dynamic_cast<BvHierarchySceneNode *>(*it);
+                        scenenode = static_cast<BvHierarchySceneNode *>(*it);
                         mBuildLog->logMessage(pad + "# Leaf   level " + 
                                 StringConverter::toString(node->getLevel()) + 

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

@@ -132 +132 @@
         }
 
-        dynamic_cast<BvHierarchySceneManager *>(mSceneManager)->getRenderQueue()->addRenderable(box);
+        static_cast<BvHierarchySceneManager *>(mSceneManager)->getRenderQueue()->addRenderable(box);
 }
 

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

@@ -1357 +1357 @@
                 if (entry.mObject)
                 {
-                        OgreMeshInstance *omi = dynamic_cast<OgreMeshInstance *>(entry.mObject);
+                        OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(entry.mObject);
                         omi->GetEntity()->setVisible(load);
                 }

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

@@ -1528 +1528 @@
                         it != leaf->mKdRenderables.end(); it ++)
                 {
-                        SceneNode *sn = dynamic_cast<SceneNode *>(*it);
+                        SceneNode *sn = static_cast<SceneNode *>(*it);
 
                         if (sn != exclude)
@@ -1606 +1606 @@
                 while (it != end)
                 {
-                        scenenode = dynamic_cast<KdTreeSceneNode *>(*it);
+                        scenenode = static_cast<KdTreeSceneNode *>(*it);
                         mBuildLog->logMessage(pad + "# Leaf   level " + 
                                 StringConverter::toString(node->getLevel()) + 

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

@@ -132 +132 @@
         }
 
-        dynamic_cast<KdTreeSceneManager *>(mSceneManager)->getRenderQueue()->addRenderable(box);
+        static_cast<KdTreeSceneManager *>(mSceneManager)->getRenderQueue()->addRenderable(box);
 }
 

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

@@ -1346 +1346 @@
         //////////
         //-- set PVS of view cell visible
+
         GtpVisibilityPreprocessor::ObjectPvsIterator pit = vc->GetPvs().GetIterator();
 
@@ -1354 +1355 @@
                 if (entry.mObject)
                 {
-                        OgreMeshInstance *omi = dynamic_cast<OgreMeshInstance *>(entry.mObject);
+                        OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(entry.mObject);
                         omi->GetEntity()->setVisible(load);
                 }

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

@@ -4 +4 @@
 namespace Ogre
 {
-
         OgreMeshInstance::OgreMeshInstance(Entity *ent):
         GtpVisibilityPreprocessor::Intersectable(), mEntity(ent)
@@ -74 +73 @@
                 return s;
         }
-        
 }

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

@@ -28 +28 @@
 
 //-----------------------------------------------------------------------
-OcclusionCullingSceneManager::OcclusionCullingSceneManager(const String& name, 
-                                                        GtpVisibility::VisibilityManager *visManager):
+OcclusionCullingSceneManager::OcclusionCullingSceneManager(
+                                                                const String& name, 
+                                                                GtpVisibility::VisibilityManager *visManager):
 TerrainSceneManager(name),
 mVisibilityManager(visManager), 
@@ -432 +433 @@
 
                         if (obj->Type() == 
-                                GtpVisibilityPreprocessor::Intersectable::OBJECTS_INTERSECTABLE)
+                                GtpVisibilityPreprocessor::Intersectable::ENGINE_INTERSECTABLE)
                         {
-                                ObjectsIntersectable *oi = dynamic_cast<ObjectsIntersectable *>(obj);
+                                EngineIntersectable *oi = static_cast<EngineIntersectable *>(obj);
 
                                 EntityContainer *entries = oi->GetItem();
@@ -457 +458 @@
                         case GtpVisibilityPreprocessor::Intersectable::OGRE_MESH_INSTANCE:
                                 {
-                                        OgreMeshInstance *omi = dynamic_cast<OgreMeshInstance *>(obj);
+                                        OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(obj);
                                         omi->GetEntity()->_updateRenderQueue(getRenderQueue());
                                 }
                                 break;
 
-                        case GtpVisibilityPreprocessor::Intersectable::OBJECTS_INTERSECTABLE:
+                        case GtpVisibilityPreprocessor::Intersectable::ENGINE_INTERSECTABLE:
                                 {
-                                        ObjectsIntersectable *oi = dynamic_cast<ObjectsIntersectable *>(obj);
+                                        EngineIntersectable *oi = static_cast<EngineIntersectable *>(obj);
 
                                         EntityContainer *entries = oi->GetItem();
@@ -471 +472 @@
                                         for (eit = entries->begin(); eit != eit_end; ++ eit)
                                         {
-                                                //OgreMeshInstance *omi = dynamic_cast<OgreMeshInstance *>(*eit);
+                                                //OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(*eit);
                                                 Entity *ent = *eit;
                                                 Any newAny = ent->getUserAny();
@@ -1394 +1395 @@
                         case GtpVisibilityPreprocessor::Intersectable::OGRE_MESH_INSTANCE:
                                 {
-                                        OgreMeshInstance *omi = dynamic_cast<OgreMeshInstance *>(entry);
+                                        OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(entry);
                                         omi->GetEntity()->setVisible(visible);
                                         //GtpVisibilityPreprocessor::Debug << "assigned id " << omi->GetId() << endl;
                                 }
                                 break;
-                        case GtpVisibilityPreprocessor::Intersectable::OBJECTS_INTERSECTABLE:
+                        case GtpVisibilityPreprocessor::Intersectable::ENGINE_INTERSECTABLE:
                                 {
-                                        //GtpVisibilityPreprocessor::ObjectsIntersectable *oi = 
-                                        //      dynamic_cast<GtpVisibilityPreprocessor::ObjectsIntersectable *>(entry);
-                                        ObjectsIntersectable *oi = dynamic_cast<ObjectsIntersectable *>(entry);
-
-                                        //GtpVisibilityPreprocessor::ObjectContainer *entries = oi->GetItem();
+                                        EngineIntersectable *oi = static_cast<EngineIntersectable *>(entry);
+
                                         EntityContainer *entries = oi->GetItem();
                                         EntityContainer::const_iterator eit,
@@ -1411 +1409 @@
                                         for (eit = entries->begin(); eit != eit_end; ++ eit)
                                         {
-                                                //OgreMeshInstance *omi = dynamic_cast<OgreMeshInstance *>(*eit);
                                                 Entity *ent = *eit;
                                                 ent->setVisible(visible);
-                                                //GtpVisibilityPreprocessor::Debug << "assigned id " << omi->GetId() << endl;
                                         }
                                 }
@@ -1484 +1480 @@
                         case GtpVisibilityPreprocessor::Intersectable::OGRE_MESH_INSTANCE:
                                 {
-                                        OgreMeshInstance *omi = dynamic_cast<OgreMeshInstance *>(obj);
+                                        OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(obj);
                                         omi->GetEntity()->setVisible(load);
                                         //GtpVisibilityPreprocessor::Debug << "assigned id " << omi->GetId() << endl;
                                 }
                                 break;
-                        case GtpVisibilityPreprocessor::Intersectable::OBJECTS_INTERSECTABLE:
+                        case GtpVisibilityPreprocessor::Intersectable::ENGINE_INTERSECTABLE:
                                 {
-                                        //GtpVisibilityPreprocessor::ObjectsIntersectable *oi = 
-                                        //      dynamic_cast<GtpVisibilityPreprocessor::ObjectsIntersectable *>(entry);
-                                        ObjectsIntersectable *oi = dynamic_cast<ObjectsIntersectable *>(obj);
+                                        //GtpVisibilityPreprocessor::EngineIntersectable *oi = 
+                                        //      static_cast<GtpVisibilityPreprocessor::EngineIntersectable *>(entry);
+                                        EngineIntersectable *oi = static_cast<EngineIntersectable *>(obj);
 
                                         //GtpVisibilityPreprocessor::ObjectContainer *entries = oi->GetItem();
@@ -1502 +1498 @@
                                         for (eit = entries->begin(); eit != eit_end; ++ eit)
                                         {
-                                                //OgreMeshInstance *omi = dynamic_cast<OgreMeshInstance *>(*eit);
+                                                //OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(*eit);
                                                 //omi->GetEntity()->setVisible(load);
                                                 Entity *ent = *eit;

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

@@ -27 +27 @@
         // we need access to the scene manager and the rendersystem
         PlatformHierarchyInterface *pfHierarchyInterface = 
-                //dynamic_cast<PlatformHierarchyInterface *>(mHierarchyInterface);
+                //static_cast<PlatformHierarchyInterface *>(mHierarchyInterface);
                 static_cast<PlatformHierarchyInterface *>(mHierarchyInterface);
 

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

@@ -116 +116 @@
                 octant->setLastRendered(mFrameId);
                 OctreeSceneManager *ocm = 
-                        dynamic_cast<OctreeSceneManager *>(mSceneManager);
+                        static_cast<OctreeSceneManager *>(mSceneManager);
 
                 ocm->_renderOctant(mCamera, octant, mOnlyShadowCasters, mLeavePassesInQueue);
@@ -172 +172 @@
         }
 
-        //dynamic_cast<OctreeSceneManager *>(mSceneManager)->getBoxes()->push_back(box);
-        dynamic_cast<OctreeSceneManager *>(mSceneManager)->getBoxes()->push_back(box);
+        //static_cast<OctreeSceneManager *>(mSceneManager)->getBoxes()->push_back(box);
+        static_cast<OctreeSceneManager *>(mSceneManager)->getBoxes()->push_back(box);
 }
 //-----------------------------------------------------------------------

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

@@ -33 +33 @@
                                bool relativeVisibility)
 {
-        SceneManager *sm = //dynamic_cast<PlatformHierarchyInterface *>
+        SceneManager *sm = //static_cast<PlatformHierarchyInterface *>
                 static_cast<PlatformHierarchyInterface *>
                 (mHierarchyInterface)->GetSceneManager();
@@ -96 +96 @@
         // we need access to the scene manager and the rendersystem
         PlatformHierarchyInterface *pfHierarchyInterface = 
-                //dynamic_cast<PlatformHierarchyInterface *>(mHierarchyInterface);
+                //static_cast<PlatformHierarchyInterface *>(mHierarchyInterface);
                 static_cast<PlatformHierarchyInterface *>(mHierarchyInterface);
 
@@ -195 +195 @@
 
         SceneManager *sm = 
-                //dynamic_cast<PlatformHierarchyInterface *>(mHierarchyInterface)->GetSceneManager();
+                //static_cast<PlatformHierarchyInterface *>(mHierarchyInterface)->GetSceneManager();
                 static_cast<PlatformHierarchyInterface *>(mHierarchyInterface)->GetSceneManager();