Changeset 8596 in orxonox.OLD for branches

Timestamp:

Jun 20, 2006, 12:48:50 AM (18 years ago)

Author:

bensch

Message:

init

Location:

branches/gui/src/lib

Files:

• graphics/importer/material.cc (modified) (1 diff)
• gui/gl/glgui_cursor.cc (modified) (2 diffs)
• gui/gl/glgui_widget.cc (modified) (1 diff)

branches/gui/src/lib/graphics/importer/material.cc

@@ -52 +52 @@
 Material& Material::operator=(const Material& material)
 {
-  this->setIllum(material.illumModel);
-  this->setDiffuseColor(material.diffuseColor());
+  this->illumModel = material.illumModel;
+  this->diffuse = material.diffuse;
   this->specular = material.specular;
   this->ambient = material.ambient;
-  this->setShininess(material.shininess);
+  this->shininess = material.shininess;
 
   this->textures = material.textures;

branches/gui/src/lib/gui/gl/glgui_cursor.cc

@@ -57 +57 @@
     this->setClassID(CL_GLGUI_CURSOR, "GLGuiCursor");
 
-    this->style().background().setDiffuse(1.0,0.0,0.0);
+    this->style().background().setDiffuseColor(Color(1.0,0.0,0.0, 1.0));
     this->style().background().setDiffuseMap("cursor.png");
     this->style().background().setBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -80 +80 @@
   bool GLGuiCursor::loadTextureSequence(const std::string& imageNameSubstitue, unsigned int from, unsigned int to)
   {
-    this->style().background().setDiffuse(1.0, 1.0, 1.0);
+    //this->style().background().setDiffuse(1.0, 1.0, 1.0);
     return this->seq.loadImageSeries(imageNameSubstitue, from, to);
   }

branches/gui/src/lib/gui/gl/glgui_widget.cc

@@ -79 +79 @@
 
     this->style().setBackgroundTexture("gui_element_background.png");
+    this->style().switchState(OrxGui::Normal);
   }