Changeset 115 for trunk/VUT/work/ogre_changes/OgreMain/include/OgreHardwareOcclusionQuery.h

Timestamp:

05/30/05 03:20:23 (19 years ago)

Author:

mattausch

Message:

added depth pass algorithm + delayed transparent object rendering (so depth ordering is right)

File:

• trunk/VUT/work/ogre_changes/OgreMain/include/OgreHardwareOcclusionQuery.h (modified) (2 diffs)

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 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]
-      */
-#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.
       */
-#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
+        virtual bool pullOcclusionQuery(unsigned int* NumOfFragments, const HW_OCCLUSIONQUERY flag = HWOCCLUSIONQUERY_FLUSH) = 0;
+
         /**
           * Let's you get the last pixel count with out doing the hardware occlusion test
@@ -143 +121 @@
         virtual void    setSkipRate( int skip ) = 0;
         virtual int             getSkipRate() = 0;
+
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        /**
+                Pulls occlusion query.
+                @param NumOfFragments number of visible fragments if query result was available.
+                Last query result if query result was not yet available.
+
+                @param waitForResult if true, the function waits until the result is available.
+                Otherwise the function returns immediately, not waiting for the result.
+                @returns true if query result was available, false if result was not yet available
+        */
+        virtual bool pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult, 
+                const HW_OCCLUSIONQUERY flag = HWOCCLUSIONQUERY_FLUSH ) = 0; 
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
+
 //----------------------------------------------------------------------
 // Private members