Changeset 7883 in orxonox.OLD

Timestamp:

May 27, 2006, 1:57:33 AM (18 years ago)

Author:

bensch

Message:

gui: click and release work (internally)

Location:

branches/gui/src

Files:

• lib/graphics/importer/material.cc (modified) (4 diffs)
• lib/gui/gl_gui/glgui_button.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_button.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_handler.cc (modified) (2 diffs)
• lib/gui/gl_gui/glgui_pushbutton.cc (modified) (4 diffs)
• lib/gui/gl_gui/glgui_pushbutton.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_widget.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_widget.h (modified) (2 diffs)
• story_entities/simple_game_menu.cc (modified) (1 diff)

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

@@ -108 +108 @@
       return true;
 
-
-  // setting diffuse color
+  if (likely(Material::selectedMaterial != NULL))
+  {
+    for(unsigned int i = 0; i < Material::selectedMaterial->textures.size(); ++i)
+    {
+        glActiveTexture(Material::glTextureArbs[i]);
+        //glBindTexture(GL_TEXTURE_2D, 0);
+        glDisable(GL_TEXTURE_2D);
+    }
+  }
+
+    // setting diffuse color
   glColor4f (diffuse[0], diffuse[1], diffuse[2], this->transparency);
   // setting ambient color
@@ -118 +127 @@
   glMaterialf(GL_FRONT, GL_SHININESS, this->shininess);
 
-
   // setting the transparency
   if (this->transparency < 1.0 ||       /* This allows alpha blending of 2D textures with the scene */
@@ -138 +146 @@
     glShadeModel(GL_SMOOTH);
 
-  if (likely(Material::selectedMaterial != NULL))
-  {
-    for(unsigned int i = 0; i < Material::selectedMaterial->textures.size(); ++i)
-    {
-        glActiveTexture(Material::glTextureArbs[i]);
-        glBindTexture(GL_TEXTURE_2D, 0);
-        glDisable(GL_TEXTURE_2D);
-    }
-  }
 
   for(unsigned int i = 0; i < this->textures.size(); ++i)
@@ -159 +158 @@
   }
   Material::selectedMaterial = this;
-
-  /*  if (this->diffuseTexture != NULL)
-      {
-        glEnable(GL_TEXTURE_2D);
-        glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
-      }
-    else
-      {
-        glDisable(GL_TEXTURE_2D);
-        glBindTexture(GL_TEXTURE_2D, 0);
-      }*/
 }
 

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

@@ -54 +54 @@
     this->setClickable(true);
 
+    this->label.setFont("fonts/final_frontier.ttf", 20);
+    this->frontMaterial().setDiffuse(1, 0, 0);
+
     this->label.setParent2D(this);
   }
+
 
   void GLGuiButton::setLabel(const std::string& label)

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

@@ -27 +27 @@
   //! This is part of the openglGUI class
   /**
-   *
+   * The Button is an Abstract class, that can be pushed to Toggle its state.
    */
   class GLGuiButton : public GLGuiWidget

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

@@ -38 +38 @@
 
     this->cursor = NULL;
-    //this->subscribeEvent()
+    for (unsigned int i = 0; i < EV_NUMBER; i++)
+    {
+      this->subscribeEvent(ES_MENU, i);
+    }
 
   }
@@ -86 +89 @@
   void GLGuiHandler::process(const Event &event)
   {
+    if (event.type == EV_MOUSE_BUTTON_LEFT)
+    {
 
+      if (GLGuiWidget::focused() != NULL)
+      {
+        if (event.bPressed)
+          GLGuiWidget::focused()->click();
+        else
+          GLGuiWidget::focused()->release();
+      }
+    }
 
   }

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

@@ -54 +54 @@
     printf("%s received focus\n", this->getLabel().c_str());
 
+    Vector test;
+    this->frontMaterial().getDiffuseColor(test.x, test.y, test.z);
+    test.debug();
   }
   void GLGuiPushButton::removedFocus()
@@ -61 +64 @@
   }
 
+  void GLGuiPushButton::clicked()
+  {
+    printf("%s clicked\n", this->getLabel().c_str());
+  }
+
+
+  void GLGuiPushButton::released()
+  {
+    printf("%s released\n", this->getLabel().c_str());
+  }
 
 
@@ -72 +85 @@
     GLGuiButton::draw();
 
-    this->frontMat.select();
+    this->frontMaterial().select();
     glBegin(GL_QUADS);
 
@@ -81 +94 @@
 
     glEnd();
-
     this->endDraw();
     //   this->label->draw();

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

@@ -29 +29 @@
     virtual void receivedFocus();
     virtual void removedFocus();
+    virtual void clicked();
+    virtual void released();
+
+
     virtual void draw() const;
     virtual void update();

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

@@ -60 +60 @@
 
     this->backMat.setDiffuse(1.0, 1.0, 1.0);
+    this->frontMat.setDiffuse(1.0, 0.0, 0.0);
 
     this->frontModel = 0;
+    this->backModel = 0;
 
     this->widgetSignals.resize(SignalCount, SignalConnector());

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

@@ -79 +79 @@
     bool clickable() const { return this->_clickable; };
     void setClickable(bool clickable = true) { this->_clickable = clickable; };
-
+    void click() { this->clicked(); };
+    void release() { this->released(); };
 
     virtual void update() {};
@@ -98 +99 @@
   protected:
         // if something was clickt on the GUI-widget.
-    virtual void clicked(const Event& event) {};
-    virtual void released(const Event& event) {};
+    virtual void clicked() {};
+    virtual void released() {};
 
     virtual void receivedFocus() {};

branches/gui/src/story_entities/simple_game_menu.cc

@@ -66 +66 @@
   pb->show();
   pb->setAbsCoor2D(50, 50);
+
+  OrxGui::GLGuiPushButton* dnpb = new OrxGui::GLGuiPushButton("DO NOT PUSH ME");
+  dnpb->show();
+  dnpb->setAbsCoor2D(350, 50);
+
+  OrxGui::GLGuiPushButton* rdnpb = new OrxGui::GLGuiPushButton("REALLY DO NOT PUSH ME!!");
+  rdnpb->show();
+  rdnpb->setAbsCoor2D(200, 180);
+
 
   OrxGui::GLGuiHandler::getInstance()->activateCursor();