Changeset 85 for trunk/VUT/Ogre/include

Timestamp:

05/04/05 17:58:13 (19 years ago)

Author:

mattausch

Message:

corrected bug so chc is much faster than stop and wait

Location:

trunk/VUT/Ogre/include

Files:

• OgrePlatformHierarchyInterface.h (modified) (2 diffs)
• OgreSceneNodeHierarchyInterface.h (modified) (1 diff)
• OgreSolidHalfBoundingBox.h (modified) (2 diffs)

trunk/VUT/Ogre/include/OgrePlatformHierarchyInterface.h

@@ -77 +77 @@
         */
         void RenderBoundingBox(AxisAlignedBox *box);
-        /** Returns one half of the bounding box.
-                @param half the half index of the bouding box (0 or 1)
+        /** Returns pointer to current renderable half bounding box geometry
         */
-        SolidHalfBoundingBox *GetSolidHalfBoundingBox(int half);
+        SolidHalfBoundingBox *GetSolidHalfBoundingBox();
 
-        /** two halfes of an aabb. 
+        /** one renderable half of an aabb. 
         */
-        SolidHalfBoundingBox *mHalfBoundingBox[2];      
+        SolidHalfBoundingBox *mSolidHalfBoundingBox;
 
         SceneManager *mSceneManager;
@@ -91 +90 @@
         Camera *mCamera;
         AxisAlignedBox mBox;
-
+        
         std::vector<PlatformOcclusionQuery *> mOcclusionQueries;
 };

trunk/VUT/Ogre/include/OgreSceneNodeHierarchyInterface.h

@@ -36 +36 @@
 
         AxisAlignedBox *GetBoundingBox(GtpVisibility::HierarchyNode *node);
-
-protected:
-        
-        
 };
 

trunk/VUT/Ogre/include/OgreSolidHalfBoundingBox.h

@@ -15 +15 @@
 public:
 
-        SolidHalfBoundingBox(bool isFirstHalf);
-        void setupBoundingBox(const AxisAlignedBox& aabb);
-        /** Override this method to prevent parent transforms (rotation,translation,scale)
-                and to make it public.
+        SolidHalfBoundingBox();
+        /** Sets up the first or second half of a solid bounding box.
+                @param aab the axis aligned bounding box
+                @param isFirstHalf if it is the first or the second half
+        */
+        void SetupBoundingBox(const AxisAlignedBox& aabb, const bool isFirstHalf);
+        
+protected:
+    /** Builds the wireframe line list.
+                @param aab the axis aligned bounding box for setting up the vertices
+                @param first or second half of the box
     */
-        void getWorldTransforms(Matrix4* xform) const;
-
-protected:
-    
-    /** Builds the wireframe line list.
-                @param aab the axis aligned bounding box for setting up the list.
-    */
-        void setupBoundingBoxVertices(const AxisAlignedBox& aab);
+        void SetupBoundingBoxVertices(const AxisAlignedBox& aab, const bool isFirstHalf);
         /** 
                 Sets the material used for occlusion queries. 
@@ -33 +33 @@
                 uses no lighting, no depth write, and no colours
         */
-        void setOcclusionQueryMaterial();
+        void SetOcclusionQueryMaterial();
         /** Whether this half box is the first or the second half of the bounding box. 
         */