Changeset 1454 for code/branches/network/src/orxonox/objects

Timestamp:

May 28, 2008, 6:45:02 PM (16 years ago)

Author:

landauf

Message:

fixed tcl initialisation bug

Location:

code/branches/network/src/orxonox/objects

Files:

• Projectile.cc (modified) (3 diffs)
• Projectile.h (modified) (2 diffs)
• SpaceShip.cc (modified) (1 diff)
• SpaceShip.h (modified) (1 diff)

code/branches/network/src/orxonox/objects/Projectile.cc

@@ -27 +27 @@
  */
 
+#include <OgreBillboard.h>
+
 #include "OrxonoxStableHeaders.h"
 #include "Projectile.h"
@@ -41 +43 @@
 {
     CreateFactory(Projectile);
+
+    float Projectile::speed_ = 0;
 
     Projectile::Projectile(SpaceShip* owner) :
@@ -104 +108 @@
         delete this;
     }
+
+    void Projectile::setColour(const ColourValue& colour)
+    {
+        this->billboard_.getBillboardSet()->getBillboard(0)->setColour(colour);
+    }
 }

code/branches/network/src/orxonox/objects/Projectile.h

@@ -35 +35 @@
 #include "../tools/BillboardSet.h"
 #include "../tools/Timer.h"
+#include "util/Math.h"
 
 namespace orxonox
@@ -47 +48 @@
             virtual void tick(float dt);
             virtual bool create(){return WorldEntity::create();}
+            void setColour(const ColourValue& colour);
 
         private:
             SpaceShip* owner_;
             BillboardSet billboard_;
-            float speed_;
+            static float speed_;
             float lifetime_;
             Timer<Projectile> destroyTimer_;

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

@@ -78 +78 @@
 
     SpaceShip::SpaceShip() :
+      teamNr_(0),
+      health_(100),
       //testvector_(0,0,0),
       //bInvertYAxis_(false),

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

@@ -81 +81 @@
             Vector3 getOrth();
             Camera* getCamera();
-            
+
             bool getMyShip(){return myShip_;}
+
+        protected:
+            int teamNr_;
+            int health_;
 
         private: