Changeset 2254 for code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

Timestamp:

Nov 24, 2008, 1:50:47 AM (17 years ago)

Author:

landauf

Message:

Update your media repository and delete keybindings.ini if you want to use boost (space).

• Added new class "Engine" to control the speed of a SpaceShip (Engine is an Item, MultiStateEngine is a specialized version of Engine)
• Added FadingBillboard, a billboard with the ability to fade in and out smoothly when activated/deactivated.
• Several changes in Backlight, it's now a child of FadingBillboard
• Some changes concerning local control in ControllableEntity
• Fixed a bug in WorldEntity caused by different destruction order of attached objects on server and client
• Added a "MainState" to BaseObject. An object has several states (activity, visibility, …) and one of it can be defined as "MainState" in the XML file. Other objects can change this state without knowing which state it really is (used by MultiStateEngine).

File:

• code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) (11 diffs)

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

@@ -32 +32 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/Template.h"
 #include "core/XMLPort.h"
 #include "util/Math.h"
+#include "objects/items/Engine.h"
 
 namespace orxonox
@@ -45 +47 @@
         this->zeroDegree_ = 0;
 
-        this->maxSpeed_ = 0;
-        this->maxSecondarySpeed_ = 0;
+        this->bBoost_ = false;
+        this->steering_ = Vector3::ZERO;
+        this->engine_ = 0;
+
         this->maxRotation_ = 0;
-        this->translationAcceleration_ = 0;
         this->rotationAcceleration_ = 0;
         this->translationDamping_ = 0;
@@ -66 +69 @@
     SpaceShip::~SpaceShip()
     {
+        if (this->isInitialized() && this->engine_)
+            delete this->engine_;
     }
 
@@ -72 +77 @@
         SUPER(SpaceShip, XMLPort, xmlelement, mode);
 
-        XMLPortParam(SpaceShip, "maxspeed",          setMaxSpeed,          getMaxSpeed,          xmlelement, mode);
-        XMLPortParam(SpaceShip, "maxsecondaryspeed", setMaxSecondarySpeed, getMaxSecondarySpeed, xmlelement, mode);
+        XMLPortParam(SpaceShip, "engine",            setEngineTemplate,    getEngineTemplate,    xmlelement, mode);
         XMLPortParam(SpaceShip, "maxrotation",       setMaxRotation,       getMaxRotation,       xmlelement, mode);
-        XMLPortParam(SpaceShip, "transacc",          setTransAcc,          getTransAcc,          xmlelement, mode);
         XMLPortParam(SpaceShip, "rotacc",            setRotAcc,            getRotAcc,            xmlelement, mode);
         XMLPortParam(SpaceShip, "transdamp",         setTransDamp,         getTransDamp,         xmlelement, mode);
@@ -82 +85 @@
     void SpaceShip::registerVariables()
     {
-        REGISTERDATA(this->maxSpeed_,                direction::toclient);
-        REGISTERDATA(this->maxSecondarySpeed_,       direction::toclient);
         REGISTERDATA(this->maxRotation_,             direction::toclient);
-        REGISTERDATA(this->translationAcceleration_, direction::toclient);
         REGISTERDATA(this->rotationAcceleration_,    direction::toclient);
         REGISTERDATA(this->translationDamping_,      direction::toclient);
@@ -97 +97 @@
     void SpaceShip::tick(float dt)
     {
-        if (this->isLocallyControlled())
+        if (this->hasLocalController())
         {
             // #####################################
@@ -104 +104 @@
 
             Vector3 velocity = this->getVelocity();
-            if (velocity.x > this->maxSecondarySpeed_)
-                velocity.x = this->maxSecondarySpeed_;
-            if (velocity.x < -this->maxSecondarySpeed_)
-                velocity.x = -this->maxSecondarySpeed_;
-            if (velocity.y > this->maxSecondarySpeed_)
-                velocity.y = this->maxSecondarySpeed_;
-            if (velocity.y < -this->maxSecondarySpeed_)
-                velocity.y = -this->maxSecondarySpeed_;
-            if (velocity.z > this->maxSecondarySpeed_)
-                velocity.z = this->maxSecondarySpeed_;
-            if (velocity.z < -this->maxSpeed_)
-                velocity.z = -this->maxSpeed_;
 
             // normalize velocity and acceleration
@@ -144 +132 @@
 
 
-        if (this->isLocallyControlled())
+        if (this->hasLocalController())
         {
             this->yaw(this->yawRotation_ * dt);
@@ -153 +141 @@
             this->roll(this->rollRotation_ * dt);
 
-            this->acceleration_.x = 0;
-            this->acceleration_.y = 0;
-            this->acceleration_.z = 0;
-
             this->yawRotation_   = this->zeroDegree_;
             this->pitchRotation_ = this->zeroDegree_;
@@ -165 +149 @@
     void SpaceShip::moveFrontBack(const Vector2& value)
     {
-        this->acceleration_.z = -this->translationAcceleration_ * value.x;
+        this->steering_.z = -value.x;
     }
 
     void SpaceShip::moveRightLeft(const Vector2& value)
     {
-        this->acceleration_.x = this->translationAcceleration_ * value.x;
+        this->steering_.x = value.x;
     }
 
     void SpaceShip::moveUpDown(const Vector2& value)
     {
-        this->acceleration_.y = this->translationAcceleration_ * value.x;
+        this->steering_.y = value.x;
     }
 
@@ -211 +195 @@
     {
     }
+
+    void SpaceShip::boost()
+    {
+        this->bBoost_ = true;
+    }
+
+    void SpaceShip::loadEngineTemplate()
+    {
+        if (this->enginetemplate_ != "")
+        {
+            Template* temp = Template::getTemplate(this->enginetemplate_);
+
+            if (temp)
+            {
+                Identifier* identifier = temp->getBaseclassIdentifier();
+
+                if (identifier)
+                {
+                    BaseObject* object = identifier->fabricate(this);
+                    this->engine_ = dynamic_cast<Engine*>(object);
+
+                    if (this->engine_)
+                    {
+                        this->engine_->addTemplate(temp);
+                        this->engine_->addToSpaceShip(this);
+                    }
+                    else
+                    {
+                        delete object;
+                    }
+                }
+            }
+        }
+    }
 }