Changeset 6040 in orxonox.OLD

Timestamp:

Dec 11, 2005, 1:34:18 AM (18 years ago)

Author:

manuel

Message:

hopefully we see some colored spheres arounf powerups now

Location:

branches/powerups/src/world_entities/power_ups

Files:

• laser_power_up.cc (modified) (1 diff)
• power_up.cc (modified) (2 diffs)
• power_up.h (modified) (2 diffs)
• turret_power_up.cc (modified) (1 diff)
• weapon_power_up.cc (modified) (1 diff)

branches/powerups/src/world_entities/power_ups/laser_power_up.cc

@@ -27 +27 @@
 CREATE_FACTORY(LaserPowerUp, CL_LASER_POWER_UP);
 
-LaserPowerUp::LaserPowerUp ()
+LaserPowerUp::LaserPowerUp () : PowerUp(0.0, 1.0, 0.0)
 {
   this->init();
 }
 
-LaserPowerUp::LaserPowerUp(const TiXmlElement* root)
+LaserPowerUp::LaserPowerUp(const TiXmlElement* root) : PowerUp(0.0, 1.0, 0.0)
 {
   this->init();

branches/powerups/src/world_entities/power_ups/power_up.cc

@@ -19 +19 @@
 #include "power_up.h"
 #include "extendable.h"
-
+#include "primitive_model.h"
 
 using namespace std;
 
-PowerUp::PowerUp() { }
+Model* PowerUp::sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);
 
-PowerUp::~PowerUp () {}
+PowerUp::PowerUp(float r, float g, float b)
+{
+  this->sphereMaterial = new Material;
+  this->sphereMaterial->setTransparency(.1);
+  this->sphereMaterial->setDiffuse(r, g, b);
+}
+
+PowerUp::~PowerUp ()
+{
+  delete this->sphereMaterial;
+}
 
 
@@ -49 +59 @@
   this->setVisibiliy(false);
 }
+
+void PowerUp::draw()
+{
+  WorldEntity::draw();
+  this->sphereMaterial->select();
+  sphereModel->draw();
+}
+

branches/powerups/src/world_entities/power_ups/power_up.h

@@ -9 +9 @@
 #include "world_entity.h"
 
+class Material;
+
 class PowerUp : public WorldEntity {
 
@@ -15 +17 @@
   void collidesWith (WorldEntity* entity, const Vector& location);
 
+  void draw();
+
 protected:
-  PowerUp();
+  PowerUp(float r, float g, float b);
   virtual ~PowerUp ();
   virtual void hide();
+
+  static Model* sphereModel;
+
+private:
+  Material* sphereMaterial;
 };
 

branches/powerups/src/world_entities/power_ups/turret_power_up.cc

@@ -27 +27 @@
 CREATE_FACTORY(TurretPowerUp, CL_TURRET_POWER_UP);
 
-TurretPowerUp::TurretPowerUp ()
+TurretPowerUp::TurretPowerUp () : PowerUp(0.0, 1.0, 0.0)
 {
   this->init();
 }
 
-TurretPowerUp::TurretPowerUp(const TiXmlElement* root)
+TurretPowerUp::TurretPowerUp(const TiXmlElement* root) : PowerUp(0.0, 1.0, 0.0)
 {
   this->init();

branches/powerups/src/world_entities/power_ups/weapon_power_up.cc

@@ -30 +30 @@
 CREATE_FACTORY(WeaponPowerUp, CL_WEAPON_POWER_UP);
 
-WeaponPowerUp::WeaponPowerUp ()
+WeaponPowerUp::WeaponPowerUp () : PowerUp(0.0, 1.0, 0.0)
 {
   this->init();
 }
 
-WeaponPowerUp::WeaponPowerUp(const TiXmlElement* root)
+WeaponPowerUp::WeaponPowerUp(const TiXmlElement* root) : PowerUp(0.0, 1.0, 0.0)
 {
   this->init();