Changeset 6110 in orxonox.OLD

Timestamp:

Dec 14, 2005, 4:02:12 PM (18 years ago)

Author:

manuel

Message:

powerups are visible now

Location:

branches/powerups/src/world_entities/power_ups

Files:

• param_power_up.cc (modified) (1 diff)
• power_up.cc (modified) (1 diff)
• weapon_power_up.cc (modified) (1 diff)

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

@@ -34 +34 @@
 };
 
-ParamPowerUp::ParamPowerUp () : PowerUp(0.0, 0.0, 1.0)
+ParamPowerUp::ParamPowerUp () : PowerUp(0.0, 1.0, 0.0)
 {
   this->init();
 }
 
-ParamPowerUp::ParamPowerUp(const TiXmlElement* root) : PowerUp(0.0, 0.0, 1.0)
+ParamPowerUp::ParamPowerUp(const TiXmlElement* root) : PowerUp(0.0, 1.0, 0.0)
 {
   this->init();

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

@@ -23 +23 @@
 using namespace std;
 
-Model* PowerUp::sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);
+Model* PowerUp::sphereModel = NULL;
 
 PowerUp::PowerUp(float r, float g, float b)
 {
+  if(!PowerUp::sphereModel) {
+    PowerUp::sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);
+  }
   this->sphereMaterial = new Material;
   this->sphereMaterial->setTransparency(.1);

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

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