Changeset 7052 for code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.h

Timestamp:

May 31, 2010, 3:40:41 PM (15 years ago)

Author:

freicy

Message:

by Cyrill Frei

File:

• code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) (6 diffs)

code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.h

@@ -35 +35 @@
 #include <LinearMath/btVector3.h>
 #include "util/Math.h"
+#include "tools/Mesh.h"
 #include "Pawn.h"
 
@@ -58 +59 @@
             virtual void rotateRoll(const Vector2& value);
             
+            
+            inline void setMeshSource(const std::string& meshname)
+                { this->meshSrc_ = meshname; this->changedMesh(); }
+            inline const std::string& getMeshSource() const
+                { return this->meshSrc_; }
+            
             void boost();                                               //acctually jump
 
@@ -63 +70 @@
             
             bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+
+            virtual void addedWeaponPack(WeaponPack* wPack);
             
         protected:
@@ -75 +84 @@
             float auxilaryThrust_;
             float rotationThrust_;
+            std::string weaponmashname;
             btVector3 localLinearAcceleration_;
             btVector3 localAngularAcceleration_;
@@ -82 +92 @@
             float speed_;
 
+            void changedMesh();
+            Mesh mesh_;
+            std::string meshSrc_;
             float yaw_;
             float pitch_;
@@ -89 +102 @@
             bool thistickboost;
             Quaternion savedOrientation_;
+            Ogre::SceneNode* weaponNode;
+            Ogre::Camera* camera_;
     };
 }