Changeset 8422 in orxonox.OLD

Timestamp:

Jun 14, 2006, 11:45:02 PM (18 years ago)

Author:

bensch

Message:

orxonox/gui: Coloring sceme adapted to image

Location:

branches/gui/src/lib

Files:

• graphics/importer/material.h (modified) (1 diff)
• gui/gl/glgui_image.cc (modified) (4 diffs)
• gui/gl/glgui_image.h (modified) (1 diff)

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

@@ -38 +38 @@
 
     void setDiffuse (float r, float g, float b);
+    void setDiffuseColor(const Color& diffuseColor) { this->diffuse = diffuseColor; };
     void setAmbient (float r, float g, float b);
     void setSpecular (float r, float g, float b);

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

@@ -17 +17 @@
 
 #include "glgui_image.h"
+
+#include "debug.h"
 
 namespace OrxGui
@@ -45 +47 @@
     this->setClassID(CL_GLGUI_IMAGE, "GLGuiImage");
 
-//     this->frontMaterial().setDiffuseMap(this->texture);
-//     this->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    this->_imageMaterial.setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
     this->resize();
@@ -54 +55 @@
   void GLGuiImage::loadImageFromTexture(const Texture& texture)
   {
-/*    this->frontMaterial().setDiffuseMap(texture);
-    this->frontMaterial().setDiffuse(1,1,1);*/
+    this->_imageMaterial.setDiffuseMap(texture);
   }
 
   void GLGuiImage::loadImageFromFile(const std::string& fileName)
   {
-    this->texture.loadImage(fileName);
+    this->_imageMaterial.setDiffuseMap(fileName);
   }
 
   void GLGuiImage::loadImageFromSDLSurface(SDL_Surface* surface)
   {
-    //this->texture.loadSurface(surface);
+    this->_imageMaterial.setDiffuseMap(Texture(surface));
   }
 
   void GLGuiImage::loadImageFromDisplayList(GLuint texture)
   {
-//    this->texture.setTexture(texture);
+    PRINTF(2)("SORRY NOT IMPLEMENTED\n");
+//    this->_imageMaterial.setTexture(texture);
+  }
+
+  void GLGuiImage::updateFrontColor()
+  {
+    this->_imageMaterial.setDiffuseColor(this->frontColor());
   }
 
   void GLGuiImage::resize()
   {
-/*    this->frontRect().setTopLeft(this->borderLeft(), this->borderTop());
-    this->frontRect().setSize(this->getSizeX2D() - (borderLeft() + borderRight()), this->getSizeY2D() - (borderTop() + borderBottom()) );*/
+    this->_imagePlane.setTopLeft(this->borderLeft(), this->borderTop());
+    this->_imagePlane.setSize(this->getSizeX2D() - (borderLeft() + borderRight()), this->getSizeY2D() - (borderTop() + borderBottom()) );
     GLGuiWidget::resize();
   }
@@ -89 +95 @@
     GLGuiWidget::draw();
 
-/*    this->frontMaterial().select();*/
-/*    this->drawRect(this->frontRect());*/
+    this->_imageMaterial.select();
+    this->drawRect(this->_imagePlane);
     this->endDraw();
   }

branches/gui/src/lib/gui/gl/glgui_image.h

@@ -36 +36 @@
     DeclareSignal0(imageChanged);
 
+  protected:
+    virtual void updateFrontColor();
+    virtual void resize();
+
+
   private:
     void init();
-    virtual void resize();
 
   private:
-    Texture       texture;
+    Rect2D        _imagePlane;
+    Material      _imageMaterial;
   };
 }