Changeset 657 for OGRE/trunk/ogre_changes/RenderSystems/GL/include

Timestamp:

02/20/06 19:06:03 (19 years ago)

Author:

mattausch

Message:

added ogre dependencies and patched ogre sources

Location:

OGRE/trunk/ogre_changes/RenderSystems/GL/include

Files:

• OgreGLHardwareOcclusionQuery.h (modified) (3 diffs)
• OgreGLTexture.h (modified) (2 diffs)

OGRE/trunk/ogre_changes/RenderSystems/GL/include/OgreGLHardwareOcclusionQuery.h

@@ -53 +53 @@
 
 // If you use multiple rendering passes you can test only the first pass and all other passes don't have to be rendered 
-// if the first pass resultet has too few pixels visable.
+// if the first pass result has too few pixels visible.
 
-// Be sure to render all occlluder first and whats out so the RenderQue don't switch places on 
+// Be sure to render all occluder first and whats out so the RenderQue don't switch places on 
 // the occluding objects and the tested objects because it thinks it's more effective..
 
@@ -64 +64 @@
   *
   * @author Lee Sandberg email: lee@abcmedia.se
+  * Updated on 4/8/2005 by Tuan Kuranes email: tuan.kuranes@free.fr
   */
 
@@ -91 +92 @@
         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
-        // It's easy to use if you don't have to keep track on which objects are visable (can be skipped) and what objects arn't visable..
-        // (None visable objects and object you introduce for the first time have allways to be tested allthough the cheepest possible 
-        // LOD (Level Of Detail) mesh and material wize). 
+        // This functions are optional, it's a simple filter that simply skips some hardware occlusion tests on visible objects only
+        // It's easy to use if you don't have to keep track on which objects are visible (can be skipped) and what objects arn't visible..
+        // (None visible objects and object you introduce for the first time have always to be tested although the cheapest possible 
+        // LOD (Level Of Detail) mesh and material wise). 
 
         /**
           *   
           * Remarks This function allows you to set how often the hardware occlusion really sent to the driver
-          * if you set it to 0 every hw occlusion test is acctually made. If you set it to 2 only 50% of your queries are sent. 
-          * for all visable objects. 3 will result in 33% of all queries to acctualy be sent and so on. 
-          * New and none visable objects will be tested all the time.
-          * This functionality is here because this class can keep track on visable and none visable objects for you.
+          * if you set it to 0 every hardware occlusion test is actually made. If you set it to 2 only 50% of your queries are sent. 
+          * for all visible objects. 3 will result in 33% of all queries to actually be sent and so on. 
+          * New and none visible objects will be tested all the time.
+          * This functionality is here because this class can keep track on visible and none visible objects for you.
           * Once you you set the SkipRate for any hardware occlusion instance it effects all others.
           */
 
-        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.
+        void setSkipRate( int skip ) { mSkipInterval = skip; }          // Using 2 only 50 % of the tests are actually made and 3 results in only 33% of the tests. So on.
         int      getSkipRate() { return mSkipInterval; } 
 

OGRE/trunk/ogre_changes/RenderSystems/GL/include/OgreGLTexture.h

@@ -46 +46 @@
         virtual ~GLTexture();      
 
-        /// @copydoc Texture::createInternalResources
-        void createInternalResources(void);
                 void loadImage( const Image& img );
         void createRenderTexture();
@@ -61 +59 @@
 
     protected:
+                /// @copydoc Texture::createInternalResourcesImpl
+                void createInternalResourcesImpl(void);
         /// @copydoc Resource::loadImpl
         void loadImpl(void);
-        /// @copydoc Resource::unloadImpl
-        void unloadImpl(void);
+        /// @copydoc Resource::freeInternalResourcesImpl
+        void freeInternalResourcesImpl(void);
 
                 /** internal method, create GLHardwarePixelBuffers for every face and