Changeset 4732 in orxonox.OLD

Timestamp:

Jun 29, 2005, 2:30:16 AM (19 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…

Location:

orxonox/trunk/src

Files:

• lib/particles/particle_system.cc (modified) (5 diffs)
• world_entities/world_entity.cc (modified) (1 diff)

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

@@ -26 +26 @@
 #include "material.h"
 #include "state.h"
-#include "objModel.h"
 
 #include "tinyxml.h"
@@ -85 +84 @@
    if (this->material)
      delete this->material;
-
-   ResourceManager::getInstance()->unload(this->model);
 }
 
@@ -97 +94 @@
 
   this->material = NULL;
-  this->model = NULL;
   this->setMaxCount(PARTICLE_DEFAULT_MAX_COUNT);
   this->count = 0;
@@ -129 +125 @@
       .describe("sets the Conserve facrot of the Particles (1.0: they keep all their energy, 0.0:they keep no energy)");
 
+  LoadParam<ParticleSystem>(root, "type", this, &ParticleSystem::setType)
+      .describe("sets the type of the Particles, (dot, spark, sprite or model)");
+
   const TiXmlElement* element = root->FirstChildElement();
   while (element != NULL)
   {
-    LoadParam<ParticleSystem>(element, "type", this, &ParticleSystem::setType, true)
-        .describe("sets the type of the Particles, (dot, spark, sprite or model)");
 
   // PER-PARTICLE-ATTRIBUTES:
@@ -495 +492 @@
         }
         else
-          printf("no model loaded onto ParticleSystem-%s\n", this->getName());
+          PRINTF(2)("no model loaded onto ParticleSystem-%s\n", this->getName());
       }
       break;

orxonox/trunk/src/world_entities/world_entity.cc

@@ -67 +67 @@
   if (this->model)
     ResourceManager::getInstance()->unload(this->model, RP_LEVEL);
-  this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN);
+  if (fileName != NULL)
+  {
+    PRINTF(4)("loading %s\n", fileName);
+    this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN);
+  }
+  else
+    this->model = NULL;
 }