Changeset 10374 in orxonox.OLD for trunk/src

Timestamp:

Jan 25, 2007, 11:27:47 PM (18 years ago)

Author:

patrick

Message:

merged branche gui

Location:

trunk/src

Files:

• lib/gui/gl/Makefile.am (modified) (2 diffs)
• lib/gui/gl/glgui_multiline_text.cc (copied) (copied from branches/gui/src/lib/gui/gl/glgui_multiline_text.cc)
• lib/gui/gl/glgui_multiline_text.h (copied) (copied from branches/gui/src/lib/gui/gl/glgui_multiline_text.h)
• lib/gui/gl/glgui_text.cc (modified) (1 diff)
• lib/gui/gl/glgui_widget.cc (modified) (4 diffs)
• lib/gui/gl/glgui_widget.h (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (2 diffs)
• world_entities/questGUI (copied) (copied from branches/gui/src/world_entities/questGUI)
• world_entities/questGUI/quest.cc (copied) (copied from branches/gui/src/world_entities/questGUI/quest.cc)
• world_entities/questGUI/quest.h (copied) (copied from branches/gui/src/world_entities/questGUI/quest.h)
• world_entities/questGUI/quest_gui.cc (copied) (copied from branches/gui/src/world_entities/questGUI/quest_gui.cc)
• world_entities/questGUI/quest_gui.h (copied) (copied from branches/gui/src/world_entities/questGUI/quest_gui.h)
• world_entities/script_trigger.cc (modified) (3 diffs)

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

@@ -25 +25 @@
                 glgui_frame.cc \
                 glgui_text.cc \
+                glgui_multiline_text.cc \
                 glgui_inputline.cc \
                 glgui_textfield.cc \
@@ -53 +54 @@
                 glgui_frame.h \
                 glgui_text.h \
+                glgui_multiline_text.h \
                 glgui_inputline.h \
                 glgui_textfield.h \

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

@@ -50 +50 @@
     this->_text.setFont("fonts/final_frontier.ttf", 20);
     this->_text.setLineWidth(400);
-    this->_text.setDotsPosition(LimitedWidthText::Begin);
+//     this->_text.setDotsPosition(LimitedWidthText::Begin);
     this->_text.setColor(foregroundColor());
     this->_text.setVisibility(false);

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

@@ -112 +112 @@
 
 
-    this->setBackgroundColor(Color(.51, .3, .3, .5));
-    this->setBackgroundColor(Color(.3, .5, .3, 1), OrxGui::Selected);
-    this->_style[0]._background.setBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    this->_style[1]._background.setBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    this->_style[2]._background.setBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    this->_style[3]._background.setBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    this->setBackgroundColor(Color(0, 0, 0, 0));
+    this->setBackgroundColor(Color(0, 0, 0, 0), OrxGui::Selected);
+
+
+    this->_style[0]._background.setBlendFunc( GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+    this->_style[1]._background.setBlendFunc( GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+    this->_style[2]._background.setBlendFunc( GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+    this->_style[3]._background.setBlendFunc( GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
 
     this->setForegroundColor(Color(.8, .8, 1, 1), OrxGui::Normal);
@@ -563 +565 @@
   }
 
+  
+  
+  
+  
+  
   /**
   * @brief sets the Background Texture to all States.
@@ -569 +576 @@
   void GLGuiWidget::setBackgroundTexture(const std::string& textureName)
   {
-    for (unsigned int i = 0; i < GLGUI_STATE_COUNT; ++i)
+    for (unsigned int i = 0; i < GLGUI_STATE_COUNT; ++i) {
       _style[i]._background.setDiffuseMap(textureName);
+      _style[i]._background.setDiffuseColor(Color(1.0, 1.0, 1.0, 1.0));
+    }
     this->_currentStyle._background.setDiffuseMap(textureName);
-  }
-
+    this->_currentStyle._background.setDiffuseColor(Color(1.0, 1.0, 1.0, 1.0));
+  }
+
+  void GLGuiWidget::setBackgroundTexture(const std::string& textureName, OrxGui::State state)
+  {
+    _style[state]._background.setDiffuseMap(textureName);
+    _style[state]._background.setDiffuseColor(Color(1.0, 1.0, 1.0, 1.0));
+
+    if (state == _state) {
+      _currentStyle._background.setDiffuseMap(textureName);
+      _currentStyle._background.setDiffuseColor(Color(1.0, 1.0, 1.0, 1.0));
+    }
+  }
+  
+  
+  
+  
   /**
    * @brief sets the Background Texture.
@@ -582 +606 @@
   {
     _style[state]._background.setDiffuseMap(texture);
-    if (state == _state)
+    _style[state]._background.setDiffuseColor(Color(1.0, 1.0, 1.0, 1.0));
+
+    if (state == _state) {
       _currentStyle._background.setDiffuseMap(texture);
+      _currentStyle._background.setDiffuseColor(Color(1.0, 1.0, 1.0, 1.0));
+    }
   }
 

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

@@ -181 +181 @@
     void setBackgroundTexture(const std::string& textureName);
     void setBackgroundTexture(const Texture& texture, OrxGui::State state);
+    void setBackgroundTexture(const std::string& textureName, OrxGui::State state);
     void setBackgroundTexture(const std::string& textureName, const std::string& stateName);
 

trunk/src/world_entities/WorldEntities.am

@@ -28 +28 @@
                 world_entities/mount_point.cc \
                 world_entities/sound_entity.cc \
+                \
+                world_entities/questGUI/quest_gui.cc \
+                world_entities/questGUI/quest.cc \
                 \
                 world_entities/weapons/test_gun.cc \
@@ -153 +156 @@
                 sound_entity.h \
                 \
+                questGUI/quest_gui.h \
+                questGUI/quest.h \
+                \
                 weapons/test_gun.h \
                 weapons/laser_cannon.cc \

trunk/src/world_entities/script_trigger.cc

@@ -181 +181 @@
    }
 
-  if(triggerRemains && scriptCalled)
+ if(triggerRemains && scriptCalled)
   {
     executeAction(timestep);
@@ -190 +190 @@
   {
     if( !invert && this->distance(target) < radius)
+    {
+    //printf("Distance is %f \n", this->distance(target));
+    executeAction(timestep);
+    scriptCalled = true;
+    return;
+
+    }
+    else if( invert && this->distance(target) > radius)
     {
       executeAction(timestep);
       scriptCalled = true;
       return;
-
-    }
-    else if( invert && this->distance(target) > radius)
-    {
-      executeAction(timestep);
-      scriptCalled = true;
-      return;
-    }
-  }
- //else
-   //printf("SCRIPTTRIGGER: target out of range\n");
-
+    }
+  }
 }
 
@@ -211 +209 @@
 void ScriptTrigger::executeAction(float timestep)
 {
-
   if(scriptIsOk)
   {