Changeset 5976 in orxonox.OLD for branches/height_map/src/world_entities

Timestamp:

Dec 7, 2005, 5:21:41 PM (19 years ago)

Author:

bottac

Message:

 

Location:

branches/height_map/src/world_entities

Files:

• terrain.cc (modified) (3 diffs)
• terrain.h (modified) (2 diffs)

branches/height_map/src/world_entities/terrain.cc

@@ -24 +24 @@
 #include "resource_manager.h"
 #include "model.h"
+#include "material.h"
 #include "height_map.h"
 #include "glincl.h"
@@ -39 +40 @@
 
   this->init();
-  
+
+  this->tmp_mat = new Material();  
   // this->loadParams(root);
 
@@ -204 +206 @@
   Vector tmpRot = this->getAbsDir().getSpacialAxis();
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+
+   this->tmp_mat->select();
+
   this->model->draw();
   if (this->objectList)

branches/height_map/src/world_entities/terrain.h

@@ -15 +15 @@
 // FORWARD DECLARATION
 class SpatialSeparation;
+class Material;
 
 //! A simple method to call a desired debug world.
@@ -43 +44 @@
  private:
    Model*              vegetation;
+   Material*           tmp_mat;
    int                 objectList;
 };