Changeset 2300 for code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.cc

Timestamp:

Nov 30, 2008, 12:36:46 PM (17 years ago)

Author:

rgrieder

Message:

Still getting physics and its implications straight:

• Removed PositionableEntity —> StaticEntity is now the way to go. They cannot be translated in any way during physics simulation. The trick will be to remove them and add them again to Bullet. This however is not yet implemented.
• Forgot a few consts in WorldEntity
• Fixed a bug with infinite masses
• WE throws exception if you try to apply physics when the SceneNode is not in the root space of the Scene.
• Moved velocity_ to MovableEntity
• Outside world reference of WE/ME are now always the non-physical values. getPosition() will always return node_→getPosition() and when setting it, both RigidBody and SceneNode are translated. This accounts for velocity, orientation and position.

File:

• code/branches/physics/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) (4 diffs)

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

@@ -57 +57 @@
         this->bDestroyWhenPlayerLeft_ = false;
 
-        this->velocity_ = Vector3::ZERO;
         this->acceleration_ = Vector3::ZERO;
 
@@ -332 +331 @@
         if (Core::isMaster())
         {
-            this->server_position_ = this->node_->getPosition();
+            this->server_position_ = this->getPosition();
             ++this->server_overwrite_;
         }
         else if (this->bControlled_)
         {
-            this->client_position_ = this->node_->getPosition();
+            this->client_position_ = this->getPosition();
         }
     }
@@ -345 +344 @@
         if (Core::isMaster())
         {
-            this->server_orientation_ = this->node_->getOrientation();
+            this->server_orientation_ = this->getOrientation();
             ++this->server_overwrite_;
         }
         else if (this->bControlled_)
         {
-            this->client_orientation_ = this->node_->getOrientation();
+            this->client_orientation_ = this->getOrientation();
         }
     }
@@ -358 +357 @@
         if (Core::isMaster())
         {
-            this->server_velocity_ = this->velocity_;
+            this->server_velocity_ = this->getVelocity();
             ++this->server_overwrite_;
         }
         else if (this->bControlled_)
         {
-            this->client_velocity_ = this->velocity_;
-        }
-    }
-
-    void ControllableEntity::setVelocity(const Vector3& velocity)
-    {
-        if (this->bControlled_ || Core::isMaster())
-        {
-            if (!this->isDynamic())
-            {
-                // no physics, we do it ourselves
-                internalSetVelocity(velocity);
-            }
-            else
-            {
-                this->physicalBody_->setLinearVelocity(btVector3(velocity.x, velocity.y, velocity.z));
-            }
-            velocityChanged();
+            this->client_velocity_ = this->getVelocity();
         }
     }