Changeset 4785 in orxonox.OLD

Timestamp:

Jul 3, 2005, 5:04:20 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: error in loading of PNode fixed, and the Framework starts again, (also loads the settings of the GraphicsEngine)

Location:

orxonox/trunk/src

Files:

• lib/coord/p_node.cc (modified) (1 diff)
• subprojects/framework.cc (modified) (4 diffs)

orxonox/trunk/src/lib/coord/p_node.cc

@@ -139 +139 @@
 
   // cycling properties
-  const TiXmlElement* element = root->FirstChildElement();
-  while (element != NULL)
+  if (root != NULL)
   {
-    LoadParam<PNode>(root, "parent", this, &PNode::addChild, true)
-        .describe("adds a new Child to the current Node.");
-
-    element = element->NextSiblingElement();
+    const TiXmlElement* element = root->FirstChildElement();
+    while (element != NULL)
+    {
+      LoadParam<PNode>(root, "parent", this, &PNode::addChild, true)
+          .describe("adds a new Child to the current Node.");
+
+      element = element->NextSiblingElement();
+    }
   }
 }

orxonox/trunk/src/subprojects/framework.cc

@@ -33 +33 @@
   // create parser
   IniParser parser (DEFAULT_CONFIG_FILE);
+
+  GraphicsEngine::getInstance()->initFromIniFile(&parser);
+
+  LightManager::getInstance();
+
   if( parser.getSection (CONFIG_SECTION_DATA) == -1)
   {
@@ -198 +203 @@
         break;
       case SDL_VIDEORESIZE:
-        GraphicsEngine::getInstance()->resolutionChanged(&event.resize);
+        GraphicsEngine::getInstance()->resolutionChanged(event.resize);
         break;
       case SDL_KEYDOWN:
@@ -280 +285 @@
   this->init();
 
+  camera = new Camera();
+  State::getInstance()->setCamera(camera, camera->getTarget());
+  camera->setAbsCoor(Vector(10, 10, 10));
+
   this->isFinished = false;
 
   this->lastFrame = 0;
-  // Create a new OpenGL window with the title "Cone3D Basecode" at
-  // 640x480x32, fullscreen and check for errors along the way
-  GraphicsEngine::getInstance();
-
-  LightManager::getInstance();
-  glEnable(GL_TEXTURE_2D);
+
 
   // Build the font from a TGA image font.tga in the data directory
@@ -298 +302 @@
   for (int i = 0; i < 4; i++)
     backgroundColor[i] = 0;
-
-  camera = new Camera();
-
-  State::getInstance()->setCamera(camera, camera->getTarget());
-
-  camera->setAbsCoor(Vector(10, 10, 10));
-
 }