Changeset 2486 for code/branches/presentation

Timestamp:

Dec 16, 2008, 6:06:07 PM (16 years ago)

Author:

rgrieder

Message:

Added 2 new collision shapes: cone and box.

Location:

code/branches/presentation/src/orxonox/objects/collisionshapes

Files:

• BoxCollisionShape.cc (added)
• BoxCollisionShape.h (added)
• CMakeLists.txt (modified) (1 diff)
• ConeCollisionShape.cc (added)
• ConeCollisionShape.h (added)
• SphereCollisionShape.h (modified) (1 diff)

code/branches/presentation/src/orxonox/objects/collisionshapes/CMakeLists.txt

@@ -1 +1 @@
 SET( SRC_FILES
+  BoxCollisionShape.cc
   CollisionShape.cc
   CompoundCollisionShape.cc
+  ConeCollisionShape.cc
   PlaneCollisionShape.cc
   SphereCollisionShape.cc

code/branches/presentation/src/orxonox/objects/collisionshapes/SphereCollisionShape.h

@@ -48 +48 @@
                 { this->radius_ = radius; updateSphere(); }
             inline float getRadius() const
-                { return this->radius_;}
+                { return this->radius_; }
 
             void updateSphere();