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

Timestamp:

02/12/07 19:00:37 (18 years ago)

Author:

mattausch

Message:

changed pvs loading: loading objects in a first pass

Location:

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

Files:

• OgreBoundingBoxConverter.h (modified) (3 diffs)
• OgreMeshInstance.h (modified) (1 diff)

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

@@ -39 +39 @@
 };
 
+
 /**     Class which converts preprocessor types to OGRE types
 */
@@ -121 +122 @@
 
         list<SceneNode *>::const_iterator sit, sit_end = sceneNodeList.end();
+
         // find the bbox which is closest to the current bbox
         for (sit = sceneNodeList.begin(); sit != sit_end; ++ sit)
@@ -247 +249 @@
         for (iit = iboxes.begin(); iit != iit_end; ++ iit)
         {
+                const GtpVisibilityPreprocessor::AxisAlignedBox3 pbox = (*iit).second;
+                const int id = (*iit).first;
+
                 const AxisAlignedBox box = 
-                        OgreTypeConverter::ConvertToOgre((*iit).second);
-                
-                EntityContainer *entryObjects = new EntityContainer();
+                        OgreTypeConverter::ConvertToOgre(pbox);
+                
+                EntityContainer entryObjects;
 
                 // find all objects that intersect the bounding box
-                FindIntersectingObjects(box, *entryObjects);
-
+                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((*iit).first);
-
+                entry->SetId(id);
                 objects.push_back(entry);
+#endif
         }
 
         return true;
 }
+
 #else
+
 //-------------------------------------------------------------------------
 template<typename T>

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

@@ -49 +49 @@
                                                                          const int maxTries);
   
+        int GetRandomEdgePoint(GtpVisibilityPreprocessor::Vector3 &point,
+                                                   GtpVisibilityPreprocessor::Vector3 &normal);
+
         ostream &Describe(ostream &s);