Changeset 92 for trunk/VUT/work/ogre_changes

Timestamp:

05/11/05 15:29:32 (19 years ago)

Author:

mattausch

Message:

exchanged halfbounding box with full bounding box

Location:

trunk/VUT/work/ogre_changes

Files:

• OgreMain/include/OgreHardwareOcclusionQuery.h (modified) (1 diff)
• RenderSystems/Direct3D9/include/OgreD3D9HardwareOcclusionQuery.h (modified) (1 diff)
• RenderSystems/GL/include/OgreGLHardwareOcclusionQuery.h (modified) (1 diff)

trunk/VUT/work/ogre_changes/OgreMain/include/OgreHardwareOcclusionQuery.h

@@ -96 +96 @@
       * Pulls the hardware occlusion query too see if there is a result.
       * @retval NumOfFragments will get the resulting number of fragments.
+          * @param waitForResult if true, the query will wait until a result is available
       * @return True if success or false if not.
           * @Remarks Hardware occlusion is an assyncronius process the result may take a frame or so.
-          *                     one idea is to test pass1 and if not visable skip pass2. Also note that objects
-          *                     not visable must be tested evrey frame. Visable objects don't need testing every frame.
+          *                     one idea is to test pass1 and if not visible skip pass2. Also note that objects
+          *                     not visible must be tested evrey frame. Visable objects don't need testing every frame.
           *                     Testing non visable objects can be don unlit, no texture with low LOD object.
           *        0 will generate all the levels till 1x1. [default: 0]
       */
-        virtual bool pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult ) = 0;
-
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+          virtual bool pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult ) = 0;
+#else
+         virtual bool pullOcclusionQuery( unsigned int* NumOfFragments ) = 0;
+#endif
         /**
       * Pulls the hardware occlusion query too see if there is a result.
       * @retval NumOfFragments will get the resulting number of fragments.
+          * @param waitForResult if true, the query will wait until a result is available
       * @return True if success or false if not.
           * @Remarks In DX9 mode specifying OCCLUSIONQUERY_FLUSH as the flag, will case the driver to flush whatever API calls are batched.
           * In OpenGL mode it makes no difference if you specify OCCLUSIONQUERY_FLUSH or OCCLUSIONQUERY_NOFLUSH.
       */
-        virtual bool pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult, 
-                                                                         const HW_OCCLUSIONQUERY flag  ) = 0;
-
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        virtual bool pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult,
+                                                                         const HW_OCCLUSIONQUERY flag  ) = 0; 
+#else
+          virtual bool pullOcclusionQuery( unsigned int* NumOfFragments, 
+                                                                           const HW_OCCLUSIONQUERY flag  ) = 0; 
+#endif
         /**
           * Let's you get the last pixel count with out doing the hardware occlusion test

trunk/VUT/work/ogre_changes/RenderSystems/Direct3D9/include/OgreD3D9HardwareOcclusionQuery.h

@@ -71 +71 @@
         void beginOcclusionQuery();     
         void endOcclusionQuery();
-        bool pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult );
+
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
         bool pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult,
                                                          const HW_OCCLUSIONQUERY flag  ); 
+        bool pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult );
+#else
+        bool pullOcclusionQuery( unsigned int* NumOfFragments );
+        bool pullOcclusionQuery( unsigned int* NumOfFragments, const HW_OCCLUSIONQUERY flag  ); 
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
 
         unsigned int getLastQuerysPixelcount() { return m_uintPixelCount; }

trunk/VUT/work/ogre_changes/RenderSystems/GL/include/OgreGLHardwareOcclusionQuery.h

@@ -88 +88 @@
         void beginOcclusionQuery();
         void endOcclusionQuery();
-        bool pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult );
+
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
         bool pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult,
                                                          const HW_OCCLUSIONQUERY flag  ); 
+        bool pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult );
+#else
+        bool pullOcclusionQuery( unsigned int* NumOfFragments );
+        bool pullOcclusionQuery( unsigned int* NumOfFragments, const HW_OCCLUSIONQUERY flag  ); 
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
 
         unsigned int getLastQuerysPixelcount() { return m_uintPixelCount; }