Changeset 4104 in orxonox.OLD

Timestamp:

May 7, 2005, 1:55:44 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: loadScreen now loadable as well

Location:

orxonox/trunk/src

Files:

• glmenu/glmenu_imagescreen.cc (modified) (6 diffs)
• glmenu/glmenu_imagescreen.h (modified) (1 diff)
• story_entities/world.cc (modified) (8 diffs)

orxonox/trunk/src/glmenu/glmenu_imagescreen.cc

@@ -29 +29 @@
 /**
    \brief standard constructor
-
-   \todo this constructor is not jet implemented - do it
 */
 GLMenuImageScreen::GLMenuImageScreen () 
 {
-   this->setClassName ("GLMenuImageScreen");
    this->init();
 }
 
-
+/**
+   \param root The Element to load the GLMenu from
+*/
 GLMenuImageScreen::GLMenuImageScreen (TiXmlElement* root)
 {
   this->init();
-
+  this->load(root);
+
+}
+
+/**
+   \brief Loads a GLMenu from an inputElement
+   \param root The Element to load the GLMenu from
+
+   Tags are:
+   \li BackgroundImage STRING: the background Image
+   \li BarImage: STRING: the Image on the Bar
+   \li BackgroundPS: FLOAT FLOAT FLOAT FLOAT: posX posY scaleX scaleY
+   \li BarPS: FLOAT FLOAT FLOAT FLOAT: posX posY scaleX scaleY
+   \li ElementCount: INT: how many elements will be loaded
+*/
+void GLMenuImageScreen::load(TiXmlElement* root)
+{
   const char* string;
 
@@ -49 +64 @@
   if( string != NULL)
     this->setBackgroundImage(string);
-  
+
+  string = grabParameter(root, "BackgroundPS");
+  if (string != NULL)
+    {
+      float f1, f2, f3, f4;
+      sscanf (string, "%f %f %f %f", &f1, &f2, &f3, &f4);
+      this->setPosition(f1,f2);
+      this->setScale(f3,f4);
+    }
+
   string = grabParameter( root, "BarImage");
   if (string != NULL)
     this->setBarImage(string);
-
-}
-
+  string = grabParameter(root, "BarPS");
+  if (string != NULL)
+    {
+      float f1, f2, f3, f4;
+      sscanf (string, "%f %f %f %f", &f1, &f2, &f3, &f4);
+      this->setBarPosScale(f1,f2,f3,f4);
+    }
+
+  string = grabParameter( root, "ElementCount");
+  if (string != NULL)
+    this->setMaximum(atoi(string));
+}
 
 /**
@@ -72 +105 @@
 void GLMenuImageScreen::init ()
 {
+  this->setClassName ("GLMenuImageScreen");
+
   // Select Our VU Meter Background Texture
   this->backMat = new Material("load_screen");
@@ -200 +235 @@
 
   PRINTF(4)("GLMenuImagEscreen::draw() - drawing step %i/%i\n", 
-         this->currentValue, this->maxValue);
+            this->currentValue, this->maxValue);
 
   /* screen size */
@@ -218 +253 @@
   int barH = (int)(this->barH *screenHeight);
   
-  int val = (int)(((float)this->currentValue/(float)this->maxValue)
-                  * this->barW * (float)screenWidth);
+  float val = (float)this->currentValue/(float)this->maxValue;
+                  
   if( val > barW)
     val = barW;
@@ -248 +283 @@
   barMat->select();
   glBegin(GL_TRIANGLE_STRIP);
-  glTexCoord2i(0, 0); glVertex2i(barX, barY + barH);
-  glTexCoord2i(1, 0); glVertex2i(barX + val, barY + barH);
-  glTexCoord2i(0, 1); glVertex2i(barX, barY);
-  glTexCoord2i(1, 1); glVertex2i(barX + val, barY);
+  glTexCoord2f(0, 0); glVertex2i(barX, barY + barH);
+  glTexCoord2f(val, 0); glVertex2i(barX + (int)(val * this->barW * (float)screenWidth), barY + barH);
+  glTexCoord2f(0, 1); glVertex2i(barX, barY);
+  glTexCoord2f(val, 1); glVertex2i(barX + (int)(val * this->barW * (float)screenWidth), barY);
   glEnd();
 

