Changeset 9973 in orxonox.OLD for branches

Timestamp:

Nov 29, 2006, 4:51:57 PM (18 years ago)

Author:

hejja

Message:

questGUI getestet

Location:

branches/gui/src/world_entities

Files:

• Makefile.am (modified) (2 diffs)
• WorldEntities.am (modified) (2 diffs)
• terminal/terminal.cc (modified) (3 diffs)
• terminal/terminal.h (modified) (1 diff)

branches/gui/src/world_entities/Makefile.am

@@ -28 +28 @@
                 spawning_point.cc \
                 \
+                terminal/terminal.cc \
+                terminal/questGUI.cc \
                 \
                 effects/explosion.cc \
@@ -58 +60 @@
                 spawning_point.h \
                 \
+                terminal/terminal.h \
+                terminal/questGUI.h \
                 \
                 effects/explosion.h \

branches/gui/src/world_entities/WorldEntities.am

@@ -26 +26 @@
                 \
                 world_entities/terminal/terminal.cc \
+                world_entities/terminal/questGUI.cc \
                 \
                 world_entities/weapons/test_gun.cc \
@@ -131 +132 @@
                 \
                 terminal/terminal.h \
+                terminal/questGUI.h \
                 \
                 weapons/test_gun.h \

branches/gui/src/world_entities/terminal/terminal.cc

@@ -22 +22 @@
 #include "terminal.h"
 
+#include "event_handler.h"
+
+#include "state.h"
+
+#include "util/loading/load_param.h"
+#include "util/loading/factory.h"
+
+#include "graphics_engine.h"
+#include "camera.h"
+#include "sound_engine.h"
+
+#include "sound_source.h"
+
+#include "glgui.h"
+#include "menu/glgui_imagebutton.h"
+#include "glgui_text.h"
 
 
 ObjectListDefinition(Terminal);
 
-
+CREATE_FACTORY(Terminal);
 
 
@@ -35 +51 @@
   this->toList(OM_GROUP_00);
   
-  this->guiInit();
 
-
+  if( root != NULL)
+    this->loadParams(root);
 
 }
 
-
-Terminal::~Terminal () {}
+Terminal::~Terminal () 
+{}
 
 
@@ -55 +71 @@
    WorldEntity::loadParams(root);
 }
-
-
-
-
-/**
- * initializes the gui
- */
-void Terminal::guiInit()
-{
-  
-  
-}

branches/gui/src/world_entities/terminal/terminal.h

@@ -4 +4 @@
 
 #include "world_entity.h"
+#include "glgui.h"
+#include <vector>
 
 
 
-class Terminal : public WorldEntity {
+class Terminal : public WorldEntity 
+{
 
   ObjectListDeclaration(Terminal);
- public:
+  
+  public:
    Terminal (const TiXmlElement* root);
-  virtual ~Terminal ();
+   virtual ~Terminal ();
 
-  virtual void loadParams(const TiXmlElement* root = NULL);
+   virtual void loadParams(const TiXmlElement* root = NULL);
 
-
-
- private:
-   
-   void guiInit();
+  private:
 
 };