Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6110 in orxonox.OLD for branches/powerups/src


Ignore:
Timestamp:
Dec 14, 2005, 4:02:12 PM (19 years ago)
Author:
manuel
Message:

powerups are visible now

Location:
branches/powerups/src/world_entities/power_ups
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/powerups/src/world_entities/power_ups/param_power_up.cc

    r6109 r6110  
    3434};
    3535
    36 ParamPowerUp::ParamPowerUp () : PowerUp(0.0, 0.0, 1.0)
     36ParamPowerUp::ParamPowerUp () : PowerUp(0.0, 1.0, 0.0)
    3737{
    3838  this->init();
    3939}
    4040
    41 ParamPowerUp::ParamPowerUp(const TiXmlElement* root) : PowerUp(0.0, 0.0, 1.0)
     41ParamPowerUp::ParamPowerUp(const TiXmlElement* root) : PowerUp(0.0, 1.0, 0.0)
    4242{
    4343  this->init();
  • branches/powerups/src/world_entities/power_ups/power_up.cc

    r6107 r6110  
    2323using namespace std;
    2424
    25 Model* PowerUp::sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);
     25Model* PowerUp::sphereModel = NULL;
    2626
    2727PowerUp::PowerUp(float r, float g, float b)
    2828{
     29  if(!PowerUp::sphereModel) {
     30    PowerUp::sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);
     31  }
    2932  this->sphereMaterial = new Material;
    3033  this->sphereMaterial->setTransparency(.1);
  • branches/powerups/src/world_entities/power_ups/weapon_power_up.cc

    r6107 r6110  
    3030CREATE_FACTORY(WeaponPowerUp, CL_WEAPON_POWER_UP);
    3131
    32 WeaponPowerUp::WeaponPowerUp () : PowerUp(0.0, 1.0, 0.0)
     32WeaponPowerUp::WeaponPowerUp () : PowerUp(1.0, 1.0, 0.0)
    3333{
    3434  this->init();
    3535}
    3636
    37 WeaponPowerUp::WeaponPowerUp(const TiXmlElement* root) : PowerUp(0.0, 1.0, 0.0)
     37WeaponPowerUp::WeaponPowerUp(const TiXmlElement* root) : PowerUp(1.0, 1.0, 0.0)
    3838{
    3939  this->init();
Note: See TracChangeset for help on using the changeset viewer.