Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4715 in orxonox.OLD for orxonox/trunk/src/lib


Ignore:
Timestamp:
Jun 27, 2005, 12:07:16 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: vulcan spy some Splinters

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/lib/particles/particle_system.cc

    r4692 r4715  
    8181   if (this->material)
    8282     delete this->material;
     83
     84   ResourceManager::getInstance()->unload(this->model);
    8385}
    8486
     
    176178}
    177179
    178 
    179 
    180180/**
    181181 * sets a Model to the Particles
     
    185185{
    186186  if (this->model)
    187     delete this->model;
     187    ResourceManager::getInstance()->unload(this->model);
    188188  if (modelName)
    189     this->model = new OBJModel(modelName);
    190   this->setType(PARTICLE_MODEL);
     189  {
     190    this->model = (Model*)ResourceManager::getInstance()->load(modelName, OBJ, RP_LEVEL);
     191    this->setType(PARTICLE_MODEL);
     192  }
     193  else
     194  {
     195    this->model = NULL;
     196    this->setType(PARTICLE_SPRITE);
     197  }
    191198}
    192199
Note: See TracChangeset for help on using the changeset viewer.