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

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)

File:

• trunk/src/world_entities/terrain.cc (modified) (5 diffs)

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();