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

Timestamp:

04/29/06 19:11:23 (18 years ago)

Author:

mattausch

Message:

working on preprocessor integration
added iv stuff

Location:

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

Files:

• OgreOcclusionCullingSceneManager.h (modified) (3 diffs)
• OgreTypeConverter.h (modified) (1 diff)
• OgreVisibilityOctreeSceneManager.h (modified) (1 diff)

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

@@ -12 +12 @@
 #include "VisibilityManager.h"
 #include "ViewCellsManager.h"
+
+//class GtpVisibilityPreprocessor::ViewCellsManager;
 
 
@@ -118 +120 @@
         void InitVisibilityCulling(Camera *cam);
 
+        /** Finds object corresponding to this bounding box in the scene.
+        */
+        MovableObject *FindCorrespondingObject(const AxisAlignedBox &box);
+
+        /** Identifies objects in the scene and gives them unique ids that
+                correspond to preprocessor ids.
+        */
+        void IdentifyObjects(GtpVisibilityPreprocessor::ObjectContainer &objects);
+
         /// the interface to the scene hierarchy.
         OctreeHierarchyInterface *mHierarchyInterface;
@@ -164 +175 @@
         /// Always execute the vertex program of a pass, e.g., for the depth pass or item buffer
         bool mExecuteVertexProgramForAllPasses;
-
+        /// if hierarchical culling is currently in use
         bool mIsHierarchicalCulling;
 
-        ViewCellsManager *mViewCellsManager;
+        GtpVisibilityPreprocessor::ViewCellsManager *mViewCellsManager;
 };
 

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

@@ -1 +1 @@
 #ifndef _OgreTypeConverter_H__
 #define _OgreTypeConverter_H__
-
+ 
+#include "OgreAxisAlignedBox.h"
 #include "AxisAlignedBox3.h"
-#include "OgreAxisAlignedBox.h"
 #include "Vector3.h"
-#include "OgreVector3.h"
 
 
 namespace Ogre {
-  
+ 
 /**
-        Class which converts our types to OGRE types
+        Class which converts preprocessor types to OGRE types
 */
 class __declspec(dllexport) OgreTypeConverter
 {
 public:
-
+        /** Converts Ogre AABB to preprocessor AABB.
+        */
         static GtpVisibilityPreprocessor::AxisAlignedBox3 ConvertFromOgre(const AxisAlignedBox &box);
+        /** Converts Ogre vector to preprocessor vector.
+        */
         static GtpVisibilityPreprocessor::Vector3 ConvertFromOgre(const Vector3 &v);
-        
+        /** Converts preprocessor AABB to Ogre AABB.
+        */
         static AxisAlignedBox ConvertToOgre(const GtpVisibilityPreprocessor::AxisAlignedBox3 &box);
+        /** Converts preprocessor vector to Ogre vector.
+        */
         static Vector3 ConvertToOgre(const GtpVisibilityPreprocessor::Vector3 &v);
 };

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

@@ -104 +104 @@
         void InitVisibilityCulling(Camera *cam);
         
+
+
         /// the interface to the scene hierarchy.
         OctreeHierarchyInterface *mHierarchyInterface;