Changeset 4715 in orxonox.OLD for orxonox/trunk/src/lib/particles/particle_system.cc

Timestamp:

Jun 27, 2005, 12:07:16 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: vulcan spy some Splinters

File:

• orxonox/trunk/src/lib/particles/particle_system.cc (modified) (3 diffs)

orxonox/trunk/src/lib/particles/particle_system.cc

@@ -81 +81 @@
    if (this->material)
      delete this->material;
+
+   ResourceManager::getInstance()->unload(this->model);
 }
 
@@ -176 +178 @@
 }
 
-
-
 /**
  * sets a Model to the Particles
@@ -185 +185 @@
 {
   if (this->model)
-    delete this->model;
+    ResourceManager::getInstance()->unload(this->model);
   if (modelName)
-    this->model = new OBJModel(modelName);
-  this->setType(PARTICLE_MODEL);
+  {
+    this->model = (Model*)ResourceManager::getInstance()->load(modelName, OBJ, RP_LEVEL);
+    this->setType(PARTICLE_MODEL);
+  }
+  else
+  {
+    this->model = NULL;
+    this->setType(PARTICLE_SPRITE);
+  }
 }