Changeset 5465 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Nov 2, 2005, 9:01:12 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: vegetation rendering in the terrain (trees are now rendered correctly)

Location:

trunk/src/world_entities

Files:

• terrain.cc (modified) (5 diffs)
• terrain.h (modified) (2 diffs)
• weapons/laser.cc (modified) (2 diffs)
• weapons/rocket.cc (modified) (2 diffs)
• world_entity.cc (modified) (1 diff)

trunk/src/world_entities/terrain.cc

@@ -21 +21 @@
 #include "factory.h"
 #include "spatial_separation.h"
+
+#include "resource_manager.h"
 
 using namespace std;
@@ -78 +80 @@
   if( this->ssp)
     delete ssp;
+  if (this->vegetation)
+  {
+    ResourceManager::getInstance()->unload(this->vegetation);
+  }
 }
 
@@ -87 +93 @@
   this->objectList = 0;
   this->ssp = NULL;
+  this->vegetation = NULL;
 }
 
@@ -94 +101 @@
   static_cast<WorldEntity*>(this)->loadParams(root);
 
+  LoadParam<Terrain>(root, "vegetation", this, &Terrain::loadVegetation)
+      .describe("the fileName of the vegetation, that should be loaded onto this terrain. (must be relative to the data-dir)") ;
+
   //LoadParam<Terrain>(root, "DebugTerrain",  );
 }
+
+void Terrain::loadVegetation(const char* vegetationFile)
+{
+  if (this->vegetation)
+    ResourceManager::getInstance()->unload(this->vegetation, RP_LEVEL);
+  if (vegetationFile != NULL)
+  {
+    PRINTF(4)("fetching %s\n", vegetationFile);
+      this->vegetation = (Model*)ResourceManager::getInstance()->load(vegetationFile, OBJ, RP_CAMPAIGN);
+  }
+  else
+    this->vegetation = NULL;
+}
+
+
 
 void Terrain::draw ()
@@ -114 +139 @@
   else if (this->model)
     this->model->draw();
+  if (this->vegetation)
+    this->vegetation->draw();
   glPopMatrix();
 

trunk/src/world_entities/terrain.h

@@ -33 +33 @@
   void loadParams(const TiXmlElement* root);
 
+  void loadVegetation(const char* vegetationFile);
+
   void buildDebugTerrain(DebugTerrain debugTerrain);
   virtual void draw();
@@ -40 +42 @@
 
  private:
-  int objectList;
+   Model*              vegetation;
+   int                 objectList;
 };
 

trunk/src/world_entities/weapons/laser.cc

@@ -51 +51 @@
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI, M_PI);
-  this->emitter->setEmissionRate(50.0);
+  this->emitter->setEmissionRate(300.0);
   this->emitter->setEmissionVelocity(50.0);
 }
@@ -83 +83 @@
     Laser::explosionParticles->setName("LaserExplosionParticles");
     Laser::explosionParticles->setLifeSpan(.5, .3);
-    Laser::explosionParticles->setRadius(0.0, 5);
-    Laser::explosionParticles->setRadius(.5, 10.0);
+    Laser::explosionParticles->setRadius(0.0, 3.0);
+    Laser::explosionParticles->setRadius(.5, 6.0);
     Laser::explosionParticles->setRadius(1.0, 3.0);
     Laser::explosionParticles->setColor(0.0, 1,1,0,.9);

trunk/src/world_entities/weapons/rocket.cc

@@ -97 +97 @@
   if (unlikely(Rocket::explosionParticles == NULL))
   {
-    Rocket::explosionParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
+    Rocket::explosionParticles = new ParticleSystem(200, PARTICLE_SPRITE);
     Rocket::explosionParticles->setName("RocketExplosionParticles");
-    Rocket::explosionParticles->setLifeSpan(.5, .3);
+    Rocket::explosionParticles->setLifeSpan(.6, .3);
     Rocket::explosionParticles->setRadius(0.0, 10);
     Rocket::explosionParticles->setRadius(.5, 20.0);
-    Rocket::explosionParticles->setRadius(1.0, 3.0);
-    Rocket::explosionParticles->setColor(0.0, 0,1,0,.9);
-    Rocket::explosionParticles->setColor(0.5, .8,.8,0,.5);
+    Rocket::explosionParticles->setRadius(1.0, 20.0);
+    Rocket::explosionParticles->setColor(0.0, 0,1,0,1);
+    Rocket::explosionParticles->setColor(0.5, .8,.8,0,.8);
+    Rocket::explosionParticles->setColor(0.8, .8,.8,.3,.8);
     Rocket::explosionParticles->setColor(1.0, 1,1,1,.0);
   }
@@ -164 +165 @@
   ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::explosionParticles);
 
-  this->emitter->setEmissionRate(30.0);
+  this->emitter->setEmissionRate(1000.0);
   this->emitter->setEmissionVelocity(50.0);
 //  this->deactivate();

trunk/src/world_entities/world_entity.cc

@@ -66 +66 @@
   // Model Loading
   LoadParam<WorldEntity>(root, "model", this, &WorldEntity::loadModel)
-    .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)") ;
+      .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)") ;
+
+  // HACK
+  LoadParam<WorldEntity>(root, "scaled-model", this, &WorldEntity::loadModelWithScale)
+      .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)") ;
 }