Changeset 3089 for code/trunk/src/orxonox/tools/DynamicLines.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/DynamicLines.cpp (copied) (copied from code/branches/map/src/orxonox/tools/DynamicLines.cpp) (3 diffs, 1 prop)

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 @@
 }
 */
+}