Changeset 3089 for code/trunk/src/orxonox/tools

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/CMakeLists.txt (modified) (1 diff)
• src/orxonox/tools/DynamicLines.cpp (copied) (copied from code/branches/map/src/orxonox/tools/DynamicLines.cpp) (3 diffs, 1 prop)
• src/orxonox/tools/DynamicLines.h (copied) (copied from code/branches/map/src/orxonox/tools/DynamicLines.h) (3 diffs, 1 prop)
• src/orxonox/tools/DynamicRenderable.cpp (copied) (copied from code/branches/map/src/orxonox/tools/DynamicRenderable.cpp) (5 diffs, 1 prop)
• src/orxonox/tools/DynamicRenderable.h (copied) (copied from code/branches/map/src/orxonox/tools/DynamicRenderable.h) (2 diffs, 1 prop)

code/trunk/src/orxonox/tools/CMakeLists.txt

@@ -8 +8 @@
   Timer.cc
   WindowEventListener.cc
+  DynamicLines.cpp
+  DynamicRenderable.cpp
 )

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

@@ -6 +6 @@
 using namespace Ogre;
 
+namespace orxonox
+{
 enum {
   POSITION_BINDING,
@@ -81 +83 @@
   prepareHardwareBuffers(size,0);
 
-  if (!size) { 
+  if (!size) {
     mBox.setExtents(Vector3::ZERO,Vector3::ZERO);
     mDirty=false;
     return;
   }
-  
+
   Vector3 vaabMin = mPoints[0];
   Vector3 vaabMax = mPoints[0];
@@ -141 +143 @@
 }
 */
+}

code/trunk/src/orxonox/tools/DynamicLines.h

@@ -5 +5 @@
 #include <vector>
 
-
+namespace orxonox
+{
 class DynamicLines : public DynamicRenderable
 {
@@ -36 +37 @@
   void clear();
 
-  /// Call this to update the hardware buffer after making changes.  
+  /// Call this to update the hardware buffer after making changes.
   void update();
 
   /** Set the type of operation to draw with.
-   * @param opType Can be one of 
+   * @param opType Can be one of
    *    - RenderOperation::OT_LINE_STRIP
    *    - RenderOperation::OT_LINE_LIST
@@ -62 +63 @@
   bool mDirty;
 };
-
+}
 
 #endif

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();
 }
+}

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

@@ -4 +4 @@
 #include <OgreSimpleRenderable.h>
 
+namespace orxonox
+{
 /// Abstract base class providing mechanisms for dynamically growing hardware buffers.
 class DynamicRenderable : public Ogre::SimpleRenderable
@@ -66 +68 @@
   virtual void fillHardwareBuffers() = 0;
 };
+}
 
 #endif // DYNAMIC_RENDERABLE_H