Changeset 2304

Timestamp:

Dec 1, 2008, 11:16:49 PM (16 years ago)

Author:

rgrieder

Message:

Author issues with copy & paste…

Location:

code/branches/physics/src/orxonox

Files:

• objects/Scene.cc (modified) (1 diff)
• objects/worldentities/MovableEntity.cc (modified) (1 diff)
• objects/worldentities/MovableEntity.h (modified) (1 diff)
• objects/worldentities/StaticEntity.cc (modified) (1 diff)
• objects/worldentities/StaticEntity.h (modified) (1 diff)
• objects/worldentities/WorldEntity.cc (modified) (2 diffs)
• objects/worldentities/WorldEntity.h (modified) (1 diff)
• objects/worldentities/collisionshapes/CollisionShape.cc (modified) (1 diff)
• objects/worldentities/collisionshapes/CollisionShape.h (modified) (1 diff)
• objects/worldentities/collisionshapes/CompoundCollisionShape.cc (modified) (1 diff)
• objects/worldentities/collisionshapes/CompoundCollisionShape.h (modified) (1 diff)
• objects/worldentities/collisionshapes/SphereCollisionShape.cc (modified) (1 diff)
• objects/worldentities/collisionshapes/SphereCollisionShape.h (modified) (1 diff)
• tools/BulletConversions.h (modified) (1 diff)

code/branches/physics/src/orxonox/objects/Scene.cc

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      Reto Grieder (physics)
  *
  */

code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Reto Grieder
  *   Co-authors:
  *      Martin Stypinski

code/branches/physics/src/orxonox/objects/worldentities/MovableEntity.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Reto Grieder
  *   Co-authors:
- *      ...
+ *      Martin Stypinski
  *
  */

code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.cc

@@ -22 +22 @@
  *   Author:
  *      Fabian 'x3n' Landau
+ *      Reto Grieder (physics)
  *   Co-authors:
  *      ...

code/branches/physics/src/orxonox/objects/worldentities/StaticEntity.h

@@ -22 +22 @@
  *   Author:
  *      Fabian 'x3n' Landau
+ *      Reto Grieder
  *   Co-authors:
  *      ...

code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -22 +22 @@
  *   Author:
  *      Fabian 'x3n' Landau
+ *      Reto Grieder (physics)
  *   Co-authors:
  *      ...
@@ -394 +395 @@
     }
 
-    //void WorldEntity::setCollisionRadius(float radius)
-    //{
-    //    if (!checkPhysics())
-    //        return;
-
-    //    // destroy old one first
-    //    btCollisionShape* oldShape = this->physicalBody_->getCollisionShape();
-    //    if (oldShape)
-    //        delete oldShape;
-
-    //    //if (this->getName() == "blubb")
-    //    //{
-    //    //    btCompoundShape* cShape = new btCompoundShape();
-    //    //    cShape->setLocalScaling(btVector3(1,1,1));
-    //    //    btTransform offset(btQuaternion(0, 0, 0), btVector3(0, 0, 0));
-    //    //    offset.setBasis(btMatrix3x3(3, 0, 0, 0, 3, 0, 0, 0, 3));
-    //    //    btSphereShape* sphere = new btSphereShape(radius);
-    //    //    sphere->setLocalScaling(btVector3(1,1,3));
-    //    //    cShape->addChildShape(offset, sphere);
-    //    //    this->physicalBody_->setCollisionShape(cShape);
-    //    //}
-    //    //else
-    //    this->physicalBody_->setCollisionShape(new btSphereShape(btScalar(radius)));
-    //}
-
-    //float WorldEntity::getCollisionRadius() const
-    //{
-    //    if (checkPhysics())
-    //    {
-    //        btSphereShape* sphere = dynamic_cast<btSphereShape*>(this->physicalBody_->getCollisionShape());
-    //        if (sphere)
-    //            return (float)sphere->getRadius();
-    //    }
-    //    return 0.0f;
-    //}
-
     bool WorldEntity::checkPhysics() const
     {

code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.h

@@ -22 +22 @@
  *   Author:
  *      Fabian 'x3n' Landau
+ *      Reto Grieder (physics)
  *   Co-authors:
  *      ...

code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CollisionShape.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Reto Grieder
  *   Co-authors:
  *      ...

code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CollisionShape.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Reto Grieder
  *   Co-authors:
  *      ...

code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CompoundCollisionShape.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Reto Grieder
  *   Co-authors:
  *      ...

code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CompoundCollisionShape.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Reto Grieder
  *   Co-authors:
  *      ...

code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/SphereCollisionShape.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Reto Grieder
  *   Co-authors:
  *      ...

code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/SphereCollisionShape.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Reto Grieder
  *   Co-authors:
  *      ...

code/branches/physics/src/orxonox/tools/BulletConversions.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Reto Grieder
  *   Co-authors:
  *      ...