Changeset 8518 in orxonox.OLD

Timestamp:

Jun 16, 2006, 10:23:05 AM (18 years ago)

Author:

bensch

Message:

merged the gui back to the trunk

Location:

trunk

Files:

• scripts/tardis-scratch-checkout.pl (modified) (2 diffs)
• src/defs/class_id.h (modified) (1 diff)
• src/lib/graphics/graphics_engine.cc (modified) (1 diff)
• src/lib/graphics/graphics_engine.h (modified) (1 diff)
• src/lib/graphics/text_engine/text.cc (modified) (1 diff)
• src/lib/graphics/text_engine/text.h (modified) (1 diff)
• src/lib/gui/gl/Makefile.am (modified) (2 diffs)
• src/lib/gui/gl/glgui_inputline.cc (modified) (4 diffs)
• src/lib/gui/gl/glgui_inputline.h (modified) (3 diffs)
• src/lib/gui/gl/glgui_style.cc (modified) (12 diffs)
• src/lib/gui/gl/glgui_style.h (modified) (2 diffs)
• src/lib/gui/gl/glgui_widget.h (modified) (1 diff)
• src/lib/gui/gl/specials (copied) (copied from branches/gui/src/lib/gui/gl/specials)
• src/lib/gui/gl/specials/glgui_notifier.cc (copied) (copied from branches/gui/src/lib/gui/gl/specials/glgui_notifier.cc)
• src/lib/gui/gl/specials/glgui_notifier.h (copied) (copied from branches/gui/src/lib/gui/gl/specials/glgui_notifier.h)
• src/story_entities/simple_game_menu.cc (modified) (3 diffs)
• src/util/hud.cc (modified) (9 diffs)
• src/util/hud.h (modified) (3 diffs)

trunk/scripts/tardis-scratch-checkout.pl

@@ -24 +24 @@
   print("Checking out ORXONOX from '$URL' to '$destination'\n");
 
-
-  open(SVN_CO, "svn co $URL $destination |");
-  while(<SVN_CO>){
+  if (-e $destination)
+  {
+   open(SVN_UP, "svn up $destination |");
+   while(<SVN_UP>) {
    print $_;
+   }
   }
-  
+  else
+  {
+   open(SVN_CO, "svn co $URL $destination |");
+   while(<SVN_CO>){
+    print $_;
+   }
+  }
   chdir("$destination");
 
@@ -44 +52 @@
     printf $_;
   }
-  
+
   print ("Executing make with opts -j3\n");
   open(MAKE, "make -j3|");

trunk/src/defs/class_id.h

@@ -363 +363 @@
   CL_GLGUI_IMAGE                =    0x00000b70,
 
+  CL_GLGUI_NOTIFIER             =    0x00000b80,
+
   // QT_GUI
   CL_GUI_SAVEABLE               =    0x00b10000,

trunk/src/lib/graphics/graphics_engine.cc

@@ -405 +405 @@
   this->setResolution(this->resolutionX, this->resolutionY, this->bitsPerPixel);
 }
