Changeset 4607 in orxonox.OLD

Timestamp:

Jun 12, 2005, 7:12:40 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: loading Terrain via XML

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (3 diffs)
• world_entities/terrain.cc (modified) (4 diffs)
• world_entities/terrain.h (modified) (2 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -396 +396 @@
           if( element->Value() != NULL && !strcmp( element->Value(), "Player")) localPlayer = (Player*) created;
           if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox")) sky = (SkyBox*) created;
+          if( element->Value() != NULL && !strcmp( element->Value(), "Terrain")) terrain = (Terrain*) created;
           element = element->NextSiblingElement();
           glmis->step(); //! \todo temporary
@@ -444 +445 @@
   //  lightMan->setDiffuseColor(0,0,0);
   //lightMan->debug();
-  lightMan->setPosition(-5.0, 10.0, -40.0);
+  lightMan->setPosition(-5.0, 50.0, -40.0);
+  lightMan->addLight();
+  lightMan->setPosition(100, 80, 60);
 
   //        trackManager->setBindSlave(env);
@@ -467 +470 @@
   //trackManager->debug(2);
   glEndList();
-
-  terrain = new Terrain("worlds/newGround.obj");
-  terrain->setRelCoor(Vector(0,-10,0));
-  this->spawn(terrain);
 
   SoundEngine::getInstance()->setListener(this->localCamera);

orxonox/trunk/src/world_entities/terrain.cc

@@ -16 +16 @@
 
 #include "terrain.h"
-#include "stdincl.h"
+
 #include "model.h"
 #include "vector.h"
 #include "glincl.h"
 
+#include "factory.h"
+#include "load_param.h"
+
 using namespace std;
 
+CREATE_FACTORY(Terrain);
 
 /**
@@ -28 +32 @@
 
 */
-Terrain::Terrain ()
+Terrain::Terrain (const TiXmlElement* root)
 {
   this->init();
+  this->loadParams(root);
 }
 
@@ -68 +73 @@
 
 */
-Terrain::~Terrain ()
+Terrain::~Terrain (void)
 {
   if (objectList)
@@ -82 +87 @@
 }
 
-
+void Terrain::loadParams(const TiXmlElement* root)
+{
+  static_cast<WorldEntity*>(this)->loadParams(root);
+
+  //LoadParam<Terrain>(root, "DebugTerrain",  );
+
+
+}
 
 void Terrain::draw ()

orxonox/trunk/src/world_entities/terrain.h

@@ -14 +14 @@
 
 // FORWARD DEFINITION \\
+class TiXmlElement;
 
 //! A simple method to call a desired debug world.
@@ -24 +25 @@
 
  public:
-  Terrain();
+  Terrain(const TiXmlElement* root = NULL);
   Terrain(const char* fileName);
   Terrain(DebugTerrain debugTerrain);
-  virtual ~Terrain();
-  void init();
+  virtual ~Terrain(void);
+
+  void init(void);
+  void loadParams(const TiXmlElement* root);
 
   void buildDebugTerrain(DebugTerrain debugTerrain);