Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8596 in orxonox.OLD for branches


Ignore:
Timestamp:
Jun 20, 2006, 12:48:50 AM (18 years ago)
Author:
bensch
Message:

init

Location:
branches/gui/src/lib
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/gui/src/lib/graphics/importer/material.cc

    r8583 r8596  
    5252Material& Material::operator=(const Material& material)
    5353{
    54   this->setIllum(material.illumModel);
    55   this->setDiffuseColor(material.diffuseColor());
     54  this->illumModel = material.illumModel;
     55  this->diffuse = material.diffuse;
    5656  this->specular = material.specular;
    5757  this->ambient = material.ambient;
    58   this->setShininess(material.shininess);
     58  this->shininess = material.shininess;
    5959
    6060  this->textures = material.textures;
  • branches/gui/src/lib/gui/gl/glgui_cursor.cc

    r8584 r8596  
    5757    this->setClassID(CL_GLGUI_CURSOR, "GLGuiCursor");
    5858
    59     this->style().background().setDiffuse(1.0,0.0,0.0);
     59    this->style().background().setDiffuseColor(Color(1.0,0.0,0.0, 1.0));
    6060    this->style().background().setDiffuseMap("cursor.png");
    6161    this->style().background().setBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     
    8080  bool GLGuiCursor::loadTextureSequence(const std::string& imageNameSubstitue, unsigned int from, unsigned int to)
    8181  {
    82     this->style().background().setDiffuse(1.0, 1.0, 1.0);
     82    //this->style().background().setDiffuse(1.0, 1.0, 1.0);
    8383    return this->seq.loadImageSeries(imageNameSubstitue, from, to);
    8484  }
  • branches/gui/src/lib/gui/gl/glgui_widget.cc

    r8594 r8596  
    7979
    8080    this->style().setBackgroundTexture("gui_element_background.png");
     81    this->style().switchState(OrxGui::Normal);
    8182  }
    8283
Note: See TracChangeset for help on using the changeset viewer.