+
+void GraphicsEngine::toggleFullscreen()
+{
+  if (this->fullscreenFlag == SDL_FULLSCREEN)
+    this->fullscreenFlag = 0;
+  else
+    this->fullscreenFlag = SDL_FULLSCREEN;
+  this->setResolution(this->resolutionX, this->resolutionY, this->bitsPerPixel);
+}
+
 
 /**

trunk/src/lib/graphics/graphics_engine.h

@@ -44 +44 @@
     int setResolution(int width, int height, int bpp);
     void setFullscreen(bool fullscreen = false);
+    void toggleFullscreen();
     static void setBackgroundColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha = 1.0);
 

trunk/src/lib/graphics/text_engine/text.cc

@@ -159 +159 @@
 }
 
+
+/**
+ * @brief clears the Text Line (empies it).
+ */
+void Text::clear()
+{
+  text.clear();
+  this->setupTextWidth();
+}
 
 /**

trunk/src/lib/graphics/text_engine/text.h

@@ -40 +40 @@
     const std::string& operator<<(const std::string& appendText);
     void removeCharacters(unsigned int chars);
+    void clear();
 
     /// SETUP

trunk/src/lib/gui/gl/Makefile.am

@@ -29 +29 @@
                 glgui_image.cc \
                 glgui_window.cc \
-                glgui_cursor.cc
+                glgui_cursor.cc \
+                \
+                specials/glgui_notifier.cc
 
 
@@ -54 +56 @@
                 glgui_image.h \
                 glgui_window.h \
-                glgui_cursor.h
+                glgui_cursor.h \
+                \
+                specials/glgui_notifier.h
+
 
 

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

@@ -48 +48 @@
     this->setFocusable(true);
 
+    this->_clearOnEnter = false;
     this->_text.setParent2D(this);
     this->_text.setRelCoor2D(4,4);
@@ -100 +101 @@
   }
 
+  void GLGuiInputLine::clear()
+  {
+    this->_text.clear();
+    this->changedText();
+  }
+
   /**
    * @brief If the Text has been changed this function is called.
@@ -124 +131 @@
   }
 
+  /**
+   * @brief handles the EnterPush-Event.
+   *
+   * Emmits th EnterPushed Signal with the current Line,
+   * and if _clearOnEnter is pushed clears the Line.
+   */
+  void GLGuiInputLine::pushEnter()
+  {
+    emit(this->enterPushed(this->_text.getText()));
+    if (this->_clearOnEnter)
+      this->clear();
+  }
+
 
   /**
@@ -140 +160 @@
         this->pressedKeyName = SDLK_BACKSPACE;
         this->removeCharacters(1);
+        return true;
+      }
+      else if(event.type == SDLK_RETURN || event.type == SDLK_KP_ENTER)
+      {
+        this->pushEnter();
         return true;
       }

trunk/src/lib/gui/gl/glgui_inputline.h

@@ -38 +38 @@
     void appendCharacter(char character);
     void removeCharacters(unsigned int chars);
+    void clear();
+
+    void clearOnEnter(bool clear = true) { this->_clearOnEnter = clear; };
 
     virtual void removedFocus();
@@ -47 +50 @@
 
     DeclareSignal1(textChanged, const std::string&);
+    DeclareSignal1(enterPushed, const std::string&);
 
   protected:
@@ -57 +61 @@
   private:
     void init();
+    void pushEnter();
     void changedText();
+
 
   private:
     Text                    _text;            //!< The Text to display inside of the InputLine.
+    bool                    _clearOnEnter;    //!< Clear on Enter
 
     Uint16                  pressedKey;       //!< the pressed key that will be repeated.

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

@@ -29 +29 @@
   GLGuiStyle::GLGuiStyle (const TiXmlElement* root)
   {
+    _font = NULL;
+    this->reset();
+
+
     if (root != NULL)
       this->loadParams(root);
@@ -43 +47 @@
   }
 
+  void GLGuiStyle::reset()
+  {
+    this->setBorderLeft(1.0);
+    this->setBorderRight(1.0);
+    this->setBorderTop(1.0);
+    this->setBorderBottom(1.0);
+
+    this->setTextSize(20.0);
+    this->setBackgroundColor(1.0);
+    this->setForegroundColor(1.0);
+
+    this->setFeaturePosition(FeatureLeft);
+    this->setFont(NULL);
+
+    this->setAnimated(true);
+    this->setAnimatedStateChanges(true);
+  }
+
   void GLGuiStyle::loadParams(const TiXmlElement* root)
-  {
-  }
+  {}
 
   void GLGuiStyle::setBorderLeft(float value)
@@ -54 +75 @@
 
   void GLGuiStyle::setBorderLeft(float value, OrxGui::State state)
-{}
+  {
+    _style[state]._borderLeft = value;
+  }
 
   void GLGuiStyle::setBorderLeftS(float value, const std::string& state)
-  {}
+  {
+  }
 
 
@@ -67 +91 @@
 
   void GLGuiStyle::setBorderRight(float value, OrxGui::State state)
-{}
+  {
+    _style[state]._borderRight = value;
+  }
 
   void GLGuiStyle::setBorderRightS(float value, const std::string& state)
@@ -80 +106 @@
 
   void GLGuiStyle::setBorderTop(float value, OrxGui::State state)
-{}
+  {
+    _style[state]._borderTop = value;
+  }
 
   void GLGuiStyle::setBorderTopS(float value, const std::string& state)
@@ -93 +121 @@
 
   void GLGuiStyle::setBorderBottom(float value, OrxGui::State state)
-{}
+  {
+    _style[state]._borderBottom = value;
+  }
 
   void GLGuiStyle::setBorderBottomS(float value, const std::string& state)
@@ -106 +136 @@
 
   void GLGuiStyle::setTextSize(float value, OrxGui::State state)
-{}
+  {
+    _style[state]._textSize = value;
+  }
 
   void GLGuiStyle::setTextSizeS(float value, const std::string& state)
@@ -119 +151 @@
 
   void GLGuiStyle::setBackgroundColor(const Color& color, OrxGui::State state)
-{}
+  {
+    _style[state]._backgroundColor = color;
+  }
 
   void GLGuiStyle::setBackgroundColorS(float r, float g, float b, float a, const std::string& state)
@@ -132 +166 @@
 
   void GLGuiStyle::setBackgroundTexture(const Texture& texture, OrxGui::State state)
-{}
+  {
+    _style[state]._backgroundTexture = texture;
+  }
 
   void GLGuiStyle::setBackgroundTexture(const std::string& textureName, const std::string& state)
@@ -145 +181 @@
 
   void GLGuiStyle::setForegroundColor(const Color& color, OrxGui::State state)
-  {}
+  {
+    _style[state]._foregroundColor = color;
+  }
 
   void GLGuiStyle::setForegroundColorS(float r, float g, float b, float a, const std::string& state)
@@ -158 +196 @@
 
   void GLGuiStyle::setFeaturePosition(const std::string& featurePosition)
-  {
-
-  }
+  {}
 
 
@@ -179 +215 @@
   }
 
-  void GLGuiStyle::animatedStateChanges(bool animated)
+  void GLGuiStyle::setAnimatedStateChanges(bool animated)
   {
     this->_animatedStateChanges = animated;

trunk/src/lib/gui/gl/glgui_style.h

@@ -43 +43 @@
 
     /// SETUP
+    void reset();
     void loadParams(const TiXmlElement* root);
 
@@ -85 +86 @@
 
     void setAnimated(bool animated);
-    void animatedStateChanges(bool animated);
+    void setAnimatedStateChanges(bool animated);
 
   private:

trunk/src/lib/gui/gl/glgui_widget.h

@@ -66 +66 @@
     void disconnect(GLGuiWidget* sender, Signal& signal, BaseObject* receiver);
 
+
+    GLGuiStyle& style() { return this->_style; };
+    const GLGuiStyle style() const { return this->_style; };
 
     /// MATERIAL (looks)

trunk/src/story_entities/simple_game_menu.cc

@@ -42 +42 @@
 
 #include "glgui.h"
+#include "gui/gl/specials/glgui_notifier.h"
 
 //! This creates a Factory to fabricate a SimpleGameMenu
@@ -88 +89 @@
 {
 
+  OrxGui::GLGuiNotifier* notifier = new OrxGui::GLGuiNotifier();
+  notifier->show();
+  notifier->setAbsCoor2D(300, 300);
+
+
+
   OrxGui::GLGuiBox* box = new OrxGui::GLGuiBox();
   {
@@ -100 +107 @@
     box->pack(rdnpb);
 
+    OrxGui::GLGuiCheckButton* fullscreen = new OrxGui::GLGuiCheckButton("Fullscreen");
+    fullscreen->connect(SIGNAL(fullscreen, toggled), GraphicsEngine::getInstance(), SLOT(GraphicsEngine, setFullscreen));
+
+    box->pack(fullscreen);
+
     OrxGui::GLGuiInputLine* input = new OrxGui::GLGuiInputLine();
     input->setText("input some text here");
-    input->connect(SIGNAL(input, textChanged), this, SLOT(SimpleGameMenu, TEST));
+    input->connect(SIGNAL(input, textChanged), notifier, SLOT(OrxGui::GLGuiNotifier, pushNotifyMessage));
+
     box->pack(input);
 

trunk/src/util/hud.cc

@@ -23 +23 @@
 #include "glgui_widget.h"
 
+#include "glgui_inputline.h"
+#include "specials/glgui_notifier.h"
+
 /**
  * standard constructor
@@ -39 +42 @@
   this->resY = 1;
 
+  this->inputLine = new OrxGui::GLGuiInputLine();
+  this->inputLine->setParent2D(this);
+  this->notifier = new OrxGui::GLGuiNotifier();
+  this->notifier->setParent2D(this);
+  notifier->setAbsCoor2D(100,100);
+
+
+
 }
 
@@ -47 +58 @@
 Hud::~Hud ()
 {
+  delete this->inputLine;
+  delete this->notifier;
   // delete what has to be deleted here
 }
@@ -56 +69 @@
 }
 
+void Hud::notifyUser(const std::string& message)
+{
+  this->notifier->pushNotifyMessage(message);
+}
+
 void Hud::setBackGround()
-{
-}
+{}
 
 void Hud::setEnergyWidget(OrxGui::GLGuiWidget* widget)
@@ -74 +91 @@
     this->energyWidget->backMaterial().setDiffuseMap("hud_energy_background.png");
     this->energyWidget->backMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-/*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
-    this->energyWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
+    /*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
+        this->energyWidget->frontMaterial().setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/
   }
 
@@ -82 +99 @@
 
 void Hud::setShiledWidget(OrxGui::GLGuiWidget* widget)
-{
-}
+{}
 
 void Hud::setArmorWidget(OrxGui::GLGuiWidget* widget)
-{
-}
+{}
 
 void Hud::setWeaponManager(WeaponManager* weaponMan)
@@ -123 +138 @@
   if (this->weaponManager != NULL)
     for (unsigned int i = 0; i < this->weaponManager->getSlotCount(); i++)
-  {
-    Weapon* weapon = this->weaponManager->getWeapon(i);
-    if (weapon != NULL)
     {
-      weapon->getEnergyWidget()->show();
-      weapon->getEnergyWidget()->backMaterial().setDiffuse( .8,.2,.11);
-      weapon->getEnergyWidget()->backMaterial().setTransparency(.1);
-      weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6));
-//      weapon->getEnergyWidget()->frontMaterial().setTransparency(.6);
-      this->weaponsWidgets.push_back(weapon->getEnergyWidget());
+      Weapon* weapon = this->weaponManager->getWeapon(i);
+      if (weapon != NULL)
+      {
+        weapon->getEnergyWidget()->show();
+        weapon->getEnergyWidget()->backMaterial().setDiffuse( .8,.2,.11);
+        weapon->getEnergyWidget()->backMaterial().setTransparency(.1);
+        weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6));
+        //      weapon->getEnergyWidget()->frontMaterial().setTransparency(.6);
+        this->weaponsWidgets.push_back(weapon->getEnergyWidget());
+      }
     }
-  }
   this->updateResolution();
 }
 
 void Hud::addWeaponWidget(OrxGui::GLGuiWidget* widget)
-{
-}
+{}
 
 void Hud::removeWeaponWidget(OrxGui::GLGuiWidget* widget)
-{
-}
+{}
 
 void Hud::updateResolution()
@@ -162 +175 @@
   for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++, pos+=.03)
   {
-      (*weaponWidget)->setSize2D(.02*this->resX, .2 *this->resY);
-      (*weaponWidget)->setAbsCoor2D(pos*this->resX, .75*this->resY);
+    (*weaponWidget)->setSize2D(.02*this->resX, .2 *this->resY);
+    (*weaponWidget)->setAbsCoor2D(pos*this->resX, .75*this->resY);
 
   }
@@ -171 +184 @@
 void Hud::tick(float dt)
 {
-  if (this->resY != State::getResY() || this->resX != State::getResY())
+  if (this->resY != State::getResY() || this->resX != State::getResX())
+  {
     this->updateResolution();
+  }
+
 }
 
 void Hud::draw() const
 {
-//  GLGuiWidget::draw();
+  //  GLGuiWidget::draw();
 }
 

trunk/src/util/hud.h

@@ -10 +10 @@
 // FORWARD DECLARATION
 class TiXmlElement;
+
 class WeaponManager;
-namespace OrxGui { class GLGuiWidget; }
+namespace OrxGui {
+  class GLGuiWidget;
+  class GLGuiNotifier;
+  class GLGuiInputLine;
+
+}
 
 //! A class that renders a HUD.
@@ -23 +29 @@
 
   virtual void loadParams(const TiXmlElement* root);
+
+  void notifyUser(const std::string& message);
+
 
   void setBackGround();
@@ -49 +58 @@
   OrxGui::GLGuiWidget*     armorWidget;
 
+  OrxGui::GLGuiNotifier*   notifier;
+  OrxGui::GLGuiInputLine*  inputLine;
+
   WeaponManager*           weaponManager;