Changeset 2485 for code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.h

Timestamp:

Dec 16, 2008, 6:01:13 PM (17 years ago)

Author:

landauf

Message:

Merged objecthierarchy2 into presentation branch

Couln't merge 2 lines in Gamestate.cc and a whole block of code in GSDedicated.cc (it seems like oli implemented in both branches something like a network-tick-limiter but with different approaches)

Not yet tested in network mode and with bots
The SpaceShips movement is also not yet fully adopted to the new physics (see Engine class)

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/pawns/SpaceShip.h (modified) (2 diffs)

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

@@ -58 +58 @@
 
             virtual void fire();
+            virtual void boost();
+
+            void setEngine(Engine* engine);
+            inline Engine* getEngine() const
+                { return this->engine_; }
+
+            inline void setSteeringDirection(const Vector3& direction)
+                { this->steering_ = direction; }
+            inline const Vector3& getSteeringDirection() const
+                { return this->steering_; }
+
+            inline void setBoost(bool bBoost)
+                { this->bBoost_ = bBoost; }
+            inline bool getBoost() const
+                { return this->bBoost_; }
+
+            inline void setEngineTemplate(const std::string& temp)
+                { this->enginetemplate_ = temp; this->loadEngineTemplate(); }
+            inline const std::string& getEngineTemplate() const
+                { return this->enginetemplate_; }
 
         protected:
             bool bInvertYAxis_;
 
+            bool bBoost_;
+            Vector3 steering_;
             float primaryThrust_;
             float auxilaryThrust_;
@@ -71 +93 @@
         private:
             virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const;
+
+        private:
+            void loadEngineTemplate();
+
+            std::string enginetemplate_;
+            Engine* engine_;
     };
 }