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

Timestamp:

Dec 10, 2005, 8:33:08 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the NewModel branche back to the trunk.
merged with command
svn merge branches/newModel/ trunk/ -r 6016:HEAD
no conflicts

Location:

trunk/src/world_entities

Files:

• skybox.cc (modified) (2 diffs)
• terrain.cc (modified) (1 diff)
• weapons/test_gun.cc (modified) (3 diffs)

trunk/src/world_entities/skybox.cc

@@ -20 +20 @@
 #include "load_param.h"
 #include "factory.h"
-#include "model.h"
-
+#include "static_model.h"
+#include "material.h"
 
 using namespace std;
@@ -170 +170 @@
 void SkyBox::rebuild()
 {
-  Model* model = new Model();
+  StaticModel* model = new StaticModel();
 
   model->addVertex (-0.5*size, -0.5*size, 0.5*size);

trunk/src/world_entities/terrain.cc

@@ -40 +40 @@
 
 //  if (this->model != NULL)
-    //this->ssp = new SpatialSeparation((AbstractModel*)this->model, 10.0f);
+    //this->ssp = new SpatialSeparation((Model*)this->model, 10.0f);
 }
 

trunk/src/world_entities/weapons/test_gun.cc

@@ -24 +24 @@
 
 #include "world_entity.h"
-#include "model.h"
+#include "static_model.h"
 #include "test_bullet.h"
 #include "weapon_manager.h"
@@ -219 +219 @@
   if( this->leftRight == W_RIGHT)
     glScalef(1.0, 1.0, -1.0);
-  this->getModel()->draw(1);
+  static_cast<StaticModel*>(this->getModel())->draw(1);
   glPopMatrix();
 
@@ -230 +230 @@
   tmpRot = this->objectComponent1->getAbsDir().getSpacialAxis();
   glRotatef (this->objectComponent1->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-  this->getModel()->draw(0);
+  static_cast<StaticModel*>(this->getModel())->draw(0);
   glPopMatrix();
 }