Changeset 8324 in orxonox.OLD for trunk/src/lib/gui/gl/glgui_cursor.cc

Timestamp:

Jun 12, 2006, 12:40:57 AM (18 years ago)

Author:

bensch

Message:

trunk: Texture-Sequence is initialized smoothly now in the GLGuiCursor

File:

• trunk/src/lib/gui/gl/glgui_cursor.cc (modified) (4 diffs)

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

@@ -20 +20 @@
 #include "glgui_handler.h"
 #include "color.h"
-#include "texture_sequence.h"
-#include "loading/resource_manager.h" // HACK
 
 namespace OrxGui
@@ -67 +65 @@
     this->color = 0.0f;
 
-    this->seq = new TextureSequence();
-    this->seq->loadImageSeries(ResourceManager::getInstance()->getDataDir() + "/maps/reap_mouse/reap_mouse_##.tif", 0, 49);
+    this->resize();
+  }
 
-    this->resize();
+  /**
+   * @brief Loads an Image-Series onto the Cursor.
+   * @param imageNameSubstitue The Prefix of the Image
+   * @param from From which image
+   * @param to To which image
+   * @return true on success.
+   *
+   * @see TextureSequence:: loadTextureSequence(const std::string& imageNameSubstitue, unsigned int from, unsigned int to)
+   */
+  bool GLGuiCursor::loadTextureSequence(const std::string& imageNameSubstitue, unsigned int from, unsigned int to)
+  {
+    this->backMaterial().setDiffuse(1.0, 1.0, 1.0);
+    return this->seq.loadImageSeries(imageNameSubstitue, from, to);
   }
 
   void GLGuiCursor::tick(float dt)
   {
-    this->frameNumber += 25.0*dt;
-    if (frameNumber >= this->seq->getFrameCount())
-      frameNumber = 0.0;
-
-    this->color += dt*10.0;
-    if (this->color > 360.0)
-      this->color -= 360.0;
-    Vector color =  Color::HSVtoRGB(Vector(this->color, 1.0, 1.0));
-    this->backMaterial().setDiffuse(color.x, color.y, color.z);
-
+    if (!this->seq.empty())
+    {
+      this->frameNumber += 25.0*dt;
+      if (frameNumber >= this->seq.getFrameCount())
+        frameNumber = 0.0;
+    }
+    else
+    {
+      this->color += dt*10.0;
+      if (this->color > 360.0)
+        this->color -= 360.0;
+      Vector color =  Color::HSVtoRGB(Vector(this->color, 1.0, 1.0));
+      this->backMaterial().setDiffuse(color.x, color.y, color.z);
+    }
     //if (this->movement != Vector2D())
     {
@@ -110 +124 @@
   {
     this->beginDraw();
-    // HACK
-    glActiveTexture(GL_TEXTURE0);
-    glEnable(GL_TEXTURE_2D);
-    glBindTexture(GL_TEXTURE_2D, this->seq->getFrameTexture((int)frameNumber));
-    glColor3f(1,1,1);
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+    this->backMaterial().select();
+    if (!this->seq.empty())
+      glBindTexture(GL_TEXTURE_2D, this->seq.getFrameTexture((int)frameNumber));
     this->drawRect(this->backRect());
 
@@ -123 +134 @@
   }
 
+  /**
+   * @brief processes Events from the EventHandler.
+   * @param event the Event to process.
+   */
   void GLGuiCursor::process(const Event& event)
   {