Changeset 8010 in orxonox.OLD

Timestamp:

May 31, 2006, 2:03:21 AM (18 years ago)

Author:

bensch

Message:

gui: HOLY COW… The magical texture-viewer is here

Location:

branches/gui/src

Files:

• lib/gui/gl_gui/glgui_image.cc (modified) (3 diffs)
• lib/gui/gl_gui/glgui_text.h (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (1 diff)
• story_entities/simple_game_menu.h (modified) (2 diffs)

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

@@ -54 +54 @@
   void GLGuiImage::loadImageFromTexture(const Texture& texture)
   {
-    this->texture = texture;
+    this->frontMaterial().setDiffuseMap(texture);
+    this->frontMaterial().setDiffuse(1,1,1);
   }
 
@@ -74 +75 @@
   void GLGuiImage::resize()
   {
-    this->frontRect().setTopLeft(1, 1);
-    this->frontRect().setSize(this->getSizeX2D() -2, this->getSizeY2D() -2);
+    this->frontRect().setTopLeft(this->borderSize(), this->borderSize());
+    this->frontRect().setSize(this->getSizeX2D() -2.0*this->borderSize(), this->getSizeY2D() - 2.0* this->borderSize() );
     GLGuiWidget::resize();
   }
@@ -91 +92 @@
     this->drawRect(this->frontRect());
     this->endDraw();
-
-
   }
 }

branches/gui/src/lib/gui/gl_gui/glgui_text.h

@@ -26 +26 @@
     virtual ~GLGuiText();
 
+    void setText();
+
+    virtual void draw();
+
+  private:
     void init();
 
-    virtual void draw();
 
   private:

branches/gui/src/story_entities/simple_game_menu.cc

@@ -114 +114 @@
   box->showAll();
 
-  OrxGui::GLGuiImage* image = new OrxGui::GLGuiImage();
-  image->show();
-  image->loadImageFromFile( "death_screen.png" );
-  image->setWidgetSize(200, 200);
-  image->setAbsCoor2D(300, 300);
-
-  OrxGui::GLGuiSlider* slider = new OrxGui::GLGuiSlider();
-  slider->connect(SIGNAL(slider, valueChanged), box, SLOT(Element2D, setRelCoorX2D));
-  slider->setRange(100, 500);
-  slider->setStep(50);
-  slider->setValue(slider->min());
-  slider->show();
-  slider->setAbsCoor2D(100, 00);
+
+  OrxGui::GLGuiBox* imageSelector = new OrxGui::GLGuiBox();
+  {
+
+    image = new OrxGui::GLGuiImage();
+    image->show();
+    image->loadImageFromFile( "death_screen.png" );
+    image->setWidgetSize(200, 200);
+    image->setAbsCoor2D(300, 300);
+    imageSelector->pack(image);
+
+    imageName = new OrxGui::GLGuiInputLine();
+    imageSelector->pack(imageName);
+
+    OrxGui::GLGuiSlider* slider = new OrxGui::GLGuiSlider();
+    slider->connect(SIGNAL(slider, valueChanged), this, SLOT(SimpleGameMenu, setImage));
+
+    slider->setRange(0, 100);
+    slider->setStep(50);
+    slider->setValue(slider->min());
+    imageSelector->pack(slider);
+  }
+  imageSelector->showAll();
+  imageSelector->setAbsCoor2D(400, 30);
+
 
   /////
+}
+
+
+#include "class_list.h"
+void SimpleGameMenu::setImage(int i)
+{
+  const std::list<BaseObject*>* textures = ClassList::getList(CL_TEXTURE);
+
+  if(textures && textures->size() > i)
+  {
+    std::list<BaseObject*>::const_iterator test = textures->begin();
+    while (--i > 0)
+    {
+      test++;
+    }
+    this->image->loadImageFromTexture(*dynamic_cast<Texture*>(*test));
+    this->imageName->setText((*test)->getName());
+  }
 }
 

branches/gui/src/story_entities/simple_game_menu.h

@@ -16 +16 @@
 
 #include "elements/text_element.h"
+
+#include "glgui.h"
 
 class SimpleGameMenuData;
@@ -53 +55 @@
     void execURL() const;
     static int startURL(void* data);
+
+    void setImage(int i);
+    OrxGui::GLGuiImage* image;
+    OrxGui::GLGuiInputLine* imageName;
     ///
     virtual void loadParams(const TiXmlElement* root);