Changeset 2463

Timestamp:

Dec 15, 2008, 1:52:00 AM (15 years ago)

Author:

rgrieder

Message:

Two bugfixes and an optimisation.

Location:

code/branches/presentation/src/orxonox/objects

Files:

• Scene.cc (modified) (1 diff)
• collisionshapes/CompoundCollisionShape.cc (modified) (1 diff)
• worldentities/pawns/SpaceShip.cc (modified) (1 diff)

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

@@ -249 +249 @@
                 {
                     this->physicalWorld_->addRigidBody((*it)->getPhysicalBody());
+                    this->physicalObjects_.insert(*it);
                 }
                 this->physicalObjectQueue_.clear();

code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc

@@ -151 +151 @@
         }
         if (bEmpty)
+        {
+            if (this->collisionShape_ == 0)
+            {
+                this->collisionShape_ = 0;
+                return;
+            }
             this->collisionShape_ = 0;
+        }
         else if (bPrimitive)
         {

code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

@@ -141 +141 @@
     void SpaceShip::rotateYaw(const Vector2& value)
     {
-        this->localAngularAcceleration_.setY(this->localLinearAcceleration_.y() + value.x);
+        this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() + value.x);
     }
 
     void SpaceShip::rotatePitch(const Vector2& value)
     {
-        this->localAngularAcceleration_.setX(this->localLinearAcceleration_.x() + value.x);
+        this->localAngularAcceleration_.setX(this->localAngularAcceleration_.x() + value.x);
     }
 
     void SpaceShip::rotateRoll(const Vector2& value)
     {
-        this->localAngularAcceleration_.setZ(this->localLinearAcceleration_.z() - value.x);
+        this->localAngularAcceleration_.setZ(this->localAngularAcceleration_.z() - value.x);
     }