Changeset 3394 in orxonox.OLD

Timestamp:

Feb 3, 2005, 2:01:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now the loadscreen uses material instead of Textures.

Location:

orxonox/trunk/src

Files:

• glmenu_imagescreen.cc (modified) (5 diffs)
• glmenu_imagescreen.h (modified) (2 diffs)

orxonox/trunk/src/glmenu_imagescreen.cc

@@ -19 +19 @@
 #include "glmenu_imagescreen.h"
 #include "importer/texture.h"
+#include "importer/material.h"
 
 using namespace std;
@@ -47 +48 @@
    \todo this deconstructor is not jet implemented - do it
 */
-GLMenuImageScreen::~GLMenuImageScreen () {}
+GLMenuImageScreen::~GLMenuImageScreen() 
+{
+  if (backMat)
+    delete backMat;
+}
 
 
@@ -66 +71 @@
   glMatrixMode(GL_MODELVIEW); 
 
-  this->backTex = new Texture();
-  this->backTex->loadImage("orx_tex.bmp");
-
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glLoadIdentity();
@@ -79 +81 @@
   
   // Select Our VU Meter Background Texture
-  this->backTex = new Texture();
-  this->backTex->loadImage("../data/pictures/load_screen.jpg");
-
+  this->backMat = new Material("load_screen");
+  this->backMat->setDiffuseMap("../data/pictures/load_screen.jpg");
   this->maxValue = 10;
   this->currentValue = 0;
@@ -170 +171 @@
   glDisable(GL_LIGHTING);
 
+  backMat->select();
   glBegin(GL_QUADS);
   glColor3f(0.96, 0.84, 0.34);

orxonox/trunk/src/glmenu_imagescreen.h

@@ -11 +11 @@
 
 class Texture;
+class Material;
 
 class GLMenuImageScreen : public BaseObject {
@@ -39 +40 @@
 
  private:
-  char* backImageName;       //! the name of the file of the background image
-  float height, width;       //! hight and width of the image
-  float offsetX, offsetY;    //! offset of the image from left and up
-  Texture* backTex;          //! background texture
-  int currentValue;          //! the current count of step() calls fired yet
-  int maxValue;               //! total count of steps
+  char* backImageName;       //!< the name of the file of the background image
+  float height, width;       //!< hight and width of the image
+  float offsetX, offsetY;    //!< offset of the image from left and up
+  Material* backMat;         //!< Background Material.
+  int currentValue;          //!< the current count of step() calls fired yet
+  int maxValue;              //!< total count of steps
 
 };