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

Timestamp:

10/09/06 22:38:07 (18 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• OgreMeshInstance.h (modified) (2 diffs)
• OgreOcclusionCullingSceneManager.h (modified) (6 diffs)
• OgreTypeConverter.h (modified) (2 diffs)

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

@@ -13 +13 @@
 {
 public:
-
+        /** The default constructor taking an entity into account.
+        */
         OgreMeshInstance(Entity *ent);
-
+        
         /** Returns 'mesh' associated with this instance. 
         */
-        Entity *GetMesh() const;
+        Entity *GetEntity() const;
 
         /** See get.
         */
-        void SetMesh(Entity *mesh);
+        void SetEntity(Entity *entity);
 
 
+        /////////////////////////////
         //-- inherited functions from Intersectable
 
@@ -51 +53 @@
 protected:
         
-        Entity *mMesh;
+        Entity *mEntity;
 };
 

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

@@ -16 +16 @@
 namespace Ogre {
 
+
 /**
         This class extends the terrain scene manager,
@@ -126 +127 @@
         /** Loads / unloads pvs of the view cell to set the visibility in the scene.
         */
-        void applyViewCellPvs(GtpVisibilityPreprocessor::ViewCell *vc, const bool load);
+        void ApplyViewCellPvs(GtpVisibilityPreprocessor::ViewCell *vc, const bool load);
 
         /** updates pvs in current frame.
         */
-        void updatePvs(Camera *cam);
+        void UpdatePvs(Camera *cam);
 
         /** Sets all objects invisible.
@@ -136 +137 @@
         void SetObjectsVisible(const bool visible);
 
-        
+        /** Creates view cells geometry from the loaded view cells.
+        */
+        void CreateViewCellsGeometry();
+
+
         //////////////////////////////////////////
 
         /// the interface to the scene hierarchy.
         OctreeHierarchyInterface *mHierarchyInterface;
+
         /// manages all visibility options
         GtpVisibility::VisibilityManager *mVisibilityManager;
@@ -175 +181 @@
         /// the depth pass (no lighting, just filling the depth buffer)
         Pass *mDepthPass;
+        /// the pass for item buffer setting a color id
         Pass *mItemBufferPass;
 
-        int mCurrentEntityId;
         /// flag for passes which should not be deleted from queue during first traversal
         int mLeavePassesInQueue;
-
 
         /// if transparent object are considered for item buffer visibility
@@ -190 +195 @@
         bool mIsHierarchicalCulling;
 
+        /// do we use preprocessed visibility
         bool mViewCellsLoaded;
+
+        /// the view cells manager handling the preprocesor stuff
         GtpVisibilityPreprocessor::ViewCellsManager *mViewCellsManager;
 
@@ -210 +218 @@
         // normal terrain rendering
         bool mNormalExecution;
+
+        // helper variable to provide sequential numbering for sub-entities
+        int mCurrentEntityId;
+
+        typedef map<int, MovableObject *> MovableObjectsMap;
+
+        /// hash table for view cells geometry
+    MovableObjectsMap mViewCellsGeometry;
 };
 
-/// Factory for VisibilityOctreeSceneManager
+
+/** Factory for VisibilityOctreeSceneManager.
+*/
 class OcclusionCullingSceneManagerFactory : public SceneManagerFactory
 {

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

@@ -5 +5 @@
 #include "AxisAlignedBox3.h"
 #include "Vector3.h"
+//#include "ManualObject.h"
 
 
 namespace Ogre {
- 
+
+class SceneManager;
+
 /**
         Class which converts preprocessor types to OGRE types
@@ -27 +30 @@
         */
         static Vector3 ConvertToOgre(const GtpVisibilityPreprocessor::Vector3 &v);
+
+        /** The Ogre object will be created from the mesh.
+        */
+        static ManualObject *ConvertToOgre(GtpVisibilityPreprocessor::Mesh *mesh, SceneManager *sceneMgr);
 };