Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4732 in orxonox.OLD for orxonox/trunk/src/lib/particles


Ignore:
Timestamp:
Jun 29, 2005, 2:30:16 AM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: stones visible as such, and not as cubes… i do not quite know whu this has changed in this release, but i think i am going to bed now…

File:
1 edited

Legend:

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

    r4727 r4732  
    2626#include "material.h"
    2727#include "state.h"
    28 #include "objModel.h"
    2928
    3029#include "tinyxml.h"
     
    8584   if (this->material)
    8685     delete this->material;
    87 
    88    ResourceManager::getInstance()->unload(this->model);
    8986}
    9087
     
    9794
    9895  this->material = NULL;
    99   this->model = NULL;
    10096  this->setMaxCount(PARTICLE_DEFAULT_MAX_COUNT);
    10197  this->count = 0;
     
    129125      .describe("sets the Conserve facrot of the Particles (1.0: they keep all their energy, 0.0:they keep no energy)");
    130126
     127  LoadParam<ParticleSystem>(root, "type", this, &ParticleSystem::setType)
     128      .describe("sets the type of the Particles, (dot, spark, sprite or model)");
     129
    131130  const TiXmlElement* element = root->FirstChildElement();
    132131  while (element != NULL)
    133132  {
    134     LoadParam<ParticleSystem>(element, "type", this, &ParticleSystem::setType, true)
    135         .describe("sets the type of the Particles, (dot, spark, sprite or model)");
    136133
    137134  // PER-PARTICLE-ATTRIBUTES:
     
    495492        }
    496493        else
    497           printf("no model loaded onto ParticleSystem-%s\n", this->getName());
     494          PRINTF(2)("no model loaded onto ParticleSystem-%s\n", this->getName());
    498495      }
    499496      break;
Note: See TracChangeset for help on using the changeset viewer.