[Orxonox-commit 96] r2791 - trunk/src/ogreceguirenderer
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Mar 16 13:21:57 CET 2009
Author: rgrieder
Date: 2009-03-16 12:21:57 +0000 (Mon, 16 Mar 2009)
New Revision: 2791
Modified:
trunk/src/ogreceguirenderer/OgreCEGUIRenderer.cpp
Log:
Please never commit any changes to the external libraries! It doesn't make updating easier...
Modified: trunk/src/ogreceguirenderer/OgreCEGUIRenderer.cpp
===================================================================
--- trunk/src/ogreceguirenderer/OgreCEGUIRenderer.cpp 2009-03-16 10:47:06 UTC (rev 2790)
+++ trunk/src/ogreceguirenderer/OgreCEGUIRenderer.cpp 2009-03-16 12:21:57 UTC (rev 2791)
@@ -2,7 +2,7 @@
filename: OgreCEGUIRenderer.cpp
created: 11/5/2004
author: Paul D Turner
-
+
purpose: Implementation of Renderer class for Ogre engine
*************************************************************************/
/*************************************************************************
@@ -53,7 +53,7 @@
/*************************************************************************
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)
{
using namespace Ogre;
@@ -71,7 +71,7 @@
vd->addElement(0, vd_offset, VET_FLOAT2, VES_TEXTURE_COORDINATES);
// 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);
// bind vertex buffer
@@ -82,7 +82,7 @@
d_render_op.useIndexes = false;
}
-static void destroyQuadRenderOp(Ogre::RenderOperation &d_render_op,
+static void destroyQuadRenderOp(Ogre::RenderOperation &d_render_op,
Ogre::HardwareVertexBufferSharedPtr &d_buffer)
{
delete d_render_op.vertexData;
@@ -145,7 +145,7 @@
{
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;
quad.position.d_right = dest_rect.d_right;
@@ -169,7 +169,7 @@
quad.topRightCol = colourToOgre(colours.d_bottom_right);
quad.bottomLeftCol = colourToOgre(colours.d_top_left);
quad.bottomRightCol = colourToOgre(colours.d_top_right);
-
+
// set quad split mode
quad.splitMode = quad_split_mode;
@@ -228,9 +228,9 @@
buffmem->tu1 = quad.texPosition.d_left;
buffmem->tv1 = quad.texPosition.d_bottom;
++buffmem;
-
+
// setup Vertex 2...
-
+
// top-left to bottom-right diagonal
if (quad.splitMode == TopLeftToBottomRight)
{
@@ -252,7 +252,7 @@
buffmem->tv1 = quad.texPosition.d_top;
}
++buffmem;
-
+
// setup Vertex 3...
buffmem->x = quad.position.d_left;
buffmem->y = quad.position.d_top;
@@ -261,7 +261,7 @@
buffmem->tu1 = quad.texPosition.d_left;
buffmem->tv1 = quad.texPosition.d_top;
++buffmem;
-
+
// setup Vertex 4...
buffmem->x = quad.position.d_right;
buffmem->y = quad.position.d_bottom;
@@ -270,7 +270,7 @@
buffmem->tu1 = quad.texPosition.d_right;
buffmem->tv1 = quad.texPosition.d_bottom;
++buffmem;
-
+
// setup Vertex 5...
buffmem->x = quad.position.d_right;
buffmem->y = quad.position.d_top;
@@ -279,9 +279,9 @@
buffmem->tu1 = quad.texPosition.d_right;
buffmem->tv1 = quad.texPosition.d_top;
++buffmem;
-
+
// setup Vertex 6...
-
+
// top-left to bottom-right diagonal
if (quad.splitMode == TopLeftToBottomRight)
{
@@ -304,11 +304,11 @@
}
++buffmem;
}
-
+
// ensure we leave the buffer in the unlocked state
d_buffer->unlock();
}
-
+
/// Render the buffer
d_bufferPos = 0;
bool first = true;
@@ -317,7 +317,7 @@
QuadList::iterator i = d_quadlist.begin();
while(i != d_quadlist.end())
{
-
+
d_currTexture = i->texture;
d_render_op.vertexData->vertexStart = d_bufferPos;
for (; i != d_quadlist.end(); ++i)
@@ -425,7 +425,7 @@
/*************************************************************************
- setup states etc
+ setup states etc
*************************************************************************/
void OgreCEGUIRenderer::initRenderStates(void)
{
@@ -468,9 +468,9 @@
}
-
+
/*************************************************************************
- sort quads list according to texture
+ sort quads list according to texture
*************************************************************************/
void OgreCEGUIRenderer::sortQuads(void)
{
@@ -524,7 +524,7 @@
++buffmem;
// setup Vertex 2...
-
+
// top-left to bottom-right diagonal
if (quad_split_mode == TopLeftToBottomRight)
{
@@ -576,7 +576,7 @@
++buffmem;
// setup Vertex 6...
-
+
// top-left to bottom-right diagonal
if (quad_split_mode == TopLeftToBottomRight)
{
@@ -613,7 +613,7 @@
/*************************************************************************
convert ARGB colour value to whatever the Ogre render system is
- expecting.
+ expecting.
*************************************************************************/
uint32 OgreCEGUIRenderer::colourToOgre(const colour& col) const
{
@@ -627,7 +627,7 @@
/*************************************************************************
- 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)
{
@@ -649,7 +649,7 @@
/*************************************************************************
- 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)
{
@@ -723,7 +723,7 @@
/*************************************************************************
- Create a texture from an existing Ogre::TexturePtr object
+ Create a texture from an existing Ogre::TexturePtr object
*************************************************************************/
Texture* OgreCEGUIRenderer::createTexture(Ogre::TexturePtr& texture)
{
@@ -748,7 +748,7 @@
}
/*************************************************************************
-Set the size of the display in pixels.
+Set the size of the display in pixels.
*************************************************************************/
void OgreCEGUIRenderer::setDisplaySize(const Size& sz)
{
@@ -766,7 +766,7 @@
Callback from Ogre invoked before other stuff in our target queue
is rendered
*************************************************************************/
-void CEGUIRQListener::renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation,
+void CEGUIRQListener::renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation,
bool& skipThisQueue)
{
if ((!d_post_queue) && (d_queue_id == id))
More information about the Orxonox-commit
mailing list