Changeset 8011 in orxonox.OLD

Timestamp:

May 31, 2006, 2:12:33 AM (18 years ago)

Author:

bensch

Message:

gui: nicer, better ImageViewer

File:

• branches/gui/src/story_entities/simple_game_menu.cc (modified) (3 diffs)

branches/gui/src/story_entities/simple_game_menu.cc

@@ -119 +119 @@
 
     image = new OrxGui::GLGuiImage();
-    image->show();
-    image->loadImageFromFile( "death_screen.png" );
     image->setWidgetSize(200, 200);
     image->setAbsCoor2D(300, 300);
@@ -130 +128 @@
     OrxGui::GLGuiSlider* slider = new OrxGui::GLGuiSlider();
     slider->connect(SIGNAL(slider, valueChanged), this, SLOT(SimpleGameMenu, setImage));
-
+    slider->setWidgetSize(200, 30);
     slider->setRange(0, 100);
-    slider->setStep(50);
+    slider->setStep(1);
     slider->setValue(slider->min());
     imageSelector->pack(slider);
@@ -149 +147 @@
   const std::list<BaseObject*>* textures = ClassList::getList(CL_TEXTURE);
 
-  if(textures && textures->size() > i)
+  if(textures)
   {
     std::list<BaseObject*>::const_iterator test = textures->begin();
-    while (--i > 0)
-    {
+    std::list<BaseObject*>::const_iterator lastOK = textures->begin();
+    while (true)
+    {
+      if (--i == 0 || test == textures->end())
+        break;
+      if (dynamic_cast<Texture*>(*test)->getTexture() != 0)
+        lastOK = test;
       test++;
     }
-    this->image->loadImageFromTexture(*dynamic_cast<Texture*>(*test));
-    this->imageName->setText((*test)->getName());
+    this->image->loadImageFromTexture(*dynamic_cast<Texture*>(*lastOK));
+    this->imageName->setText((*lastOK)->getName());
   }
 }