Changeset 4005 in orxonox.OLD for orxonox/branches/ll2trunktemp

Timestamp:

Apr 28, 2005, 8:24:43 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/ll2trunktemp: tested loading of a different WorldEntity (SkyBox) and it works.

Location:

orxonox/branches/ll2trunktemp/src

Files:

• factory.h (modified) (1 diff)
• story_entities/world.cc (modified) (3 diffs)
• world_entities/skybox.cc (modified) (3 diffs)
• world_entities/skybox.h (modified) (1 diff)

orxonox/branches/ll2trunktemp/src/factory.h

@@ -15 +15 @@
     this should be used at the beginning of all the Classes that should be loadable (in the cc-file)
 */
-#define CREATE_FACTORY(x) tFactory<x>* global_ ## x ## Factory = new tFactory<x>(#x);
+#define CREATE_FACTORY(x) tFactory<x>* global_ ## x ## Factory = new tFactory<x>(#x)
 
 

orxonox/branches/ll2trunktemp/src/story_entities/world.cc

@@ -158 +158 @@
       this->setPath( name);
     }
-        
-  this->localPlayer = NULL;
-
 }
 
@@ -333 +330 @@
           //todo do this more elegant 
           if( element->Value() != NULL && !strcmp( element->Value(), "Player")) localPlayer = (Player*) created;
+          if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox")) skyBox = (SkyBox*) created;
           element = element->NextSiblingElement();
         }
@@ -456 +454 @@
   lightMan->debug();
   lightMan->setPosition(-5.0, 10.0, -40.0);
-  
-  
-  // Create SkySphere
-  this->skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
-  this->skySphere->setName("SkySphere");
-  this->localCamera->addChild(this->skySphere);
-  spawn(skySphere);
-  
   
   //        trackManager->setBindSlave(env);

orxonox/branches/ll2trunktemp/src/world_entities/skybox.cc

@@ -28 +28 @@
 
 #include "skybox.h"
+
 #include "stdincl.h"
+#include "factory.h"
 
 #include "material.h"
@@ -36 +38 @@
 //#include "world_entity.h"
 
+CREATE_FACTORY(SkyBox);
 
 using namespace std;
@@ -44 +47 @@
 */
 SkyBox::SkyBox(char* fileName)
+{
+  this->init();
+}
+
+SkyBox::SkyBox(TiXmlElement* root) : WorldEntity(root)
+{
+  this->init();
+
+  // Name Setup
+  char* temp;
+  const char* string;
+
+  // Model Loading      
+  this->model = NULL;
+  string = grabParameter( root, "materialset");
+  if( string != NULL)
+    this->setTexture(string, "jpg");
+  else
+    {
+      PRINTF(0)("SkyBox is missing a proper 'MaterialSet'\n");
+      this->model = (Model*)ResourceManager::getInstance()->load("cube", OBJ, RP_CAMPAIGN);
+    }
+  if( this->model == NULL)
+    {
+      PRINTF(0)("SkyBox model '%s' could not be loaded\n", string);
+    }
+}
+
+void SkyBox::init(void)
 {
   this->setClassName("SkyBox");

orxonox/branches/ll2trunktemp/src/world_entities/skybox.h

@@ -22 +22 @@
  public:
   SkyBox(char* fileName = NULL);
+  SkyBox(TiXmlElement* root);
+
   virtual ~SkyBox();
+
+  void init(void);
 
   void setSize(float size);