orxonox/trunk/src/glmenu/glmenu_imagescreen.h

@@ -18 +18 @@
   GLMenuImageScreen ();
   GLMenuImageScreen (TiXmlElement* root);
+  void load(TiXmlElement* root);
   virtual ~GLMenuImageScreen ();
 

orxonox/trunk/src/story_entities/world.cc

@@ -268 +268 @@
 ErrorMessage World::load()
 {       
-  PRINTF(0)("> Loading world: '%s'\n", getPath());
-  
+  PRINTF(3)("> Loading world: '%s'\n", getPath());
+  TiXmlElement* element;
   GameLoader* loader = GameLoader::getInstance();
   
   if( getPath() == NULL)
     {
-      PRINTF0("World has no path specified for loading");
+      PRINTF(1)("World has no path specified for loading");
       return (ErrorMessage){213,"Path not specified","World::load()"};
     }
@@ -280 +280 @@
   TiXmlDocument* XMLDoc = new TiXmlDocument( path);
   // load the campaign document
-  if( !XMLDoc->LoadFile())
-    //this->glmis->step();
-  
+  if( !XMLDoc->LoadFile())  
   {
     // report an error
-    PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
+    PRINTF(1)("loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
     delete XMLDoc;
     return (ErrorMessage){213,"XML File parsing error","World::load()"};
@@ -297 +295 @@
     {
       // report an error
-      PRINTF0("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n");
+      PRINTF(1)("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n");
       delete XMLDoc;
       return (ErrorMessage){213,"Path not a WorldDataFile","World::load()"};
@@ -308 +306 @@
   if( string == NULL)
     {
-      PRINTF0("World is missing a proper 'name'\n");
+      PRINTF(2)("World is missing a proper 'name'\n");
       string = "Unknown";
       temp = new char[strlen(string + 2)];
@@ -320 +318 @@
       this->worldName = temp;
     }
-  
-  
+  ////////////////
+  // LOADSCREEN //
+  ////////////////
+  element = root->FirstChildElement("LoadScreen");
+  if (element == NULL)
+    {
+      PRINTF(2)("no LoadScreen specified, loading default\n");
+
+      glmis->setBackgroundImage("pictures/load_screen.jpg");
+      this->glmis->setMaximum(8);
+      this->glmis->draw();
+    }
+  else
+    {
+      this->glmis->load(element);
+      this->glmis->draw();
+    }
+  this->glmis->draw();
   // find WorldEntities
-  TiXmlElement* element = root->FirstChildElement( "WorldEntities");
+  element = root->FirstChildElement("WorldEntities");
   
   if( element == NULL)
     {
-      PRINTF0("World is missing 'WorldEntities'\n");
+      PRINTF(1)("World is missing 'WorldEntities'\n");
     }
   else
@@ -333 +347 @@
       element = element->FirstChildElement();
       // load Players/Objects/Whatever
-      PRINTF0("Loading WorldEntities\n");
+      PRINTF(4)("Loading WorldEntities\n");
       while( element != NULL)
         {
@@ -345 +359 @@
           glmis->step(); //! \todo temporary
         }
-      PRINTF0("Done loading WorldEntities\n");
+      PRINTF(4)("Done loading WorldEntities\n");
     }
   
@@ -831 +845 @@
   glmis->setBackgroundImage("pictures/load_screen.jpg");
   this->glmis->setMaximum(8);
-  this->glmis->draw();
+  //  this->glmis->draw();
  
   PRINTF(3)("World::displayLoadScreen - end\n");