Changeset 7052 for code/branches/fps/src/orxonox

Timestamp:

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

Author:

freicy

Message:

by Cyrill Frei

Location:

code/branches/fps/src/orxonox/worldentities/pawns

Files:

• FpsPlayer.cc (modified) (8 diffs)
• FpsPlayer.h (modified) (6 diffs)
• Pawn.cc (modified) (2 diffs)
• Pawn.h (modified) (1 diff)

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

@@ -33 +33 @@
 #include <LinearMath/btVector3.h>
 #include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
-
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreEntity.h>
 
 #include "core/CoreIncludes.h"
@@ -40 +42 @@
 #include "core/XMLPort.h"
 #include "items/Engine.h"
+#include "Scene.h"
+#include "weaponsystem/WeaponPack.h"
+#include "weaponsystem/WeaponSlot.h"
+#include "weaponsystem/Weapon.h"
 
 #include <cmath>
@@ -80 +86 @@
         this->registerVariables();
 
+        this->weaponNode = this->cameraPositionRootNode_;
+        //this->weaponNode = this->getScene()->getRootSceneNode()->createChildSceneNode();
+        //this->weaponNode = this->cameraPositionRootNode_->createChildSceneNode();
+        this->attachNode(this->weaponNode);
     }
 
     FpsPlayer::~FpsPlayer()
     {
+        if (this->isInitialized() && this->mesh_.getEntity())
+            this->detachOgreObject(this->mesh_.getEntity());
     }
 
@@ -93 +105 @@
         XMLPortParamVariable(FpsPlayer, "auxilaryThrust", auxilaryThrust_, xmlelement, mode);
         XMLPortParamVariable(FpsPlayer, "rotationThrust", rotationThrust_, xmlelement, mode);
+        XMLPortParam(FpsPlayer, "weapon", setMeshSource, getMeshSource, xmlelement, mode);
     }
 
@@ -100 +113 @@
         registerVariable(this->auxilaryThrust_, VariableDirection::ToClient);
         registerVariable(this->rotationThrust_, VariableDirection::ToClient);
-    }
+        registerVariable(this->weaponmashname);
+    }
+    
+   
 
     void FpsPlayer::setConfigValues()
@@ -145 +161 @@
             if (!this->isInMouseLook())
             {
-                this->yaw(Radian(this->yaw_ * this->getMouseLookSpeed()),WorldEntity::Parent);
-                //this->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
+                this->yaw(Radian(this->yaw_ * this->getMouseLookSpeed()), WorldEntity::Parent);
+                
                 Radian pitch=this->cameraPositionRootNode_->getOrientation().getPitch();
-                if( pitch<Radian(1.5707) && pitch>Radian(-1.5707) ) this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
+                if( pitch<Radian(1.5707) && pitch>Radian(-1.5707) ) {
+                        //this->weaponNode->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
+                        this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
+                        }
                 else if(pitch<Radian(-1.5707)){
-                        if(this->pitch_>0.0) this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
-                        else if(pitch<Radian(-1.571)) this->cameraPositionRootNode_->pitch(-pitch+Radian(-1.570796));
+                        if(this->pitch_>0.0) {
+                                //this->weaponNode->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
+                                this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
+                                }
+                        else if(pitch<Radian(-1.571)){
+                                //this->weaponNode->pitch(-pitch+Radian(-1.570796));
+                                this->cameraPositionRootNode_->pitch(-pitch+Radian(-1.570796));
+                                }
                 }
                 else if(pitch>Radian(1.5707)){
-                        if(this->pitch_<0.0) this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
-                        else if(pitch>Radian(1.571)) this->cameraPositionRootNode_->pitch(-pitch+Radian(1.570796));
+                        if(this->pitch_<0.0) {
+                                //this->weaponNode->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
+                                this->cameraPositionRootNode_->pitch(Radian(this->pitch_ * this->getMouseLookSpeed()));
+                                }
+                        else if(pitch>Radian(1.571)){ 
+                                //this->weaponNode->pitch(-pitch+Radian(1.570796));
+                                this->cameraPositionRootNode_->pitch(-pitch+Radian(1.570796));
+                                }
                 }
-                 
+                //this->weaponNode->setOrientation(this->cameraPositionRootNode_->getOrientation());
                 
- //               this->roll(Radian(this->roll_ * this->getMouseLookSpeed()));
-            }
+            }
 
             this->yaw_ = this->pitch_ = this->roll_ = 0;
@@ -172 +202 @@
         SUPER(FpsPlayer, tick, dt);
     }
+    
+    void FpsPlayer::changedMesh()
+    {
+        if (GameMode::showsGraphics())
+        {
+            if (this->mesh_.getEntity())
+                this->weaponNode->detachObject(this->mesh_.getEntity());
+
+            this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
+
+            if (this->mesh_.getEntity())
+            {
+                this->weaponNode->attachObject(this->mesh_.getEntity());
+            }
+        }
+    }
 
     void FpsPlayer::setPlayer(PlayerInfo* player)
@@ -244 +290 @@
     }
     
+    void FpsPlayer::addedWeaponPack(WeaponPack* wPack)
+    {
+        for (size_t i = 0; i < wPack->getNumWeapons(); ++i)
+        {
+            Weapon* weapon = wPack->getWeapon(i);
+            if (weapon->getWeaponSlot())
+            {
+                weapon->getWeaponSlot()->removeWeapon();
+                weapon->detachFromParent();
+                weapon->attachToNode(this->weaponNode);
+            }
+        }
+    }
 }

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_;
     };
 }

code/branches/fps/src/orxonox/worldentities/pawns/Pawn.cc

@@ -331 +331 @@
     {
         if (this->weaponSystem_)
+        {
             this->weaponSystem_->addWeaponPack(wPack);
+            this->addedWeaponPack(wPack);
+        }
     }
 
@@ -337 +340 @@
     {
         if (this->weaponSystem_)
+        {
             if (!this->weaponSystem_->addWeaponPack(wPack))
                 wPack->destroy();
+            else
+                this->addedWeaponPack(wPack);
+        }
     }
 

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

@@ -90 +90 @@
             void addWeaponPackXML(WeaponPack * wPack);
             WeaponPack * getWeaponPack(unsigned int index) const;
+            
+            virtual void addedWeaponPack(WeaponPack* wPack) {}
 
             inline const WorldEntity* getWorldEntity() const