Changeset 2123 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include

Timestamp:

02/17/07 22:48:12 (18 years ago)

Author:

mattausch

Message:

worded on obj loading in Ogre

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include

Files:

• OgreBoundingBoxConverter.h (modified) (3 diffs)
• OgreOcclusionCullingSceneManager.h (modified) (6 diffs)

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

@@ -217 +217 @@
 
                         // we are only interested in scene entities
-                        if (mo->getMovableType() != "Entity")
+                        if ((mo->getMovableType() != "Entity") &&
+                                (mo->getMovableType() != "ManualObject"))
                                 continue;
                         
@@ -237 +238 @@
 }
 
+static void AddToObjects(EntityContainer *entites, 
+                                                 GtpVisibilityPreprocessor::ObjectContainer &objects,
+                                                 const int id)
+{
+        // TODO: can actually just put single objects into pvs with same id, 
+        // this can be sorted out later!!
+#if 0
+        EntityContainer::const_iterator eit, eit_end = entryObjects.end();
+
+        for (eit = entryObjects.begin(); eit != eit_end; ++ eit)
+        {
+                Entity *ent = *eit;
+
+        // warning: multiple ids possible
+                OgreMeshInstance *omi = new OgreMeshInstance(ent);
+                omi->SetId(id);
+                objects.push_back(omi);
+        }
+
+        delete entryObjects;
+
+#else
+
+        EngineIntersectable *entry = new EngineIntersectable(entites);
+
+        entry->SetId(id);
+        objects.push_back(entry);
+#endif
+}
+
 #if USE_KD_PVS
 //-------------------------------------------------------------------------
@@ -255 +286 @@
                         OgreTypeConverter::ConvertToOgre(pbox);
                 
-                EntityContainer entryObjects;
+                EntityContainer *entryObjects = new EntityContainer();
 
                 // find all objects that intersect the bounding box
-                FindIntersectingObjects(box, entryObjects);
-
-                // TODO: can actually just put single objects into pvs with same id, 
-                // this can be sorted out later!!
-#if 1
-                EntityContainer::const_iterator eit, eit_end = entryObjects.end();
-
-                for (eit = entryObjects.begin(); eit != eit_end; ++ eit)
-                {
-                        Entity *ent = *eit;
-
-            // warning: multiple ids possible
-                        OgreMeshInstance *omi = new OgreMeshInstance(ent);
-                        omi->SetId(id);
-                        objects.push_back(omi);
-                }
-#else
-                EngineIntersectable *entry = 
-                        new EngineIntersectable(entryObjects);
-
-                entry->SetId(id);
-                objects.push_back(entry);
-#endif
+                FindIntersectingObjects(box, *entryObjects);
+
+                AddToObjects(entryObjects, objects, id);
         }
 

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

@@ -14 +14 @@
 #include "ViewCellsManager.h"
 
+
+namespace GtpVisibilityPreprocessor {
+class Intersectable;
+}
+
+class ObjReader;
+
 namespace Ogre {
 
@@ -24 +31 @@
 {
 public:
-        OcclusionCullingSceneManager(const String& name, GtpVisibility::VisibilityManager *visManager);
+        OcclusionCullingSceneManager(const String& name, 
+                                                                 GtpVisibility::VisibilityManager *visManager);
         ~OcclusionCullingSceneManager();
 
@@ -70 +78 @@
         */
         bool validatePassForRendering(Pass* pass);
+
 #ifdef ITEM_BUFFER
         void RenderItemBuffer(RenderPriorityGroup* pGroup);
         void RenderSingleObjectForItemBuffer(Renderable *rend, Pass *pass);
 #endif // ITEM_BUFFER
+
         void _renderQueueGroupObjects(RenderQueueGroup* pGroup,
-                QueuedRenderableCollection::OrganisationMode om);
-
-        /** Override from SceneManager so that sub entities can be assigned an id for item buffer.
+                                                                  QueuedRenderableCollection::OrganisationMode om);
+
+        /** Override from SceneManager so that sub entities can be assigned 
+                an id for item buffer.
         */
         Entity* createEntity(const String& entityName, const String& meshName);
@@ -93 +104 @@
         void endFrame();
 
-        void renderAdditiveStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup,
-                QueuedRenderableCollection::OrganisationMode om);
-        void renderModulativeStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup,
-                QueuedRenderableCollection::OrganisationMode om);
+        void renderAdditiveStencilShadowedQueueGroupObjects(
+                                RenderQueueGroup* pGroup,
+                                QueuedRenderableCollection::OrganisationMode om);
+        void renderModulativeStencilShadowedQueueGroupObjects(
+                                RenderQueueGroup* pGroup,
+                                QueuedRenderableCollection::OrganisationMode om);
         
         /** Override standard function so octree boxes are always of equal side length.
@@ -113 +126 @@
 protected:
         
+        void MailPvsObjects();
+        void RenderPvsEntry(GtpVisibilityPreprocessor::Intersectable *obj);
+        void SetObjectVisible(GtpVisibilityPreprocessor::Intersectable *entry, 
+                                                  const bool visible);
+        void ShowViewCellsGeometry();
+
         /** Creates material for depth pass, e.g., a pass that only fills the depth buffer. 
         */
@@ -254 +273 @@
 
         bool mShowTerrain;
+
+        ObjReader *mObjReader;
 };