Changeset 1629 for code/branches/input/src/orxonox/objects/Projectile.h

Timestamp:

Jun 27, 2008, 8:07:29 AM (17 years ago)

Author:

rgrieder

Message:

updated input branch

File:

• code/branches/input/src/orxonox/objects/Projectile.h (modified) (3 diffs)

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

@@ -33 +33 @@
 
 #include "WorldEntity.h"
-#include "../tools/BillboardSet.h"
-#include "../tools/Timer.h"
-#include "util/Math.h"
+#include "tools/Timer.h"
 
 namespace orxonox
@@ -42 +40 @@
     {
         public:
-            Projectile(SpaceShip* owner = 0);
             virtual ~Projectile();
             void setConfigValues();
             void destroyObject();
             virtual void tick(float dt);
-            virtual bool create(){return WorldEntity::create();}
-            void setColour(const ColourValue& colour);
 
             static float getSpeed()
@@ -54 +49 @@
 
         protected:
+            Projectile(SpaceShip* owner = 0);
             SpaceShip* owner_;
 
         private:
-            BillboardSet billboard_;
+            std::string explosionTemplateName_;
+            std::string smokeTemplateName_;
             static float speed_;
             float lifetime_;
+            float damage_;
             Timer<Projectile> destroyTimer_;
     };