Changeset 115 for trunk/VUT/work/ogre_changes/RenderSystems/GL/include/OgreGLHardwareOcclusionQuery.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/RenderSystems/GL/include/OgreGLHardwareOcclusionQuery.h (modified) (3 diffs)

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

@@ -88 +88 @@
         void beginOcclusionQuery();
         void endOcclusionQuery();
-
-#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; }
+        unsigned int getLastQuerysPixelcount() { return mPixelCount; }
 
         // This functions are optional, it's a simple filter that simply skipps some hardware occlusion tests on visable objects only
@@ -115 +106 @@
           */
 
-        void setSkipRate( int skip ) { m_Skip = skip; }         // Using 2 only 50 % of the tests are actully made and 3 results in only 33% of the tests. So on.
-        int      getSkipRate() { return m_Skip; } 
+        void setSkipRate( int skip ) { mSkipInterval = skip; }          // Using 2 only 50 % of the tests are actully made and 3 results in only 33% of the tests. So on.
+        int      getSkipRate() { return mSkipInterval; } 
 
-
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        bool pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult, const HW_OCCLUSIONQUERY flag = HWOCCLUSIONQUERY_FLUSH ); 
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
 //----------------------------------------------------------------------
 // Protected members
@@ -124 +117 @@
 protected:
 
-        unsigned int    m_uintPixelCount;
-        unsigned int    m_uintQuery[1];
+        unsigned int    mPixelCount;
+        GLuint                  mQueryID;
         bool                    m_bOcclusionQuery;
-        int                             m_SkipCounter;          // m_SkipConter =  m_SkipConter % m_Skip; if ( m_SkipConter == 0 && m_uintPixelCount !=0 ) TestHWOcclusion else just return 
-        static int              m_Skip;                         // This is shared by all instancies
-        bool                    m_bHWOcclusionSupport;
+        int                             mSkipCounter;
+        int                             mSkipInterval;
+        bool                    mHasOcclusionSupport;
 };
-
 
 }