Changeset 3089 for code/trunk/src/orxonox/tools/DynamicRenderable.cpp

Timestamp:

May 27, 2009, 4:11:31 PM (16 years ago)

Author:

landauf

Message:

merged map branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/tools/DynamicRenderable.cpp (copied) (copied from code/branches/map/src/orxonox/tools/DynamicRenderable.cpp) (5 diffs, 1 prop)

code/trunk/src/orxonox/tools/DynamicRenderable.cpp

@@ -5 +5 @@
 using namespace Ogre;
 
+namespace orxonox
+{
 DynamicRenderable::DynamicRenderable()
 {
@@ -33 +35 @@
 }
 
-void DynamicRenderable::prepareHardwareBuffers(size_t vertexCount, 
+void DynamicRenderable::prepareHardwareBuffers(size_t vertexCount,
                                                size_t indexCount)
 {
@@ -57 +59 @@
       newVertCapacity >>= 1;
   }
-  if (newVertCapacity != mVertexBufferCapacity) 
+  if (newVertCapacity != mVertexBufferCapacity)
   {
     mVertexBufferCapacity = newVertCapacity;
@@ -94 +96 @@
 
     }
-    else if (indexCount < newIndexCapacity>>1) 
+    else if (indexCount < newIndexCapacity>>1)
     {
       // Make capacity the previous power of two
@@ -132 +134 @@
    return vDist.squaredLength();
 }
+}