Changeset 643

Timestamp:

Dec 19, 2007, 2:41:01 AM (17 years ago)

Author:

landauf

Message:

added a simple firing mode to SpaceShip

Location:

code/branches/FICN/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• objects/CMakeLists.txt (modified) (1 diff)
• objects/Projectile.cc (added)
• objects/Projectile.h (added)
• objects/SpaceShip.cc (modified) (5 diffs)
• objects/SpaceShip.h (modified) (3 diffs)
• objects/WorldEntity.cc (modified) (3 diffs)
• objects/WorldEntity.h (modified) (4 diffs)

code/branches/FICN/src/orxonox/CMakeLists.txt

@@ -36 +36 @@
     objects/BillboardSet.cc
     objects/Light.cc
+    objects/Projectile.cc
+    objects/weapon_system/ammunition_dump.cc
+    objects/weapon_system/barrel_gun.cc
+    objects/weapon_system/base_weapon.cc
+    objects/weapon_system/bullet.cc
+    objects/weapon_system/bullet_manager.cc
+    objects/weapon_system/weapon_station.cc
   )
 ELSE(WIN32)

code/branches/FICN/src/orxonox/objects/CMakeLists.txt

@@ -20 +20 @@
   BillboardSet.cc
   Light.cc
+  Projectile.cc
   weapon_system/ammunition_dump.cc
   weapon_system/barrel_gun.cc

code/branches/FICN/src/orxonox/objects/SpaceShip.cc

@@ -27 +27 @@
 
 #include "SpaceShip.h"
+#include "Projectile.h"
 
 #include "../../tinyxml/tinyxml.h"
@@ -45 +46 @@
 
         SetConfigValue(bInvertMouse_, true);
+        SetConfigValue(reloadTime_, 0.1);
 
         this->setMouseEventCallback_ = false;
+        this->bMousePressed_ = false;
 
         this->tt_ = 0;
@@ -52 +55 @@
         this->greenNode_ = 0;
         this->blinkTime_ = 0;
+
+        this->timeToReload_ = 0;
 
         this->moveForward_ = 0;
@@ -201 +206 @@
     }
 
+    bool SpaceShip::mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id)
+    {
+        this->bMousePressed_ = true;
+
+        return true;
+    }
+
+    bool SpaceShip::mouseReleased(const OIS::MouseEvent &e, OIS::MouseButtonID id)
+    {
+        this->bMousePressed_ = false;
+    }
+
     void SpaceShip::tick(float dt)
     {
@@ -221 +238 @@
             this->redNode_->setScale(redScale, redScale, redScale);
             this->greenNode_->setScale(greenScale, greenScale, greenScale);
+        }
+
+        if (this->timeToReload_ > 0)
+            this->timeToReload_ -= dt;
+        else
+            this->timeToReload_ = 0;
+
+        if (this->bMousePressed_ && this->timeToReload_ <= 0)
+        {
+            Projectile* proj = new Projectile(this);
+            this->timeToReload_ = this->reloadTime_;
         }
 

code/branches/FICN/src/orxonox/objects/SpaceShip.h

@@ -36 +36 @@
             void maxSpeedLoopRightLeft(float maxSpeedLoopRightLeft);
             bool mouseMoved(const OIS::MouseEvent &e);
-            bool mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id) { return true; }
-            bool mouseReleased(const OIS::MouseEvent &e, OIS::MouseButtonID id) { return true; }
+            bool mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id);
+            bool mouseReleased(const OIS::MouseEvent &e, OIS::MouseButtonID id);
 
 
@@ -43 +43 @@
             bool bInvertMouse_;
             bool setMouseEventCallback_;
+            bool bMousePressed_;
 
             particle::ParticleInterface *tt_;
@@ -51 +52 @@
             Ogre::SceneNode* greenNode_;
             float blinkTime_;
+
+            float timeToReload_;
+            float reloadTime_;
 
             float moveForward_;

code/branches/FICN/src/orxonox/objects/WorldEntity.cc

@@ -75 +75 @@
         {
             this->velocity_ += (dt * this->acceleration_);
-            this->translate(dt * this->velocity_);
+            this->translate(dt * this->velocity_, Ogre::Node::TS_LOCAL);
 
             this->rotationRate_ += (dt * this->momentum_);
@@ -151 +151 @@
 
         create();
-        
+
     }
 
@@ -158 +158 @@
       return true;
     }
-    
+
     void WorldEntity::registerAllVariables()
     {

code/branches/FICN/src/orxonox/objects/WorldEntity.h

@@ -23 +23 @@
       virtual void loadParams(TiXmlElement* xmlElem);
       bool create();
-      
+
       inline Ogre::SceneNode* getNode()
           { return this->node_; }
@@ -53 +53 @@
           { this->node_->roll(angle, relativeTo); }
 
+      inline const Ogre::Quaternion& getOrientation()
+        { return this->node_->getOrientation(); }
+      inline void setOrientation(const Ogre::Quaternion& quat)
+        { this->node_->setOrientation(quat); }
       inline void rotate(const Vector3 &axis, const Radian &angle, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL)
         { this->node_->rotate(axis, angle, relativeTo); }
@@ -59 +63 @@
       inline void setDirection(const Vector3 &vec, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
         { this->node_->setDirection(vec, relativeTo, localDirectionVector); }
-      inline void setOrientation(const Ogre::Quaternion quat)
-        { this->node_->setOrientation(quat); }
       inline void lookAt(const Vector3 &targetPoint, Ogre::Node::TransformSpace relativeTo, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
         { this->node_->lookAt(targetPoint, relativeTo, localDirectionVector); }
@@ -122 +124 @@
       inline const Radian& getMomentum() const
           { return this->momentum_; }
-      inline const Ogre::Quaternion& getOrientation()
-          { return this->node_->getOrientation(); }
 
       inline void setStatic(bool bStatic)