Changeset 2791 for code/trunk

Timestamp:

Mar 16, 2009, 1:21:57 PM (16 years ago)

Author:

rgrieder

Message:

Please never commit any changes to the external libraries! It doesn't make updating easier…

File:

• code/trunk/src/ogreceguirenderer/OgreCEGUIRenderer.cpp (modified) (23 diffs)

code/trunk/src/ogreceguirenderer/OgreCEGUIRenderer.cpp

@@ -3 +3 @@
         created:        11/5/2004
         author:         Paul D Turner
-
+        
         purpose:        Implementation of Renderer class for Ogre engine
 *************************************************************************/
@@ -54 +54 @@
         Utility function to create a render operation and vertex buffer to render quads
 *************************************************************************/
-static void createQuadRenderOp(Ogre::RenderOperation &d_render_op,
+static void createQuadRenderOp(Ogre::RenderOperation &d_render_op, 
     Ogre::HardwareVertexBufferSharedPtr &d_buffer, size_t nquads)
 {
@@ -72 +72 @@
 
         // create hardware vertex buffer
-        d_buffer = HardwareBufferManager::getSingleton().createVertexBuffer(vd->getVertexSize(0), nquads,
+        d_buffer = HardwareBufferManager::getSingleton().createVertexBuffer(vd->getVertexSize(0), nquads,  
         HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY_DISCARDABLE, false);
 
@@ -83 +83 @@
 }
 
-static void destroyQuadRenderOp(Ogre::RenderOperation &d_render_op,
+static void destroyQuadRenderOp(Ogre::RenderOperation &d_render_op, 
     Ogre::HardwareVertexBufferSharedPtr &d_buffer)
 {
@@ -146 +146 @@
                 d_sorted = false;
                 QuadInfo quad;
-
+                
                 // set quad position, flipping y co-ordinates, and applying appropriate texel origin offset
                 quad.position.d_left    = dest_rect.d_left;
@@ -170 +170 @@
                 quad.bottomLeftCol      = colourToOgre(colours.d_top_left);
                 quad.bottomRightCol     = colourToOgre(colours.d_top_right);
-
+                
                 // set quad split mode
                 quad.splitMode = quad_split_mode;
@@ -229 +229 @@
                 buffmem->tv1 = quad.texPosition.d_bottom;
                 ++buffmem;
-
+    
                 // setup Vertex 2...
-
+                
                 // top-left to bottom-right diagonal
                 if (quad.splitMode == TopLeftToBottomRight)
@@ -253 +253 @@
                 }
                 ++buffmem;
-
+    
                 // setup Vertex 3...
                 buffmem->x = quad.position.d_left;
@@ -262 +262 @@
                 buffmem->tv1 = quad.texPosition.d_top;
                 ++buffmem;
-
+    
                 // setup Vertex 4...
                 buffmem->x = quad.position.d_right;
@@ -271 +271 @@
                 buffmem->tv1 = quad.texPosition.d_bottom;
                 ++buffmem;
-
+    
                 // setup Vertex 5...
                 buffmem->x = quad.position.d_right;
@@ -280 +280 @@
                 buffmem->tv1 = quad.texPosition.d_top;
                 ++buffmem;
-
+    
                 // setup Vertex 6...
-
+                
                 // top-left to bottom-right diagonal
                 if (quad.splitMode == TopLeftToBottomRight)
@@ -305 +305 @@
                 ++buffmem;
             }
-
+    
             // ensure we leave the buffer in the unlocked state
             d_buffer->unlock();
         }
-
+        
         /// Render the buffer
         d_bufferPos = 0;
@@ -318 +318 @@
         while(i != d_quadlist.end())
         {
-
+            
             d_currTexture = i->texture;
             d_render_op.vertexData->vertexStart = d_bufferPos;
@@ -426 +426 @@
 
 /*************************************************************************
-        setup states etc
+        setup states etc        
 *************************************************************************/
 void OgreCEGUIRenderer::initRenderStates(void)
@@ -469 +469 @@
 
 
-
-/*************************************************************************
-        sort quads list according to texture
+ 
+/*************************************************************************
+        sort quads list according to texture    
 *************************************************************************/
 void OgreCEGUIRenderer::sortQuads(void)
@@ -525 +525 @@
 
                 // setup Vertex 2...
-
+                
                 // top-left to bottom-right diagonal
                 if (quad_split_mode == TopLeftToBottomRight)
@@ -577 +577 @@
 
                 // setup Vertex 6...
-
+                
                 // top-left to bottom-right diagonal
                 if (quad_split_mode == TopLeftToBottomRight)
@@ -614 +614 @@
 /*************************************************************************
         convert ARGB colour value to whatever the Ogre render system is
-        expecting.
+        expecting.      
 *************************************************************************/
 uint32 OgreCEGUIRenderer::colourToOgre(const colour& col) const
@@ -628 +628 @@
 
 /*************************************************************************
-        Set the scene manager to be used for rendering the GUI.
+        Set the scene manager to be used for rendering the GUI. 
 *************************************************************************/
 void OgreCEGUIRenderer::setTargetSceneManager(Ogre::SceneManager* scene_manager)
@@ -650 +650 @@
 
 /*************************************************************************
-        Set the target render queue for GUI rendering.
+        Set the target render queue for GUI rendering.  
 *************************************************************************/
 void OgreCEGUIRenderer::setTargetRenderQueue(Ogre::uint8 queue_id, bool post_queue)
@@ -724 +724 @@
 
 /*************************************************************************
-        Create a texture from an existing Ogre::TexturePtr object
+        Create a texture from an existing Ogre::TexturePtr object       
 *************************************************************************/
 Texture* OgreCEGUIRenderer::createTexture(Ogre::TexturePtr& texture)
@@ -749 +749 @@
 
 /*************************************************************************
-Set the size of the display in pixels.
+Set the size of the display in pixels.  
 *************************************************************************/
 void OgreCEGUIRenderer::setDisplaySize(const Size& sz)
@@ -767 +767 @@
         is rendered
 *************************************************************************/
-void CEGUIRQListener::renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation,
+void CEGUIRQListener::renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation, 
                                                                                  bool& skipThisQueue)
 {