Changeset 3430 in orxonox.OLD for orxonox/branches/trackManager/src

Timestamp:

Mar 1, 2005, 9:50:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: merged trunk back to trackManager
merged with command
svn merge -r 3369:HEAD trunk/ branches/trackManager
resoloved conflicts in favor of the trunk.

Location:

orxonox/branches/trackManager

Files:

• . (modified) (1 prop)
• src/Makefile.am (modified) (4 diffs)
• src/Makefile.in (modified) (11 diffs)
• src/console/Makefile.in (modified) (3 diffs)
• src/debug.h (modified) (7 diffs)
• src/environment.cc (modified) (2 diffs)
• src/glmenu_imagescreen.cc (modified) (10 diffs)
• src/glmenu_imagescreen.h (modified) (3 diffs)
• src/gui/Makefile.am (modified) (3 diffs)
• src/gui/Makefile.in (modified) (10 diffs)
• src/gui/orxonox_gui.cc (modified) (5 diffs)
• src/gui/orxonox_gui.h (modified) (1 diff)
• src/gui/orxonox_gui_audio.cc (modified) (2 diffs)
• src/gui/orxonox_gui_audio.h (modified) (1 diff)
• src/gui/orxonox_gui_banner.cc (modified) (3 diffs)
• src/gui/orxonox_gui_banner.h (modified) (1 diff)
• src/gui/orxonox_gui_exec.cc (modified) (13 diffs)
• src/gui/orxonox_gui_exec.h (modified) (1 diff)
• src/gui/orxonox_gui_flags.cc (modified) (4 diffs)
• src/gui/orxonox_gui_flags.h (modified) (1 diff)
• src/gui/orxonox_gui_gtk.cc (modified) (69 diffs)
• src/gui/orxonox_gui_gtk.h (modified) (11 diffs)
• src/gui/orxonox_gui_keys.cc (modified) (7 diffs)
• src/gui/orxonox_gui_keys.h (modified) (3 diffs)
• src/gui/orxonox_gui_update.cc (copied) (copied from orxonox/trunk/src/gui/orxonox_gui_update.cc)
• src/gui/orxonox_gui_update.h (copied) (copied from orxonox/trunk/src/gui/orxonox_gui_update.h)
• src/gui/orxonox_gui_video.cc (modified) (2 diffs)
• src/gui/orxonox_gui_video.h (modified) (1 diff)
• src/gui/rc (modified) (1 diff)
• src/importer/Makefile.am (modified) (1 diff)
• src/importer/Makefile.in (modified) (8 diffs)
• src/importer/array.h (modified) (1 diff)
• src/importer/framework.cc (modified) (4 diffs)
• src/importer/framework.h (modified) (2 diffs)
• src/importer/material.cc (modified) (2 diffs)
• src/importer/material.h (modified) (1 diff)
• src/importer/model.cc (modified) (24 diffs)
• src/importer/model.h (modified) (6 diffs)
• src/importer/objModel.cc (copied) (copied from orxonox/trunk/src/importer/objModel.cc)
• src/importer/objModel.h (copied) (copied from orxonox/trunk/src/importer/objModel.h)
• src/importer/vector.cc (deleted)
• src/importer/vector.h (deleted)
• src/orxonox.cc (modified) (1 diff)
• src/player.cc (modified) (3 diffs)
• src/player.h (modified) (1 diff)
• src/sfont (copied) (copied from orxonox/trunk/src/sfont)
• src/sfont/font.cc (copied) (copied from orxonox/trunk/src/sfont/font.cc)
• src/sfont/sfont.c (copied) (copied from orxonox/trunk/src/sfont/sfont.c)
• src/sfont/sfont.h (copied) (copied from orxonox/trunk/src/sfont/sfont.h)
• src/skysphere.cc (copied) (copied from orxonox/trunk/src/skysphere.cc)
• src/skysphere.h (copied) (copied from orxonox/trunk/src/skysphere.h)
• src/track_manager.cc (modified) (2 diffs)
• src/track_manager.h (modified) (1 diff)
• src/world.cc (modified) (8 diffs)
• src/world.h (modified) (2 diffs)
• src/world_entity.h (modified) (2 diffs)

orxonox/branches/trackManager/src/Makefile.am

@@ -24 +24 @@
                  environment.cc \
                  importer/model.cc \
+                 importer/objModel.cc \
                  importer/array.cc \
                  importer/material.cc \
@@ -35 +36 @@
                  matrix.cc \
                  curve.cc \
-                 glmenu_imagescreen.cc
-
+                 glmenu_imagescreen.cc \
+                 skysphere.cc
 
 noinst_HEADERS = ability.h \
@@ -75 +76 @@
                  matrix.h \
                  curve.h \
-                 glmenu_imagescreen.h
-
+                 glmenu_imagescreen.h \
+                 debug.h \
+                 skysphere.h
 
 ## orxonox.conf will be used from home-dir instead.
@@ -87 +89 @@
   GTK_PROGS =
 endif
+if SUB_PROJECTS
+  SUB_PROGS = importer \
+              gui \
+              $(GTK_PROGS)
+else
+  SUB_PROGS = 
+endif
 
 SUBDIRS = . \
-          importer \
-          gui \
-          $(GTK_PROGS)
+          $(SUB_PROGS)
 
 #  uncomment the following if orxonox requires the math library

orxonox/branches/trackManager/src/Makefile.in

@@ -59 +59 @@
         base_entity.$(OBJEXT) game_loader.$(OBJEXT) campaign.$(OBJEXT) \
         story_entity.$(OBJEXT) environment.$(OBJEXT) model.$(OBJEXT) \
-        array.$(OBJEXT) material.$(OBJEXT) texture.$(OBJEXT) \
-        list.$(OBJEXT) p_node.$(OBJEXT) null_parent.$(OBJEXT) \
-        base_object.$(OBJEXT) helper_parent.$(OBJEXT) \
-        track_manager.$(OBJEXT) matrix.$(OBJEXT) curve.$(OBJEXT) \
-        glmenu_imagescreen.$(OBJEXT)
+        objModel.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \
+        texture.$(OBJEXT) list.$(OBJEXT) p_node.$(OBJEXT) \
+        null_parent.$(OBJEXT) base_object.$(OBJEXT) \
+        helper_parent.$(OBJEXT) track_manager.$(OBJEXT) \
+        matrix.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
+        skysphere.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
@@ -82 +83 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/list.Po ./$(DEPDIR)/material.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/matrix.Po ./$(DEPDIR)/model.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/orxonox.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po ./$(DEPDIR)/player.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/player.Po ./$(DEPDIR)/skysphere.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/texture.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po ./$(DEPDIR)/vector.Po \
@@ -118 +120 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
@@ -133 +137 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
+HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
+HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
+HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
@@ -158 +168 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
+SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
@@ -221 +233 @@
                  environment.cc \
                  importer/model.cc \
+                 importer/objModel.cc \
                  importer/array.cc \
                  importer/material.cc \
@@ -232 +245 @@
                  matrix.cc \
                  curve.cc \
-                 glmenu_imagescreen.cc
+                 glmenu_imagescreen.cc \
+                 skysphere.cc
 
 noinst_HEADERS = ability.h \
@@ -271 +285 @@
                  matrix.h \
                  curve.h \
-                 glmenu_imagescreen.h
+                 glmenu_imagescreen.h \
+                 debug.h \
+                 skysphere.h
 
 EXTRA_DIST = orxonox.conf
@@ -278 +294 @@
 ### GTK_RELATED
 @HAVE_GTK2_TRUE@GTK_PROGS = console
+@SUB_PROJECTS_FALSE@SUB_PROGS = 
+@SUB_PROJECTS_TRUE@SUB_PROGS = importer \
+@SUB_PROJECTS_TRUE@           gui \
+@SUB_PROJECTS_TRUE@           $(GTK_PROGS)
+
 SUBDIRS = . \
-          importer \
-          gui \
-          $(GTK_PROGS)
+          $(SUB_PROGS)
 
 all: all-recursive
@@ -369 +388 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p_node.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
@@ -410 +431 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o model.obj `if test -f 'importer/model.cc'; then $(CYGPATH_W) 'importer/model.cc'; else $(CYGPATH_W) '$(srcdir)/importer/model.cc'; fi`
+
+objModel.o: importer/objModel.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT objModel.o -MD -MP -MF "$(DEPDIR)/objModel.Tpo" -c -o objModel.o `test -f 'importer/objModel.cc' || echo '$(srcdir)/'`importer/objModel.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/objModel.Tpo" "$(DEPDIR)/objModel.Po"; else rm -f "$(DEPDIR)/objModel.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/objModel.cc' object='objModel.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/objModel.Po' tmpdepfile='$(DEPDIR)/objModel.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objModel.o `test -f 'importer/objModel.cc' || echo '$(srcdir)/'`importer/objModel.cc
+
+objModel.obj: importer/objModel.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT objModel.obj -MD -MP -MF "$(DEPDIR)/objModel.Tpo" -c -o objModel.obj `if test -f 'importer/objModel.cc'; then $(CYGPATH_W) 'importer/objModel.cc'; else $(CYGPATH_W) '$(srcdir)/importer/objModel.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/objModel.Tpo" "$(DEPDIR)/objModel.Po"; else rm -f "$(DEPDIR)/objModel.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/objModel.cc' object='objModel.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/objModel.Po' tmpdepfile='$(DEPDIR)/objModel.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objModel.obj `if test -f 'importer/objModel.cc'; then $(CYGPATH_W) 'importer/objModel.cc'; else $(CYGPATH_W) '$(srcdir)/importer/objModel.cc'; fi`
 
 array.o: importer/array.cc

orxonox/branches/trackManager/src/console/Makefile.in

@@ -87 +87 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
@@ -102 +104 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
+HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
+HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
+HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
@@ -128 +136 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
+SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@

orxonox/branches/trackManager/src/debug.h

@@ +1 @@
+/* 
+   orxonox - the future of 3D-vertical-scrollers
+
+   Copyright (C) 2004 orx
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   ### File Specific:
+   main-programmer: Benjamin Grauer
+   co-programmer: ...
+*/
+
+/*! 
+    \file debug.h
+    \brief Handles output to console for different Verbose-Modes.
+*/ 
+
 #ifndef _DEBUG_H
 #define _DEBUG_H
 
+#define NO              0
+#define ERROR           1
+#define WARNING         2
+#define INFORMATION     3
+#define DEBUGING        4
+
+#include <stdio.h>
 
 ///////////////////////////////////////////////////
@@ -12 +39 @@
            PRINTF ## x
 
-#if DEBUG >= 1
+#if DEBUG >= ERROR
 #define PRINTF1 \
-    if (verbose >= 1 ) \
+    if (verbose >= ERROR) \
       printf("%s:%d::", __FILE__, __LINE__) && printf
 #else 
-#define PRINTF1 //
+#define PRINTF1 if (NO)
 #endif
      
-#if DEBUG >= 2
+#if DEBUG >= WARNING
 #define PRINTF2 \
-     if (verbose >= 2 ) \
+     if (verbose >= WARNING) \
        printf("%s:%d::", __FILE__, __LINE__) && printf
          
 #else 
-#define PRINTF2 //
+#define PRINTF2 if (NO)
 #endif
      
-#if DEBUG >= 3
+#if DEBUG >= INFORMATION
 #define PRINTF3 \
-     if (verbose >= 3 ) \
+     if (verbose >= INFORMATION) \
        printf("%s:%d::", __FILE__, __LINE__) && printf
 #else 
-#define PRINTF3 //
+#define PRINTF3 if (NO)
 #endif
      
-#if DEBUG >= 4
+#if DEBUG >= DEBUGING
 #define PRINTF4 \
-     if (verbose >= 4 ) \
+     if (verbose >= DEBUGING) \
        printf("%s:%d::", __FILE__, __LINE__) && printf
 #else 
-#define PRINTF4 //
+#define PRINTF4 if (NO)
 #endif
      
      
 #else  
-#define PRINTF(x) //
+#define PRINTF(x) if (NO)
 #endif
 
@@ -54 +81 @@
 
 
-
-
 ///////////////////////////////////////////////////
 ///  PRINT: just prints output as is            ///
 ///////////////////////////////////////////////////
+#ifdef  DEBUG
+extern int verbose;
+#define PRINT(x) \
+  PRINT ## x
 
-#ifdef  DEBUG
-#define PRINT(x) \
-           PRINT ## x
+#if DEBUG >= ERROR
+#define PRINT1  \
+  if (verbose >= ERROR) \
+    printf
+#else 
+#define PRINT1 if (NO)
+#endif
 
-#if DEBUG >= 1
-#define PRINT1 \
-    if (verbose >= 1 ) \
-      printf
-#else 
-#define PRINT1 //
-#endif
-     
-#if DEBUG >= 2
+#if DEBUG >= WARNING
 #define PRINT2 \
-     if (verbose >= 2 ) \
-       printf
+  if (verbose >= WARNING) \
+    printf
 
 #else 
-#define PRINT2 //
+#define PRINT2 if (NO)
 #endif
-     
-#if DEBUG >= 3
+
+#if DEBUG >= INFORMATION
 #define PRINT3 \
-     if (verbose >= 3 ) \
-       printf
-#else
-#define PRINT3 //
+  if (verbose >= INFORMATION) \
+    printf
+#else 
+#define PRINT3 if (NO)
 #endif
-     
-#if DEBUG >= 4
+
+#if DEBUG >= DEBUGING
 #define PRINT4 \
-     if (verbose >= 4 ) \
-       printf
+  if (verbose >= DEBUGING) \
+    printf
 #else 
-#define PRINT4 //
+#define PRINT4 if (NO)
 #endif
-     
-     
+
+
 #else  
-#define PRINT(x) //
+#define PRINT(x) if (NO)
 #endif
 
 #define PRINT0 \
-           printf
-
+  printf
 
 ///////////////////////////////////////////////////
@@ -118 +142 @@
       cout
 #else 
-#define COUT1 //
+#define COUT1 if (NO) cout
 #endif
      
@@ -127 +151 @@
 
 #else 
-#define COUT2 //
+#define COUT2 if (NO) cout
 #endif
      
@@ -135 +159 @@
        cout
 #else
-#define COUT3 //
+#define COUT3 if (NO) cout
 #endif
      
@@ -143 +167 @@
        cout
 #else 
-#define COUT4 //
+#define COUT4 if (NO) cout
 #endif
      
      
 #else  
-#define COUT(x) //
+#define COUT(x) if (NO) cout
 #endif
 

orxonox/branches/trackManager/src/environment.cc

@@ -21 +21 @@
 #include "world_entity.h"
 #include "vector.h"
-#include "importer/model.h"
+#include "importer/objModel.h"
 
 using namespace std;
@@ -29 +29 @@
 Environment::Environment () : WorldEntity()
 {
-  this->model = new Model("fighter.obj", .3);
+  this->model = new OBJModel("../data/models/fighter.obj");
 }
 

orxonox/branches/trackManager/src/glmenu_imagescreen.cc

@@ -18 +18 @@
 
 #include "glmenu_imagescreen.h"
-#include "importer/texture.h"
+
+#include "importer/material.h"
 
 using namespace std;
 
+GLMenuImageScreen* GLMenuImageScreen::singletonRef = 0;
+
+GLMenuImageScreen* GLMenuImageScreen::getInstance()
+{
+  if( singletonRef == NULL)
+    singletonRef = new GLMenuImageScreen ();
+  return singletonRef;
+}
 
 /**
@@ -39 +48 @@
    \todo this deconstructor is not jet implemented - do it
 */
-GLMenuImageScreen::~GLMenuImageScreen () {}
+GLMenuImageScreen::~GLMenuImageScreen() 
+{
+  if (backMat)
+    delete backMat;
+}
 
 
@@ -58 +71 @@
   glMatrixMode(GL_MODELVIEW); 
 
-  this->backTex = new Texture();
-  this->backTex->loadImage("orx_tex.bmp");
-
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glLoadIdentity();
@@ -71 +81 @@
   
   // Select Our VU Meter Background Texture
-  this->backTex = new Texture();
-  this->backTex->loadImage("load_screen.jpg");
+  this->backMat = new Material("load_screen");
+  this->backMat->setDiffuseMap("../data/pictures/load_screen.jpg");
+  this->maxValue = 10;
+  this->currentValue = 0;
 
   // End of Background image code.
@@ -126 +138 @@
   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 
-  // Screen Size.
+  /* screen size */
   int screenWidth = 640;
   int screenHeight = 480;
   
-  // Set Image Size.
+  /* set image size */
   int imageWidth = 640;
   int imageHeight = 480;
   
-  // Start pos of image.
+  /* start pos of image */
   int offsetX = (screenWidth - imageWidth)/2;
   int offsetY = (screenHeight - imageHeight)/2;
   
-  glEnable(GL_BLEND);
-  glEnable(GL_TEXTURE_2D);
-
-  glPushAttrib(GL_LIGHTING_BIT | GL_TRANSFORM_BIT);
-  
-  glDisable(GL_LIGHTING);
+  /* loadbar pos */
+  int barX = 390;
+  int barY = 50;
+  int barWidth = 230;
+  int barHeight = 30;
+
+  int val = (int)((float)this->currentValue/(float)this->maxValue) * barWidth;
+
   glMatrixMode(GL_PROJECTION);
   glPushMatrix();
@@ -152 +166 @@
   glLoadIdentity();
   glPushMatrix();
+
   glEnable(GL_BLEND);
-
+  glPushAttrib(GL_LIGHTING_BIT | GL_TRANSFORM_BIT);
+  glDisable(GL_LIGHTING);
+
+  backMat->select();
+  glBegin(GL_QUADS);
+  glColor3f(0.96, 0.84, 0.34);
+  glVertex2i(barX, barY);
+  glVertex2i(barX + val, barY);
+  glVertex2i(barX + val, barY + barHeight);
+  glVertex2i(barX, barY + barHeight);
+  glColor3f(1.0, 1.0, 1.0);
+  glEnd();
+
+  glBegin(GL_QUADS);
+  glColor3f(0.0, 0.0, 0.0);
+  glVertex2i(barX, barY);
+  glVertex2i(barX + barWidth, barY);
+  glVertex2i(barX + barWidth, barY + barHeight);
+  glVertex2i(barX, barY + barHeight);
+  glColor3f(1.0, 1.0, 1.0);
+  glEnd();
+
+  /* draw black border */
+  glBegin(GL_QUADS);
+  glColor3f(0.0, 0.0, 0.0);
+  glVertex2i(barX-1, barY-1);
+  glVertex2i(barX + barWidth +1, barY-1);
+  glVertex2i(barX + barWidth+1, barY + barHeight+1);
+  glVertex2i(barX - 1, barY + barHeight +1);
+  glColor3f(1.0, 1.0, 1.0);
+  glEnd();
+
+  /* draw white border */
+  glBegin(GL_QUADS);
+  glColor3f(1.0, 1.0, 1.0);
+  glVertex2i(barX-2, barY-2);
+  glVertex2i(barX + barWidth +2, barY-2);
+  glVertex2i(barX + barWidth+2, barY + barHeight+2);
+  glVertex2i(barX - 2, barY + barHeight +2);
+  glColor3f(1.0, 1.0, 1.0);
+  glEnd();
+
+  glEnable(GL_TEXTURE_2D);
   glBegin(GL_QUADS);
   glTexCoord2i(0, 0); glVertex2i(offsetX, offsetY);
-  glTexCoord2i(1, 0 ); glVertex2i(offsetX + imageWidth, offsetY);
-  glTexCoord2i( 1, 1 ); glVertex2i(offsetX + imageWidth, offsetY + imageHeight);
-  glTexCoord2i( 0, 1 ); glVertex2i(offsetX, offsetY + imageHeight);
-  glEnd();
-
+  glTexCoord2i(1, 0); glVertex2i(offsetX + imageWidth, offsetY);
+  glTexCoord2i(1, 1); glVertex2i(offsetX + imageWidth, offsetY + imageHeight);
+  glTexCoord2i(0, 1); glVertex2i(offsetX, offsetY + imageHeight);
+  glEnd();
   glDisable(GL_TEXTURE_2D);
-
-  glBegin(GL_QUADS);
-  glColor3f(1.0, 0.0, 0.0);
-  glVertex2i(100, 100);
-  glVertex2i(200, 100);
-  glVertex2i(200, 150);
-  glVertex2i(100, 150);
-  glEnd();
-
 
   glDisable(GL_BLEND);
@@ -179 +226 @@
 
   SDL_GL_SwapBuffers();                    
-  SDL_Delay(1000);
 }
  
@@ -213 +259 @@
    \param maximum of steps
 */
-void GLMenuImageScreen::setMaximum(int maxStep)
-{
-  this->maxStep = maxStep;
+void GLMenuImageScreen::setMaximum(int maxValue)
+{
+  this->maxValue = maxValue;
 }
 
@@ -224 +270 @@
 int GLMenuImageScreen::getMaximum()
 {
-  return this->maxStep;
+  return this->maxValue;
 }
 
@@ -256 +302 @@
 {
   this->currentValue++;
-}
+  this->draw();
+}

orxonox/branches/trackManager/src/glmenu_imagescreen.h

@@ -9 +9 @@
 
 #include "stdincl.h"
-
 class Texture;
+class Material;
 
 class GLMenuImageScreen : public BaseObject {
 
+ private:
+  GLMenuImageScreen ();
+
  public:
-  GLMenuImageScreen ();
   ~GLMenuImageScreen ();
+
+  static GLMenuImageScreen* getInstance();
+
+  static GLMenuImageScreen* singletonRef;
 
   void init ();
@@ -28 +34 @@
   void setSize (float height, float width);
   
-  void setMaximum (int maxStep);
+  void setMaximum (int maxValue);
   int getMaximum ();
   void setValue (int currentValue);
@@ -35 +41 @@
 
  private:
-  char* backImageName;       //! the name of the file of the background image
-  float height, width;       //! hight and width of the image
-  float offsetX, offsetY;    //! offset of the image from left and up
-  Texture* backTex;          //! background texture
-  int currentValue;          //! the current count of step() calls fired yet
-  int maxStep;               //! total count of steps
+  char* backImageName;       //!< the name of the file of the background image
+  float height, width;       //!< hight and width of the image
+  float offsetX, offsetY;    //!< offset of the image from left and up
+  Material* backMat;         //!< Background Material.
+  int currentValue;          //!< the current count of step() calls fired yet
+  int maxValue;              //!< total count of steps
 
 };

orxonox/branches/trackManager/src/gui/Makefile.am

@@ -1 @@
-AM_CXXFLAGS=$(GTK2_CFLAGS) $(MSBITFIELDS)
-#AM_LDFLAGS=$(GTK2_LIBS)
-LIBS=$(GTK2_LIBS)
+AM_CXXFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
+LIBS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
 bin_PROGRAMS=gui
@@ -11 +11 @@
             orxonox_gui_flags.cc \
             orxonox_gui_banner.cc \
-            orxonox_gui_keys.cc
+            orxonox_gui_keys.cc \
+            orxonox_gui_update.cc
 
 noinst_HEADERS=orxonox_gui.h \
@@ -20 +21 @@
             orxonox_gui_flags.h \
             orxonox_gui_banner.h \
-            orxonox_gui_keys.h
+            orxonox_gui_keys.h \
+            orxonox_gui_update.h
 
 #  uncomment the following if orxonox requires the mathlibrary

orxonox/branches/trackManager/src/gui/Makefile.in

@@ -56 +56 @@
         orxonox_gui_video.$(OBJEXT) orxonox_gui_audio.$(OBJEXT) \
         orxonox_gui_exec.$(OBJEXT) orxonox_gui_flags.$(OBJEXT) \
-        orxonox_gui_banner.$(OBJEXT) orxonox_gui_keys.$(OBJEXT)
+        orxonox_gui_banner.$(OBJEXT) orxonox_gui_keys.$(OBJEXT) \
+        orxonox_gui_update.$(OBJEXT)
 gui_OBJECTS = $(am_gui_OBJECTS)
 gui_LDADD = $(LDADD)
@@ -69 +70 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_gtk.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_keys.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_update.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_video.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -94 +96 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
@@ -109 +113 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
+HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
+HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
+HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
@@ -119 +129 @@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-#AM_LDFLAGS=$(GTK2_LIBS)
-LIBS = $(GTK2_LIBS)
+#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
+LIBS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
@@ -135 +145 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
+SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
@@ -178 +190 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
-AM_CXXFLAGS = $(GTK2_CFLAGS) $(MSBITFIELDS)
+AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
 gui_SOURCES = orxonox_gui.cc \
             orxonox_gui_gtk.cc \
@@ -186 +198 @@
             orxonox_gui_flags.cc \
             orxonox_gui_banner.cc \
-            orxonox_gui_keys.cc
+            orxonox_gui_keys.cc \
+            orxonox_gui_update.cc
 
 noinst_HEADERS = orxonox_gui.h \
@@ -195 +208 @@
             orxonox_gui_flags.h \
             orxonox_gui_banner.h \
-            orxonox_gui_keys.h
+            orxonox_gui_keys.h \
+            orxonox_gui_update.h
 
 
@@ -280 +294 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_gtk.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_keys.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_update.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_video.Po@am__quote@
 

orxonox/branches/trackManager/src/gui/orxonox_gui.cc

@@ -24 +24 @@
 */
 
+#include <unistd.h>
+
 #include "orxonox_gui.h"
 #include "orxonox_gui_video.h"
@@ -31 +33 @@
 #include "orxonox_gui_banner.h"
 #include "orxonox_gui_keys.h"
+#include "orxonox_gui_update.h"
 
   Window* orxonoxGUI;
@@ -39 +42 @@
   OrxonoxGuiBanner* banner;
   OrxonoxGuiKeys* keys;
+  OrxonoxGuiUpdate* update;
+int verbose = 4;
 
-int main( int argc, char *argv[] )
+int main(int argc, char *argv[])
 {
   OrxonoxGui* orxonoxgui = new OrxonoxGui(argc, argv);
@@ -51 +56 @@
    \brief Initializes the Gui
 */
-OrxonoxGui::OrxonoxGui (int argc, char *argv[])
+OrxonoxGui::OrxonoxGui(int argc, char *argv[])
 {
-#ifdef HAVE_GTK2
-  initGTK(argc, argv);
-#endif /* HAVE_GTK2 */
-  orxonoxGUI = new Window( "Grafical OrxOnoX loader, "PACKAGE_VERSION);
-#ifdef HAVE_GTK2
-  orxonoxGUI->connectSignal ("destroy", orxonoxGUI->orxonox_gui_quit);
-  orxonoxGUI->connectSignal ("delete_event", orxonoxGUI->orxonox_gui_quit);
-#endif /* HAVE_GTK2 */
+  initGUI(argc, argv);
+
+  orxonoxGUI = new Window( "grafical orxonox loader, "PACKAGE_VERSION);
   
   Box* windowBox = new Box ('h');
@@ -67 +67 @@
   windowBox->fill (banner->getWidget());
   
-  Box* optionBox = new Box ('v');
+  Box* optionBox = new Box('v');
   
-  Box* avBox = new Box ('h');
+  Box* avBox = new Box('h');
 
-  video = new OrxonoxGuiVideo ();
-  avBox->fill (video->getWidget ());
-  audio = new OrxonoxGuiAudio ();
-  avBox->fill (audio->getWidget ());
+  video = new OrxonoxGuiVideo();
+  avBox->fill(video->getWidget());
+  audio = new OrxonoxGuiAudio();
+  avBox->fill(audio->getWidget());
       
-  optionBox->fill (avBox);
+  optionBox->fill(avBox);
 
-  keys = new OrxonoxGuiKeys ();
-  optionBox->fill (keys->getWidget ());
+  keys = new OrxonoxGuiKeys();
+  optionBox->fill(keys->getWidget());
 
-  exec = new OrxonoxGuiExec (orxonoxGUI);
-  optionBox->fill (exec->getWidget ());
+  exec = new OrxonoxGuiExec();
+  optionBox->fill(exec->getWidget());
 
-  flags = new OrxonoxGuiFlags (orxonoxGUI);
+  flags = new OrxonoxGuiFlags();
+
+  optionBox->fill(flags->getWidget());
+  windowBox->fill(optionBox);
+
+  update = new OrxonoxGuiUpdate();
+  optionBox->fill(update->getWidget());
+  
+  orxonoxGUI->fill(windowBox);
+
+  // Reading Values from File
+  exec->setFilename("~/.orxonox.conf");
+  exec->readFromFile(orxonoxGUI);
+  // Merging changes to the Options from appended flags.
+  for (int optCount = 1; optCount < argc; optCount++)
+    orxonoxGUI->walkThrough(Widget::flagCheck, argv[optCount], 0);
+
+  flags->setTextFromFlags(orxonoxGUI);
+  orxonoxGUI->showall();
+
+  //// Handling special Cases. ///
+
+  // case update //
+#ifdef HAVE_CURL
+  if (static_cast<Option*>(orxonoxGUI->findWidgetByName("auto update", 0))->value == 1)
+    {
+      update->checkForUpdates();
+    }
+#endif /* HAVE_CURL */
+
+  // case start-with-gui.
+  if (!access(exec->getConfigFile(), F_OK) && static_cast<Option*>(orxonoxGUI->findWidgetByName("Always Show this Menu", 0))->value == 0)
+    OrxonoxGuiExec::startOrxonox(NULL, exec);
+  else
+    {
+      mainloopGUI();
+    }
+
+}
 
 
-  optionBox->fill (flags->getWidget ());
-  windowBox->fill (optionBox);
-  
-  orxonoxGUI->fill (windowBox);
-  flags->setTextFromFlags (orxonoxGUI);
-
-  exec->setFilename ("~/.orxonox.conf");
-  exec->readFromFile (orxonoxGUI);
-  //  orxonoxGUI->walkThrough(orxonoxGUI->listOptions);
-
-  orxonoxGUI->showall ();
-
-  
-#ifdef HAVE_GTK2
-  mainloopGTK();
-#else /* HAVE_GTK2 */
-  cout << " Listing all the Orxonox Options: \n";
-  cout << "  #############################\n";
-  orxonoxGUI->walkThrough(orxonoxGUI->listOptions);
-
-  cout << "\nDo you want me to save the the above values now? [Yn] ";
-  char c = getchar();
-  if ((c == 'y' || c == 'Y' || c== 10) && exec->shouldsave())
-    exec->writeToFile (Window::mainWindow);
- 
-#endif /* HAVE_GTK2 */
-
+/**
+   \brief Destructor.
+*/
+OrxonoxGui::~OrxonoxGui(void)
+{
+  delete video;
+  delete audio;
+  delete exec;
+  delete flags;
+  delete banner;
+  delete keys;
+  delete update;
 }

orxonox/branches/trackManager/src/gui/orxonox_gui.h

@@ -25 +25 @@
 {
  public:
-  OrxonoxGui (int argc, char *argv[]);
-  ~OrxonoxGui ();
+  OrxonoxGui(int argc, char *argv[]);
+  ~OrxonoxGui(void);
 
 };
 
-
-
 #endif /* _ORXONOX_GUI_H */

orxonox/branches/trackManager/src/gui/orxonox_gui_audio.cc

@@ -29 +29 @@
    \brief Creates an Audio-Frame
 */
-OrxonoxGuiAudio::OrxonoxGuiAudio ()
+OrxonoxGuiAudio::OrxonoxGuiAudio(void)
 {
-  audioFrame = new Frame ("Audio-Options:");
-  audioBox = new Box ('v');
-  audioFrame->setGroupName ("audio");
+  this->audioFrame = new Frame("Audio-Options:");
+  this->audioBox = new Box('v');
+  this->audioFrame->setGroupName("audio");
   
-  enableSound = new CheckButton ("Disable Sound");
-  enableSound->setFlagName ("no-sound", 0);
-  enableSound->saveable = true;
-  audioBox->fill (enableSound);
-  Label* musicVolumeLabel = new Label ("Music Volume");
-  audioBox->fill (musicVolumeLabel);
-  musicVolume = new Slider ("Music Volume", 0, 100);
-  musicVolume->setFlagName ("music-volume", "m", 80);
-  musicVolume->saveable = true;
-  audioBox->fill (musicVolume);
+  this->enableSound = new CheckButton("Disable Sound");
+  this->enableSound->setFlagName ("no-sound", 0);
+  this->enableSound->saveability();
+  this->audioBox->fill(this->enableSound);
+  Label* musicVolumeLabel = new Label("Music Volume");
+  this->audioBox->fill(musicVolumeLabel);
+  this->musicVolume = new Slider("Music Volume", 0, 100);
+  this->musicVolume->setFlagName("music-volume", "m", 80);
+  this->musicVolume->saveability();
+  this->audioBox->fill (this->musicVolume);
   Label* effectsVolumeLabel = new Label ("Effects Volume");
-  audioBox->fill (effectsVolumeLabel);
-  effectsVolume = new Slider ("Effects Volume", 0, 100);
-  effectsVolume->setFlagName ("effects-volume", "e", 80);
-  effectsVolume->saveable = true;
-  audioBox->fill (effectsVolume);
+  this->audioBox->fill (effectsVolumeLabel);
+  this->effectsVolume = new Slider ("Effects Volume", 0, 100);
+  this->effectsVolume->setFlagName ("effects-volume", "e", 80);
+  this->effectsVolume->saveability();
+  this->audioBox->fill (this->effectsVolume);
 
-  audioFrame->fill (audioBox);
+  this->audioFrame->fill (this->audioBox);
+}
+
+/** 
+    \brief Destructs the Audio-Stuff
+*/
+OrxonoxGuiAudio::~OrxonoxGuiAudio(void)
+{
+  // nothing to do here.
 }
 
@@ -59 +67 @@
    \return Returns the Audio-frame
 */
-Widget* OrxonoxGuiAudio::getWidget ()
+Widget* OrxonoxGuiAudio::getWidget(void)
 {
-  return audioFrame;
+  return this->audioFrame;
 }

orxonox/branches/trackManager/src/gui/orxonox_gui_audio.h

@@ -19 +19 @@
   Slider* effectsVolume;    //!< A Slider for effects volume.
  public:
-  OrxonoxGuiAudio ();
-  ~OrxonoxGuiAudio ();
+  OrxonoxGuiAudio(void);
+  ~OrxonoxGuiAudio(void);
   
-  Widget* getWidget ();
+  Widget* getWidget(void);
 };
 #endif /* _ORXONOX_GUI_AUDIO_H */

orxonox/branches/trackManager/src/gui/orxonox_gui_banner.cc

@@ -29 +29 @@
    \brief Creates a new BannerEventBox and its content.
 */
-OrxonoxGuiBanner::OrxonoxGuiBanner ()
+OrxonoxGuiBanner::OrxonoxGuiBanner(void)
 {
   // Banner Itself //
-  bannerEventBox = new EventBox ("BannerEventBox");
-  bannerImage = new Image ("banner.xpm");
-  bannerEventBox->fill(bannerImage);
+  this->bannerEventBox = new EventBox("BannerEventBox");
+  this->bannerImage = new Image("banner.xpm");
+  this->bannerEventBox->fill(this->bannerImage);
 
   // Banner Window //
-  logoWindow = new Window("Logo");
+  this->logoWindow = new Window("Logo");
 
 #ifdef HAVE_GTK2
-  bannerEventBox->connectSignal ("button_press_event", logoWindow, Window::windowOpen);
+  this->bannerEventBox->connectSignal("button_press_event", this->logoWindow, Window::windowOpen);
 
-  logoWindow->connectSignal("destroy", logoWindow, Window::windowClose);
-  logoWindow->connectSignal("delete_event", logoWindow, Window::windowClose);
+  this->logoWindow->connectSignal("destroy", this->logoWindow, Window::windowClose);
+  this->logoWindow->connectSignal("delete_event", this->logoWindow, Window::windowClose);
 #endif /* HAVE_GTK2 */
-  logoEventBox = new EventBox();
-  logoBox = new Box('v');
-  logoLabel = new Label("OrxOnoX, Version: " PACKAGE_VERSION);
-  logoImage = new Image("banner.xpm");
-  logoEventBox->fill(logoImage);
+  this->logoEventBox = new EventBox();
+  this->logoBox = new Box('v');
+  this->logoLabel = new Label("OrxOnoX, Version: " PACKAGE_VERSION);
+  this->logoImage = new Image("banner.xpm");
+  this->logoEventBox->fill(this->logoImage);
   
-  logoBox->fill(logoLabel);
-  logoBox->fill(logoEventBox);
+  this->logoBox->fill(this->logoLabel);
+  this->logoBox->fill(this->logoEventBox);
 #ifdef HAVE_GTK2
-  logoEventBox->connectSignal("button_press_event",logoWindow, Window::windowClose);
+  this->logoEventBox->connectSignal("button_press_event", this->logoWindow, Window::windowClose);
 #endif /* HAVE_GTK2 */
 
-  logoWindow->fill (logoBox);
+  this->logoWindow->fill(this->logoBox);
   
-  Window::addWindow (logoWindow);
+  Window::addWindow(this->logoWindow);
 }
 
@@ -65 +65 @@
    \brief Destructs it.
 */
-OrxonoxGuiBanner::~OrxonoxGuiBanner ()
+OrxonoxGuiBanner::~OrxonoxGuiBanner(void)
 {
+  // nothing to do here
 }
 
@@ -73 +74 @@
    \return The EventBox, that holds the Banner.
 */
-Widget* OrxonoxGuiBanner::getWidget ()
+Widget* OrxonoxGuiBanner::getWidget(void)
 {
-  return bannerEventBox;
+  return this->bannerEventBox;
 }
 

orxonox/branches/trackManager/src/gui/orxonox_gui_banner.h

@@ -29 +29 @@
 
  public:
-  OrxonoxGuiBanner ();
-  ~OrxonoxGuiBanner ();
+  OrxonoxGuiBanner(void);
+  ~OrxonoxGuiBanner(void);
 
-  Widget* getWidget ();
+  Widget* getWidget(void);
 
 };

orxonox/branches/trackManager/src/gui/orxonox_gui_exec.cc

@@ -28 +28 @@
 #include <string>
 
+HashTable* orxonoxFlagHash;
+
 /** 
     \brief Creates the Exec-Frame
-    \param orxonoxGUI ExecFrame needs to know where to get the Options from
-*/
-OrxonoxGuiExec::OrxonoxGuiExec (Window* orxonoxGUI)
-{
-  configFile = (char*)malloc (512*sizeof (char));
-
-  execFrame = new Frame ("Execute-Tags:");
-  execBox = new Box ('v');
-  execFrame->setGroupName ("misc");
+*/
+OrxonoxGuiExec::OrxonoxGuiExec(void)
+{
+  configFile =(char*)malloc(512*sizeof(char));
+
+  this->execFrame = new Frame("Execute-Tags:");
+  this->execBox = new Box('v');
+  this->execFrame->setGroupName("misc");
   
-  start = new Button ("Start");
+  this->start = new Button("Start");
 #ifdef HAVE_GTK2
-  start->connectSignal ("clicked", startOrxonox);
+  this->start->connectSignal("clicked", this, startOrxonox);
 #endif /* HAVE_GTK2 */
-  execBox->fill (start);
-  saveSettings = new CheckButton ("Save Settings");
-  saveSettings->value = 1;
-  saveSettings->saveable = true;
-  execBox->fill (saveSettings);
-  verboseMode = new Menu ("verbose mode", "no output", "verbose", "debug", "lastItem");
-  verboseMode->setFlagName ("verbose", "v", 0);
-  verboseMode->saveable = true;
-  execBox->fill (verboseMode);
-  alwaysShow = new CheckButton ("Always Show this Menu");
-  alwaysShow->setFlagName ("gui", "g", 0);
-  alwaysShow->saveable = true;
-  execBox->fill (alwaysShow);
-  quit = new Button ("Quit");
+  this->execBox->fill(start);
+  this->saveSettings = new CheckButton("Save Settings");
+  this->saveSettings->value = 1;
+  this->saveSettings->saveability();
+  this->execBox->fill(this->saveSettings);
+  this->verboseMode = new Menu("verbose mode", "no output", "error", "warning", "info", "lastItem");
+  this->verboseMode->setFlagName("verbose", "v", 0);
+  this->verboseMode->saveability();
+  this->execBox->fill(this->verboseMode);
+  this->alwaysShow = new CheckButton("Always Show this Menu");
+  this->alwaysShow->setFlagName("gui", "g", 0);
+  this->alwaysShow->saveability();
+  this->execBox->fill(this->alwaysShow);
+  this->quit = new Button("Quit");
 #ifdef HAVE_GTK2
-  quit->connectSignal ("clicked", orxonoxGUI->orxonox_gui_quit);
+  this->quit->connectSignal("clicked", this, OrxonoxGuiExec::quitOrxonox);
+  //  Window::mainWindow->connectSignal("remove", this, OrxonoxGuiExec::quitOrxonox);
+  Window::mainWindow->connectSignal("destroy", this, OrxonoxGuiExec::quitOrxonox);
 #endif /* HAVE_GTK2 */
-  execBox->fill (quit);
-
-  execFrame->fill (execBox);
+  this->execBox->fill(this->quit);
+
+  this->execFrame->fill(this->execBox);
+}
+
+/**
+   \brief Destructs the Execution-stuff
+*/
+OrxonoxGuiExec::~OrxonoxGuiExec(void)
+{
+  if(this->configFile)
+    delete []this->configFile;
 }
 
@@ -70 +82 @@
    \return Returns the Exec-frame
 */
-Widget* OrxonoxGuiExec::getWidget ()
+Widget* OrxonoxGuiExec::getWidget(void)
 {
   return execFrame;
@@ -78 +90 @@
 
 /**
-   \brief Sets the location of the configuration File.\n
-   * The name will be parsed from ~/ to /home/[username] on unix and c:/Documents and Settings/username/Settings/ on Windows
+   \brief Sets the location of the configuration File.
    \param filename the location of the configFile
-*/
-void OrxonoxGuiExec::setFilename (char* filename)
-{
-  char* buffer = (char*) malloc (512*sizeof(buffer));
-  sprintf (buffer, "%s", filename);
-  if (!strncmp (buffer, "~/", 2))
+
+   \todo: memory allocation could be better.
+
+   The name will be parsed from ~/ to /home/[username] on unix and c:/Documents and Settings/username/Settings/ on Windows
+*/
+void OrxonoxGuiExec::setFilename(char* filename)
+{
+  char* buffer = (char*)malloc(2048*sizeof(char));
+  sprintf(buffer, "%s", filename);
+  if(!strncmp(buffer, "~/", 2))
   {
 #ifdef __WIN32__
-    sprintf (configFile, "%s/%s", getenv ("USERPROFILE"), buffer+2);
+    sprintf(configFile, "%s/%s", getenv("USERPROFILE"), buffer+2);
 #else
-    sprintf (configFile, "%s/%s", getenv ("HOME"), buffer+2);
+    sprintf(configFile, "%s/%s", getenv("HOME"), buffer+2);
 #endif
   }
-  else if (buffer)
-    sprintf(configFile, "%s", buffer);
-  delete buffer;
+  else if(buffer)
+    strcpy(this->configFile, buffer);
+  free (buffer);
+}
+
+/**
+   \returns The name of the Configuration-File
+*/
+char* OrxonoxGuiExec::getConfigFile(void)
+{
+  return this->configFile;
 }
 
@@ -103 +126 @@
    \return 1 if it should 0 if not/
 */
-int OrxonoxGuiExec::shouldsave ()
-{
-  return (static_cast<Option*>(saveSettings)->value);
+int OrxonoxGuiExec::shouldsave()
+{
+  return(static_cast<Option*>(this->saveSettings)->value);
 }
 
@@ -112 +135 @@
     \param widget from which Widget on should be saved.
 
-    this Function only opens and closes the file, in between OrxonoxGuiExec::writeFileText (Widget* widget) will execute the real writing process.
-*/
-void OrxonoxGuiExec::writeToFile (Widget* widget)
-{
-  CONFIG_FILE = fopen (configFile, "w");
-  if (CONFIG_FILE)
-    writeFileText (widget, 0);
-  fclose (CONFIG_FILE);
+    this Function only opens and closes the file, in between OrxonoxGuiExec::writeFileText(Widget* widget) will execute the real writing process.
+*/
+void OrxonoxGuiExec::writeToFile(Widget* widget)
+{
+  this->CONFIG_FILE = fopen(configFile, "w");
+  if(this->CONFIG_FILE)
+    this->writeFileText(widget, 0);
+  fclose(this->CONFIG_FILE);
 }
 
@@ -127 +150 @@
    \param depth initially "0", and grows higher, while new Groups are bundeled.
 */
-void OrxonoxGuiExec::writeFileText (Widget* widget, int depth)
+void OrxonoxGuiExec::writeFileText(Widget* widget, int depth)
 {
   int counter = 0;
-  while (counter < depth && ((widget->isOption>0
-                              && (static_cast<Option*>(widget)->saveable) )
-                             || (widget->isOption<0
-                                 && static_cast<Packer*>(widget)->getGroupName())))
-    {
-      fprintf (CONFIG_FILE, "  ", depth);
+  while(counter < depth &&((widget->isOption>0
+                              &&(static_cast<Option*>(widget)->isSaveable()))
+                             ||(widget->isOption<0
+                                && static_cast<Packer*>(widget)->getGroupName())))
+    {
+      fprintf(this->CONFIG_FILE, "  ", depth);
       counter++;
     }
   
   // check if it is a Packer, and if it is, check if it has a name and if there is something in it.
-  if (widget->isOption <0)
-    {
-      if (static_cast<Packer*>(widget)->getGroupName())
-        {
-          fprintf (CONFIG_FILE, "[%s]\n", static_cast<Packer*>(widget)->getGroupName());
-          writeFileText (static_cast<Packer*>(widget)->down, depth+1);
+  if(widget->isOption <0)
+    {
+      if(static_cast<Packer*>(widget)->getGroupName())
+        {
+          fprintf(CONFIG_FILE, "[%s]\n", static_cast<Packer*>(widget)->getGroupName());
+          this->writeFileText(static_cast<Packer*>(widget)->down, depth+1);
           fprintf(CONFIG_FILE, "\n");
         }
       else
         {
-          writeFileText (static_cast<Packer*>(widget)->down, depth);
+          this->writeFileText(static_cast<Packer*>(widget)->down, depth);
         }
     } 
-  //  if (widget->isOption == 0)
-  //    printf ("%s\n",widget->label);
-  if (widget->isOption >= 1)
-    if  (static_cast<Option*>(widget)->saveable)
+  //  if(widget->isOption == 0)
+  //    printf("%s\n",widget->title);
+  if(widget->isOption >= 1)
+    if (static_cast<Option*>(widget)->isSaveable())
       {
         char Buffer[256];
         char* space2under;
-        strcpy (Buffer, static_cast<Option*>(widget)->label);
-        if (strchr (Buffer, '_'))
+        strcpy(Buffer, static_cast<Option*>(widget)->title);
+        if(strchr(Buffer, '_'))
           cout << "Warning Optionname" << Buffer << " is not Valid for Saving, because it includes an underscore" << endl;
-        while (space2under = strchr(Buffer, ' '))
+        while(space2under = strchr(Buffer, ' '))
           {
             space2under[0] = '_';
           }
-        if (widget->isOption <=3)
-          fprintf (CONFIG_FILE, "%s = %d\n", Buffer, static_cast<Option*>(widget)->value);
-        else if (widget->isOption == 5)
-          fprintf (CONFIG_FILE, "%s = %s\n", Buffer, static_cast<OptionLabel*>(widget)->cValue);
+        if(widget->isOption <=3)
+          fprintf(CONFIG_FILE, "%s = %d\n", Buffer, static_cast<Option*>(widget)->value);
+        else if(widget->isOption == 5)
+          fprintf(CONFIG_FILE, "%s = %s\n", Buffer, static_cast<OptionLabel*>(widget)->cValue);
       }
 
-  if (widget->next != NULL)
-    writeFileText (widget->next, depth);
+  if(widget->next != NULL)
+    this->writeFileText(widget->next, depth);
 }
 
@@ -181 +204 @@
    \param widget from which Widget on should be saved.
 */
-void OrxonoxGuiExec::readFromFile (Widget* widget)
-{
-  CONFIG_FILE = fopen (configFile, "r");
-  if (CONFIG_FILE)
+void OrxonoxGuiExec::readFromFile(Widget* widget)
+{
+  this->CONFIG_FILE = fopen(configFile, "r");
+  VarInfo varInfo;
+  if(this->CONFIG_FILE)
     {
       Widget* groupWidget = widget;
@@ -190 +214 @@
       char Variable[256]= "";
       char* Value;
-      while (fscanf (CONFIG_FILE, "%s", Buffer) != EOF)
+      while(fscanf(this->CONFIG_FILE, "%s", Buffer) != EOF)
         {
           // group-search //
-          if (!strncmp (Buffer, "[", 1))
+          if(!strncmp(Buffer, "[", 1))
             {
-              if ((groupWidget = locateGroup (widget, Buffer, 1))==NULL)
+              if((groupWidget = locateGroup(widget, Buffer, 1))==NULL)
                 {
                   cout << "!!There is no group called " << Buffer << " in this GUI.\n First best Widget will get the Infos assigned.\n Config-File will be updated in next Save\n";
                   groupWidget = widget;
                 }
+              else
+                PRINT(3)("Group %s located.\n", static_cast<Packer*>(groupWidget)->groupName);
             }
           // option-setting //
-          if (!strcmp (Buffer, "="))
+          if(!strcmp(Buffer, "="))
             {
               char* under2space;
-              while (under2space = strchr(Variable, '_'))
+              while(under2space = strchr(Variable, '_'))
                 {
-                  sprintf (under2space, " %s", under2space+1);
+                  sprintf(under2space, " %s", under2space+1);
                 }
               
-              fscanf (CONFIG_FILE, "%s", Buffer);
-              Value = Buffer;
-              readFileText (groupWidget, Variable, Value, 0);
-              sprintf (Variable, "");
+              fscanf(this->CONFIG_FILE, "%s", Buffer);
+              varInfo.variableName = Variable;
+              varInfo.variableValue = Buffer;
+              groupWidget->walkThrough(this->readFileText, &varInfo, 0);
+              sprintf(Variable, "");
             }
-          sprintf (Variable, "%s", Buffer);
-        }
-      widget->walkThrough(widget->setOptions);
-    }
-}
+          sprintf(Variable, "%s", Buffer);
+        }
+      widget->walkThrough(widget->setOptions, 0);
+    }
+}
+
 /**
    \brief Maps Confugurations to the Options.
    \param widget which widget downwards
-   \param variableName the name of the Variable that should be set up.
-   \param variableValue the Value of the Variable that should be set up
-   \param depth the depth of the local Widget
-*/
-void OrxonoxGuiExec::readFileText (Widget* widget, char* variableName, char* variableValue, int depth)
-{
-  if (widget->isOption >= 1 && widget->isOption <= 3)
-    {
-      if (!strcmp (static_cast<Option*>(widget)->label, variableName))
-        static_cast<Option*>(widget)->value = atoi(variableValue);
-    }
-  else if (widget->isOption == 5)
-    {
-       if (!strcmp (static_cast<Option*>(widget)->label, variableName))
-        static_cast<OptionLabel*>(widget)->setValue(variableValue);
-    }
-  if (widget->isOption < 0)
-    {
-      readFileText (static_cast<Packer*>(widget)->down, variableName, variableValue, depth+1);
-    } 
-
-  if (widget->next != NULL && depth !=0)
-    readFileText (widget->next, variableName, variableValue, depth);
+   \param varInfo Information about the Variable to read
+*/
+void OrxonoxGuiExec::readFileText(Widget* widget, void* varInfo)
+{
+  VarInfo* info =(VarInfo*)varInfo;
+  if(widget->title && !strcmp(widget->title, info->variableName))
+    {
+      PRINT(3)("Located Option %s.\n", widget->title);
+      if(widget->isOption >= 1 && widget->isOption <= 3)
+        {
+          static_cast<Option*>(widget)->value = atoi(info->variableValue);
+          static_cast<Option*>(widget)->redraw(); //!< \todo change this to setValue.
+        }
+      else if(widget->isOption == 5)
+        static_cast<OptionLabel*>(widget)->setValue(info->variableValue);
+    }
 }
 
@@ -254 +275 @@
    \param depth The Depth of the search seen from the first widget we searched from.
    \returns The Widget that holds the Group, or the NULL if the Group wasn't found.
+
+   \todo do this in gui-gtk.
 */
 Widget* OrxonoxGuiExec::locateGroup(Widget* widget, char* groupName, int depth)
@@ -260 +283 @@
 
   // removes the trailing and ending [ ].
-  if (!strncmp (groupName, "[", 1))
+  if(!strncmp(groupName, "[", 1))
     {
       groupName = groupName+1;
@@ -266 +289 @@
     }
 
-  if (widget->isOption < 0)
-    {
-      if (static_cast<Packer*>(widget)->getGroupName() && !strcmp(groupName, static_cast<Packer*>(widget)->getGroupName()))
+  if(widget->isOption < 0)
+    {
+      if(static_cast<Packer*>(widget)->getGroupName() && !strcmp(groupName, static_cast<Packer*>(widget)->getGroupName()))
         {
           return widget;
@@ -274 +297 @@
       else
         {
-          if ((tmp = locateGroup (static_cast<Packer*>(widget)->down, groupName, depth+1)) != NULL)
+          if((tmp = locateGroup(static_cast<Packer*>(widget)->down, groupName, depth+1)) != NULL)
             return tmp;
         }
     } 
   
-  if (widget->next != NULL && depth != 0)
-    {
-      if ((tmp = locateGroup (widget->next, groupName, depth)) != NULL)
+  if(widget->next != NULL && depth != 0)
+    {
+      if((tmp = locateGroup(widget->next, groupName, depth)) != NULL)
         return tmp;
     }
@@ -289 +312 @@
 #ifdef HAVE_GTK2
 /**
-   \brief Starts ORXONOX. (not really implemented yet, but the function is there.\n
-   This is a Signal and can be executed through Widget::signal_connect
+   \brief Starts ORXONOX.(not really implemented yet, but the function is there.\n
    \param widget the widget that executed the start command
    \param data additional data
-*/
-gint startOrxonox (GtkWidget *widget, Widget* data)
-{
+
+   This is a Signal and can be executed through Widget::signal_connect
+*/
+int OrxonoxGuiExec::startOrxonox(GtkWidget* widget, void* data)
+{
+  OrxonoxGuiExec* exec =(OrxonoxGuiExec*)data;
+  if(exec->shouldsave())
+    exec->writeToFile(Window::mainWindow);
   cout << "Starting Orxonox" <<endl;
-}
+  gtk_main_quit();
+  system("cd ..;./orxonox"); //!< \todo fix this. should execute orxonox for real(coded not over the shell)
+}
+
+/**
+   \brief Starts ORXONOX.(not really implemented yet, but the function is there.\n
+   \param widget the widget that executed the start command
+   \param data additional data
+
+   This is a Signal and can be executed through Widget::signal_connect
+*/
+int OrxonoxGuiExec::quitOrxonox(GtkWidget* widget, void* data)
+{
+  OrxonoxGuiExec* exec =(OrxonoxGuiExec*)data;
+  PRINT(3)( "Quitting Orxonox %p\n", exec);
+  if(exec->shouldsave())
+    exec->writeToFile(Window::mainWindow);
+  gtk_main_quit();
+}
+#else /* HAVE_GTK2 */
+/**
+   \brief Starts ORXONOX.(not really implemented yet, but the function is there.\n
+   \param widget the widget that executed the start command
+   \param data additional data
+*/
+int OrxonoxGuiExec::startOrxonox(void* widget, void* data)
+{
+  OrxonoxGuiExec* exec =(OrxonoxGuiExec*)data;
+  PRINT(3)("Starting Orxonox\n");
+  if(exec->shouldsave())
+    exec->writeToFile(Window::mainWindow);
+  system("cd ..;./orxonox"); //!< \todo fix this. should execute orxonox for real(coded not over the shell)
+}
+/**
+   \brief Quits ORXONOX.
+   \param widget the widget that executed the Quit command
+   \param data additional data
+
+   This is a Signal and can be executed through Widget::signal_connect
+*/
+int OrxonoxGuiExec::quitOrxonox(void* widget, void* data)
+{
+  OrxonoxGuiExec* exec =(OrxonoxGuiExec*)data;
+  PRINT(3)("Quiting Orxonox");
+  if(exec->shouldsave())
+    exec->writeToFile(Window::mainWindow);
+}
+
 #endif /* HAVE_GTK2 */

orxonox/branches/trackManager/src/gui/orxonox_gui_exec.h

@@ -24 +24 @@
   char* configFile;            //!< The name of the .orxonox.conf(ig)-file.
   FILE* CONFIG_FILE;           //!< Filehandler for reading and writing.
+  
+  //! A struct that holds informations about variables.
+  struct VarInfo
+  {
+    char* variableName;        //!< The Name of this variable;
+    char* variableValue;       //!< The Value this variable gets.
+  };
 
  public:
-  OrxonoxGuiExec (Window* orxonoxGUI);
-  ~OrxonoxGuiExec ();
+  OrxonoxGuiExec(void);
+  ~OrxonoxGuiExec(void);
   
-  Widget* getWidget ();
+  Widget* getWidget(void);
   
-  void setFilename (char* filename);
-  int shouldsave ();
-  void writeToFile (Widget* widget);
-  void writeFileText (Widget* widget, int depth);
-  void readFromFile (Widget* widget);
-  void readFileText (Widget* widget, char* variableName, char* variableValue, int depth);
+  void setFilename(char* filename);
+  char* getConfigFile(void);
+  int shouldsave(void);
+  void writeToFile(Widget* widget);
+  void writeFileText(Widget* widget, int depth);
+  void readFromFile(Widget* widget);
+  static void readFileText(Widget* widget, void* varInfo);
   Widget* locateGroup(Widget* widget, char* groupName, int depth);
 
+#ifdef HAVE_GTK2
+  static int startOrxonox(GtkWidget *widget, void* data);
+  static int quitOrxonox(GtkWidget *widget, void* data);
+#else /* HAVE_GTK2 */
+  static int startOrxonox(void* widget, void* data);
+  static int quitOrxonox(void* widget, void* data);
+#endif /* HAVE_GTK2 */
 };
-#ifdef HAVE_GTK2
-  gint startOrxonox (GtkWidget *widget, Widget* data);
-#endif /* HAVE_GTK2 */
+
+
+struct HashTable
+{
+  char* name;
+  char* value;
+  HashTable* next;
+};
+
+
 #endif /* _ORXONOX_GUI_EXEC_H */

orxonox/branches/trackManager/src/gui/orxonox_gui_flags.cc

@@ -28 +28 @@
 /**
    \brief Creates the Flags-Frame
-   \param widget The Widget from which the data will be parsed
 */
-OrxonoxGuiFlags::OrxonoxGuiFlags (Widget* widget)
+OrxonoxGuiFlags::OrxonoxGuiFlags(void)
 {
-  flagText = (char*) malloc (1024);
+  this->flagsFrame = new Frame("Orxonox-Startup-Flags:");
+  this->flagsBox = new Box('v');
 
-  flagsFrame = new Frame ("Orxonox-Startup-Flags:");
-  flagsBox = new Box ('v');
+  this->flagsLabel = new Label();
+  this->flagsLabel->setSize(260,60);
+  this->flagsBox->fill(flagsLabel);
+  this->shortFlags = new CheckButton("shortFlags");
+  this->flagsBox->fill(shortFlags);
 
-  flagsLabel = new Label ();
-  flagsLabel->setSize (260,60);
-  flagsBox->fill (flagsLabel);
-  shortFlags = new CheckButton ("shortFlags");
-  flagsBox->fill (shortFlags);
+  this->flagsFrame->fill(flagsBox);
+}
 
-  flagsFrame->fill (flagsBox);
+/**
+   \brief Destructs the Flags-stuff
+*/
+OrxonoxGuiFlags::~OrxonoxGuiFlags(void)
+{
+  // nothing to do here
 }
 
@@ -50 +55 @@
    \returns Frame that holds the Flagtext.
 */
-Widget* OrxonoxGuiFlags::getWidget ()
+Widget* OrxonoxGuiFlags::getWidget(void)
 {
-  return flagsFrame;
+  return this->flagsFrame;
 }
 
@@ -59 +64 @@
    \param widget the Widget from which on to scan for deeper Options and their settings.
 */
-void OrxonoxGuiFlags::setTextFromFlags (Widget* widget)
+void OrxonoxGuiFlags::setTextFromFlags(Widget* widget)
 {
-  sprintf (flagText, "");
-  strcat (flagText, "orxonox");
-  FlagsText (widget);
-  flagsLabel->setText (flagText);
+  FlagInfo flagInfo;
+  flagInfo.shortFlags = this->shortFlags;
+  flagInfo.flagsLabel = this->flagsLabel;
+
+  this->flagsLabel->ereaseText();
+  this->flagsLabel->appendText("orxonox");
+  widget->walkThrough(OrxonoxGuiFlags::flagsText, &flagInfo, 0);
+  //  flagsLabel->setTitle(flagText);
 }
 
@@ -70 +79 @@
     \brief this actually sets the flagtext, and appends it to flagText
     \param widget like OrxonoxGuiFlags::setTextFromFlags(widget)
+    \param flagInfo Information aboout the Flag that should be updated.
 */
-void OrxonoxGuiFlags::FlagsText(Widget* widget)
+void OrxonoxGuiFlags::flagsText(Widget* widget, void* flagInfo)
 {
-  if (widget->isOption >= 1)
-    if  (static_cast<Option*>(widget)->value != static_cast<Option*>(widget)->defaultValue && (static_cast<Option*>(widget)->flagName || static_cast<Option*>(widget)->flagNameShort ))
+  FlagInfo* info =(FlagInfo*)flagInfo;
+  if(widget->isOption >= 1)
+    if (static_cast<Option*>(widget)->value != static_cast<Option*>(widget)->defaultValue )
       {
-        if (shortFlags->isActive())
+        if(info->shortFlags->isActive() && static_cast<Option*>(widget)->flagNameShort)
           {
-            strcat (flagText, " -");
-            strcat (flagText, static_cast<Option*>(widget)->flagNameShort);
+            info->flagsLabel->appendText(" -");
+            info->flagsLabel->appendText(static_cast<Option*>(widget)->flagNameShort);
           }
-        else
+        else if(!info->shortFlags->isActive() && static_cast<Option*>(widget)->flagName)
           {
-            strcat (flagText, " --");
-            strcat (flagText, static_cast<Option*>(widget)->flagName);
+            info->flagsLabel->appendText(" --");
+            info->flagsLabel->appendText(static_cast<Option*>(widget)->flagName);
           }
-        if (static_cast<Option*>(widget)->isOption == 2)
+
+        if(static_cast<Option*>(widget)->isOption == 2)
           {
-            sprintf (flagText, "%s=%i", flagText, static_cast<Option*>(widget)->value);
+            info->flagsLabel->appendText("=");
+            info->flagsLabel->appendInt(static_cast<Option*>(widget)->value);
           }
       }
-  switch (widget->isOption)
-    {
-    case -1:
-      FlagsText (static_cast<Container*>(widget)->down);
-      break;
-    case -2:
-      FlagsText (static_cast<Box*>(widget)->down);
-      break;
-    } 
-  
-  if (widget->next != NULL)
-    FlagsText (widget->next);
 }

orxonox/branches/trackManager/src/gui/orxonox_gui_flags.h

@@ -17 +17 @@
   CheckButton* shortFlags;    //!< CheckButton to change the display of short and long flags \todo show long if long not availible...
   Label* flagsLabel;          //!< The Label of the Flags
-  char* flagText;             //!< The Text of the Label. \todo Delete when Object is destroyed.
 
  public:
-  OrxonoxGuiFlags (Widget* widget);
-  ~OrxonoxGuiFlags ();
+  OrxonoxGuiFlags(void);
+  ~OrxonoxGuiFlags(void);
 
-  void setTextFromFlags (Widget* widget);
-  void OrxonoxGuiFlags::FlagsText(Widget* widget);
+  void setTextFromFlags(Widget* widget);
+  static void flagsText(Widget* widget, void* flagInfo);
   
-  Widget* getWidget ();
+  struct FlagInfo
+  {
+    CheckButton* shortFlags;
+    Label* flagsLabel;
+  };
+  Widget* getWidget(void);
 };
 #endif /* _ORXONOX_GUI_FLAGS_H */

orxonox/branches/trackManager/src/gui/orxonox_gui_gtk.cc

@@ -34 +34 @@
 // temporarily.
 #include "orxonox_gui_flags.h"
-#include "orxonox_gui_exec.h"
 extern Window* orxonoxGUI;
 extern OrxonoxGuiFlags* flags;
-extern OrxonoxGuiExec* exec;
-
-#ifdef HAVE_GTK2
+
 /**
    \brief Initializes the Guis GTK-stuff.
@@ -45 +42 @@
    \param argv The Argument strings.
 */
-bool initGTK(int argc, char *argv[])
-{
-  gtk_init (&argc, &argv);
+bool initGUI(int argc, char *argv[])
+{
+#ifdef HAVE_GTK2
+#ifdef HAVE_GTHREAD
+  PRINTF(3)("Initializing the ThreadSystem of the GUI\n");
+  g_thread_init(NULL);
+  gdk_threads_init();
+#endif /* HAVE_GTHREAD */
+  gtk_init(&argc, &argv);
   gtk_rc_parse( "rc" );
-}
-
-/**
-   \brief enters the GTK-main-loop
-*/
-bool mainloopGTK(void)
-{
+#endif /* HAVE_GTK2 */
+}
+
+
+/**
+   \brief enters the GUI's main-loop
+*/
+bool mainloopGUI(void)
+{
+#ifdef HAVE_GTK2
+  gdk_threads_enter();
   gtk_main();
-}
-#endif /* HAVE_GTK2 */
+  gdk_threads_leave();
+  delete Window::mainWindow;
+#else /* HAVE_GTK2 */
+  char boolAns = 'y';
+  char ans[10]; 
+  while(true)
+    {
+      PRINT(0)(" Listing all the Orxonox Options: \n");
+      PRINT(0)("  #############################\n");
+      Window::mainWindow->walkThrough(Widget::listOptionsAndGroups, 1);
+      
+      PRINT(0)("\nDo you want change any of the above values now? [Yn] ");
+      cin >>boolAns ;
+      if (boolAns =='n' || boolAns=='N')
+        break;
+      
+      PRINT(0)("\n Listing all groups\n");
+      PRINT(0)("  #################\n");
+      int groupCount = 0;
+      Window::mainWindow->walkThrough(Widget::listGroups, &groupCount, 1);
+      
+      PRINT(0)("\nIn which Group? [1-%d] ", groupCount);
+      Packer* group;
+      while(true)
+        {
+          cin >> ans;
+          int ansIp = atoi(ans);
+          if (ansIp <= groupCount)
+            {
+              group = static_cast<Packer*>(Window::mainWindow->findGroupByNumber(&ansIp, 1));
+              break;
+            }
+          else
+            PRINT(0)("\nChoose a smaler Number please: [1-%d] ", groupCount);
+        }
+      PRINT(0)("\n\nGroup: [%s]\n\n", group->groupName);
+      int optionCount = 0;
+      group->walkThrough(Widget::listOptions, &optionCount, 0);
+      PRINT(0)("\nWhich Option? [1-%d] ", optionCount);
+      Option* option;
+      while(true)
+        {
+          cin >> ans;
+          int ansIp = atoi(ans);
+          if (ansIp <= groupCount)
+            {
+              option = static_cast<Option*>(group->findOptionByNumber(&ansIp, 0));
+              break;
+            }
+          else
+            PRINT(0)("\nChoose a smaler Number please: [1-%d] ", optionCount);
+        }
+      PRINT(0)("\n\n:: %s ::\n", option->title);
+      option->changeOption();
+      
+      // here follows the rest.... this will be nasty.
+      //! \todo move this into the gui-gtk-file
+      //! \todo finish it.
+    }
+#endif /* HAVE_GTK2 */
+  
+}
+
+
+//////////////////////////////
+/// DEFINING WIDGET-CLASES ///
+//////////////////////////////
 
 /* WIDGET */
@@ -66 +138 @@
    This is still pretty crappy.
 */
-Widget::~Widget()
-{
-  //  cout << "hiding: " <<this->label <<"\n";
-  this->hide();
-  //  cout << "check if Packer: "<<this->label <<"\n";
-  if (this->isOption < 0)
-    {
-      //  cout << "get Down "<<this->label <<"\n";
-      static_cast<Packer*>(this)->down->~Widget();
-    }
-  //  cout << "next != NULL?: " <<this->label <<"\n";
-  if (this->next != NULL)
-    this->next->~Widget();
-  cout << "delete Widget: " <<this->label <<"\n";
-  //  delete widget;
+Widget::~Widget(void)
+{
+  this->destroy();
 }
 
@@ -87 +147 @@
    Initializes the next Pointer and the other Widget-specific Defaults.
 */
-void Widget::init()
+void Widget::init(void)
 {
   next = NULL;
-  label = NULL;
+  this->title = NULL;
   return;
 }
 
 /**
+   \brief Destroys a Widget 
+*/
+void Widget::destroy(void)
+{
+  if (this->title)
+    {
+      delete []this->title;
+    }
+  
+  PRINTF(4)("deleting the Widget part.\n");
+
+  PRINTF(4)("deleting recursively\n");
+
+  // deleting next item if existent
+  if (this->next)
+    delete this->next;
+  this->next = NULL;
+
+  //!  \todo not hiding widget, deleting.
+  //  this->hide();
+  //  delete this->widget;
+}
+
+/**
    \brief makes the widget visible.
 */
-void Widget::show()
-{
-#ifdef HAVE_GTK2
-  gtk_widget_show (this->widget);
+void Widget::show(void)
+{
+#ifdef HAVE_GTK2
+  gtk_widget_show(this->widget);
 #endif /* HAVE_GTK2 */
 }
@@ -107 +191 @@
    \brief hides the widget.
 */
-void Widget::hide()
-{
-#ifdef HAVE_GTK2
-  gtk_widget_hide (this->widget);
+void Widget::hide(void)
+{
+#ifdef HAVE_GTK2
+  gtk_widget_hide(this->widget);
 #endif /* HAVE_GTK2 */
 }
@@ -122 +206 @@
 {
 #ifdef HAVE_GTK2
-  gtk_widget_set_usize (this->widget, width, height);
-#endif /* HAVE_GTK2 */
-}
-
-#ifdef HAVE_GTK2
-/** 
-    \brief Connect any signal to any given Sub-widget
-*/
-gulong Widget::connectSignal (char* event, gint (*signal)(GtkWidget*, GdkEvent*, void *))
-{
-  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), NULL);
-}
-
-/**
-   \brief Connect a signal with additionally passing the whole Object
-*/
-gulong Widget::connectSignal (char* event, gint (*signal)( GtkWidget*, Widget *))
-{
-  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), this);
-}
-
-/**
-   \brief Connect a signal with additionally passing a whole external Object
-*/
-gulong Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEvent*, void *))
-{
-  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), extObj);
-}
-
-/**
-   \brief Connect a signal with additionally passing a whole external Object
-*/
-gulong Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEventKey*, void *))
-{
-  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), extObj);
-}
-
-void Widget::disconnectSignal (gulong signalID)
-{
-  g_signal_handler_disconnect (G_OBJECT (this->widget), signalID);
-}
-#endif /* HAVE_GTK2 */
+  gtk_widget_set_usize(this->widget, width, height);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief searches through widgets for a Name.
+*/
+Widget* Widget::findWidgetByName(char* name, unsigned int depth)
+{
+
+  if (this->title && !strcmp(this->title, name))
+    return this;
+
+  if (this->isOption < 0 && static_cast<Packer*>(this)->down)
+    {
+      Widget* tmp = static_cast<Packer*>(this)->down->findWidgetByName(name, depth+1);
+      if (tmp)
+        return tmp;
+    }
+  
+  if (depth>0 && this->next)
+    return this->next->findWidgetByName(name, depth);
+
+  return NULL;
+}
 
 /**
    \brief Moves through all the Widgets downwards from this and executes the function on them.
-   \param Function must be of type void and takes a Widget* as an Input. 
-*/
-void Widget::walkThrough (void (*function)(Widget*))
+   \param function must be of type void and takes a Widget* as an Input. 
+   \param depth the current depth. if > 0 then the next Widget will also be walked through.
+*/
+void Widget::walkThrough(void(*function)(Widget*), unsigned int depth)
 {
   function(this);
   if (this->isOption < 0)
     {
-      static_cast<Packer*>(this)->down->walkThrough (function);
+      static_cast<Packer*>(this)->down->walkThrough(function, depth+1);
     } 
 
-  if (this->next != NULL)
-    this->next->walkThrough(function);
+  if (this->next && depth != 0)
+    this->next->walkThrough(function, depth);
+}
+
+/**
+   \brief Moves through all the Widgets downwards from this and executes the function on them.
+   \param function must be of type void and takes a Widget* as an Input.
+   \param data Additional Data you want to pass to the function.
+   \param depth the current depth. if > 0 then the next Widget will also be walked through.
+*/
+void Widget::walkThrough(void(*function)(Widget*, void*), void* data, unsigned int depth)
+{
+  function(this, data);
+  if (this->isOption < 0)
+    {
+      static_cast<Packer*>(this)->down->walkThrough(function, data, depth+1);
+    }
+  if (this->next && depth != 0)
+    this->next->walkThrough(function, data, depth);
 }
 
 /** 
-    \brief This is for listing the option of "widget"
+    \brief This is for listing the options of "widget"
     \param widget specifies the widget that should be listed
 */
-void Widget::listOptions (Widget* widget)
+void Widget::listOptionsAndGroups(Widget* widget)
 {
   if (widget->isOption < 0 && static_cast<Packer*>(widget)->groupName)
     cout << "[" << static_cast<Packer*>(widget)->groupName << "]\n";
   if (widget->isOption >= 1 && widget->isOption <= 3)
-    cout << "  " << static_cast<Option*>(widget)->label <<" is : " << static_cast<Option*>(widget)->value <<endl;
+    cout << "  " << static_cast<Option*>(widget)->title <<" is : " << static_cast<Option*>(widget)->value <<endl;
   else if (widget->isOption == 5)
-    cout << "  " << static_cast<Option*>(widget)->label <<" is : " << static_cast<OptionLabel*>(widget)->cValue <<endl;
-}
-
+    cout << "  " << static_cast<Option*>(widget)->title <<" is : " << static_cast<OptionLabel*>(widget)->cValue <<endl;
+}
+
+/** 
+    \brief This is for listing the options of "widget"
+    \param widget specifies the widget that should be listed
+*/
+void Widget::listOptions(Widget* widget)
+{
+  if (widget->isOption >= 1 && widget->isOption <= 3)
+    cout << "  " << static_cast<Option*>(widget)->title <<" is : " << static_cast<Option*>(widget)->value <<endl;
+  else if (widget->isOption == 5)
+    cout << "  " << static_cast<Option*>(widget)->title <<" is : " << static_cast<OptionLabel*>(widget)->cValue <<endl;
+}
+
+/** 
+    \brief This is for listing the options of "widget"
+    \param widget specifies the widget that should be listed
+    \param data A Counter, that always knows how many Options have been found yet.
+*/
+void Widget::listOptions(Widget* widget, void* data)
+{
+  
+  if (widget->isOption >= 1 && widget->isOption <= 3)
+    {
+      int* count =(int*)data;
+      *count = *count +1;
+      cout << *count << ": " << static_cast<Option*>(widget)->title <<" is : " << static_cast<Option*>(widget)->value <<endl;
+    }
+  else if (widget->isOption == 5)
+    {
+      int* count =(int*)data;
+      *count = *count +1;
+      cout << *count << ": " << static_cast<Option*>(widget)->title <<" is : " << static_cast<OptionLabel*>(widget)->cValue <<endl;
+    }
+}
+
+/** 
+    \brief Finds an Option by a given number(the n'th option found away from this Widget)
+    \param number The Count of options to wait(by reference)
+    \param depth The depth of the sarch. if 0 it will not search next pointer
+    
+    \todo should return Option* would be much sexier.
+*/
+Widget* Widget::findOptionByNumber(int* number, unsigned int depth)
+{
+  if (isOption > 0)
+    {
+      --*number;
+      if (*number <= 0)
+        {
+          return this;
+        }
+    }
+  if (this->isOption < 0 && static_cast<Packer*>(this)->down)
+    {
+      Widget* tmp = static_cast<Packer*>(this)->down->findOptionByNumber(number, depth+1);
+      if (tmp)
+        return tmp;
+    }
+  if (depth>0 && this->next)
+    return this->next->findOptionByNumber(number, depth);
+
+  return NULL;
+}
+
+/** 
+    \brief This is for listing the groups of "widget"
+    \param widget specifies the widget that should be listed
+*/
+void Widget::listGroups(Widget* widget)
+{
+  if (widget->isOption < 0 && static_cast<Packer*>(widget)->groupName)
+    cout << "[" << static_cast<Packer*>(widget)->groupName << "]\n";
+}
+
+/** 
+    \brief This is for listing the Groups of "widget". It also displays the n'th number found.
+    \param widget specifies the widget that should be listed
+    \param data the Counter, that will show the number(this function will raise it by one if a Group is fount.
+*/
+void Widget::listGroups(Widget* widget, void* data)
+{
+  if (widget->isOption < 0 && static_cast<Packer*>(widget)->groupName)
+    {
+      int* count =(int*)data;
+      *count = *count +1;
+      cout << *count <<": [" << static_cast<Packer*>(widget)->groupName << "]\n";
+    }
+}
+
+/** 
+    \brief Finds a Group by a given number(the n'th Group found away from this Widget)
+    \param number The Count of options to wait(by reference)
+    \param depth The depth of the sarch. if 0 it will not search next pointer
+*/
+Widget* Widget::findGroupByNumber(int* number, unsigned int depth)
+{
+  if (isOption < 0 && static_cast<Packer*>(this)->groupName)
+    {
+      --*number;
+      if (*number <= 0)
+        {
+          return this;
+        }
+    }
+  if (this->isOption < 0 && static_cast<Packer*>(this)->down)
+    {
+      Widget* tmp = static_cast<Packer*>(this)->down->findGroupByNumber(number, depth+1);
+      if (tmp)
+        return tmp;
+    }
+  if (depth>0 && this->next)
+    return this->next->findGroupByNumber(number, depth);
+
+  return NULL;
+}
+ 
 /** 
     \brief This is for setting the option of "widget"
     \param widget specifies the widget that should be set.
 */
-void Widget::setOptions (Widget* widget)
+void Widget::setOptions(Widget* widget)
 {
   if (widget->isOption >= 1)
-    static_cast<Option*>(widget)->redraw();// <<" is : " << static_cast<Option*>(this)->value <<endl;
-}
-
-#ifdef HAVE_GTK2
+    static_cast<Option*>(widget)->redraw();
+}
+
+/**
+   \brief Walks through all the Flags given at startuptime.
+*/
+void Widget::flagCheck(Widget* widget, void* flagName)
+{
+  if (widget->isOption>=1)
+    {      
+      Option* option =(Option*)widget;
+      char* name =(char*)flagName;
+      char* value = NULL;
+      bool found = false;
+      // check if long flag matches
+      if ((option->flagName && strlen(name)>2 && !strncmp(name+2, option->flagName, strlen(option->flagName)) &&(name[strlen(option->flagName)+2] == '\0' || name[strlen(option->flagName)+2] == '=') ))
+        {
+          found = true;
+          if (name[strlen(option->flagName)+2] == '=')
+            {
+              value = name+strlen(option->flagName)+3;
+            }
+        }
+      else if (option->flagNameShort && strlen(name)>1 && !strncmp(name+1, option->flagNameShort, strlen(option->flagNameShort))&&(name[strlen(option->flagNameShort)+1] == '\0' || name[strlen(option->flagNameShort)+1] == '=')) // check if short flag matches
+        {
+          found = true;
+          if (name[strlen(option->flagNameShort)+1] == '=')
+            {
+              value = name+strlen(option->flagNameShort)+2;
+            }     
+        }
+
+      if (found)
+        {
+          PRINT(3)("found matching Flag %s\n", name);
+          if (value)
+            {
+              PRINT(3)("with Value %s\n", value);
+              option->value = atoi(value);
+            }
+          else
+            {
+              option->value = !option->defaultValue;
+            }
+          option->redraw();
+        }
+
+    }
+}
+
+#ifdef HAVE_GTK2
+/** 
+    \brief Connect any signal to any given Sub-widget
+*/
+gulong Widget::connectSignal(char* event, gint(*signal)(GtkWidget*, GdkEvent*, void *))
+{
+  return g_signal_connect(G_OBJECT(this->widget), event, G_CALLBACK(signal), NULL);
+}
+
+/**
+   \brief Connect a signal with additionally passing the whole Object
+*/
+gulong Widget::connectSignal(char* event, gint(*signal)( GtkWidget*, Widget *))
+{
+  return g_signal_connect(G_OBJECT(this->widget), event, G_CALLBACK(signal), this);
+}
+
+/**
+   \brief Connect a signal with additionally passing a whole external Object
+*/
+gulong Widget::connectSignal(char* event, void* extObj, gint(*signal)(GtkWidget*, GdkEvent*, void *))
+{
+  return g_signal_connect(G_OBJECT(this->widget), event, G_CALLBACK(signal), extObj);
+}
+
+/**
+   \brief Connect a signal with additionally passing a whole external Object
+*/
+gulong Widget::connectSignal(char* event, void* extObj, gint(*signal)(GtkWidget*, void *))
+{
+  return g_signal_connect(G_OBJECT(this->widget), event, G_CALLBACK(signal), extObj);
+}
+
+/**
+   \brief Connect a signal with additionally passing a whole external Object
+*/
+gulong Widget::connectSignal(char* event, void* extObj, gint(*signal)(GtkWidget*, GdkEventKey*, void *))
+{
+  return g_signal_connect(G_OBJECT(this->widget), event, G_CALLBACK(signal), extObj);
+}
+
+void Widget::disconnectSignal(gulong signalID)
+{
+  g_signal_handler_disconnect(G_OBJECT(this->widget), signalID);
+}
 
 /**
@@ -213 +504 @@
    \param nothing nothin.
 */
-gint Widget::doNothingSignal (GtkWidget *widget, GdkEvent* event, void* nothing)
+gint Widget::doNothingSignal(GtkWidget *widget, GdkEvent* event, void* nothing)
 {
 }
@@ -228 +519 @@
    Sets the down-pinter to NULL and other PackerSpecific-values to their defaults.
 */
-void Packer::init (void)
-{
-  down = NULL;
-  groupName = NULL;
+void Packer::init(void)
+{
+  this->down = NULL;
+  this->groupName = NULL;
 
 
@@ -239 +530 @@
 
 /**
+   \brief Destroys a Packer.
+*/
+void Packer::destroy(void)
+{ 
+  PRINTF(4)("deleting the Packer part.\n");
+  
+  if (this->groupName)
+    delete []this->groupName;
+
+  //deleting recursively.
+  if (this->down)
+    delete this->down;
+  this->down = NULL;
+
+  static_cast<Widget*>(this)->destroy();
+}
+
+/**
    \brief Sets the group name under which all the lower widgets of this will be saved.
    \param name The name of the group.
 */
-void Packer::setGroupName (char* name)
-{
-  if (groupName)
-    delete groupName;
-  groupName = new char [strlen(name)+1];
-  strcpy(groupName, name);
+void Packer::setGroupName(char* name)
+{
+  if (this->groupName)
+    delete []this->groupName;
+  this->groupName = new char[strlen(name)+1];
+  strcpy(this->groupName, name);
 }
 
@@ -254 +563 @@
    \returns name The name of the group.
 */
-char* Packer::getGroupName (void)
-{
-  return groupName;
+char* Packer::getGroupName(void)
+{
+  return this->groupName;
 }
 
@@ -266 +575 @@
    sets the Container-Specific defaults.
 */
-void Container::init (void)
-{
-  isOption = -1;
+void Container::init(void)
+{
+  this->isOption = -1;
 
   static_cast<Packer*>(this)->init();
 
   return;
+}
+
+/**
+   \brief Destroys a Container.
+*/
+void Container::destroy(void)
+{ 
+  PRINTF(4)("deleting the Container part.\n");
+
+  static_cast<Packer*>(this)->destroy();
 }
 
@@ -281 +600 @@
    It does this by filling up the down pointer only if down points to NULL.
 */
-void Container::fill (Widget *lowerWidget)
+void Container::fill(Widget *lowerWidget)
 {
   if (this->down == NULL)
     {
 #ifdef HAVE_GTK2
-      gtk_container_add (GTK_CONTAINER (this->widget), lowerWidget->widget);
+      gtk_container_add(GTK_CONTAINER(this->widget), lowerWidget->widget);
 #endif /* HAVE_GTK2 */
       this->down = lowerWidget;
     }
   else
-    cout << "!!error!! You try to put more than one Widget into a Container. \nNot including this item.\nThis is only possible with Boxes.\n"<<endl;
-}
-
-// gtk_container_set_border_width (GTK_CONTAINER (widget), 5);
+    PRINTF(1)("!!error!! You try to put more than one Widget into a Container. \nNot including this item.\nThis is only possible with Boxes.\n");
+}
+
+// gtk_container_set_border_width(GTK_CONTAINER(widget), 5);
 
 /* WINDOW */
@@ -303 +622 @@
    \brief Adds a new Window Windows to the List of Windows.
    \param windowToAdd The Windows that should be added to the List
-   \todo this instead of windowToAdd (possibly)
+   \todo this instead of windowToAdd(possibly)
 */
 void Window::addWindow(Window* windowToAdd)
@@ -314 +633 @@
 
   Widget* tmpWindow = mainWindow;
-  while (tmpWindow->next)
+  while(tmpWindow->next)
     tmpWindow = tmpWindow->next;
   tmpWindow->next = windowToAdd;
@@ -322 +641 @@
       
 
-
 /**
    \brief Creating a new Window without a Name
 */
-Window::Window (void)
+Window::Window(void)
 {
   this->init();
@@ -335 +653 @@
    \param windowName the name the window should get.
 */
-Window::Window (char* windowName)
+
+Window::Window(char* windowName)
 {
   this->init();
-  this->setTitle (windowName);
+  this->setTitle(windowName);
+}
+
+/**
+   \brief Destructs a Window.
+*/
+Window::~Window(void)
+{
+  this->destroy();
 }
 
@@ -344 +671 @@
    \brief initializes a new Window
 */
-void Window::init()
+void Window::init(void)
 {
   if (!mainWindow)
@@ -354 +681 @@
 
 #ifdef HAVE_GTK2
-  widget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_policy (GTK_WINDOW(widget), TRUE, TRUE, TRUE);
+  widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_policy(GTK_WINDOW(widget), TRUE, TRUE, TRUE);
 #if !defined(__WIN32__)
-  //  gtk_window_set_decorated (GTK_WINDOW (widget), FALSE);
+  //  gtk_window_set_decorated(GTK_WINDOW(widget), FALSE);
 #endif 
-  gtk_container_set_border_width (GTK_CONTAINER (widget), 3);
-#endif /* HAVE_GTK2 */
+  gtk_container_set_border_width(GTK_CONTAINER(widget), 3);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief Destroys a Window.
+*/
+void Window::destroy(void)
+{ 
+  if (this->title)
+    PRINTF(3)("deleting the Window: %s\n", this->title);
+  else 
+    PRINTF(3)("deleting the Window.\n");
+  //  this->hide();
+  static_cast<Container*>(this)->destroy();
+  
 }
 
@@ -366 +707 @@
    \brief Shows all Widgets that are included within this->widget.
 */
-void Window::showall ()
-{
-  if (!isOpen)
-    {
-      //      printf ("showall\n");
-#ifdef HAVE_GTK2
-      gtk_widget_show_all  (widget);
+void Window::showall(void)
+{
+  if (!this->isOpen)
+    {
+      //      printf("showall\n");
+#ifdef HAVE_GTK2
+      gtk_widget_show_all(this->widget);
 #endif /* HAVE_GTK2 */ 
-     isOpen = true;
+     this->isOpen = true;
     }
   else
     {
-      //      printf ("showone\n");
-#ifdef HAVE_GTK2
-      gtk_widget_show (widget);
+      //      printf("showone\n");
+#ifdef HAVE_GTK2
+      gtk_widget_show(this->widget);
 #endif /* HAVE_GTK2 */
     }
@@ -389 +730 @@
    \param title title the Window should get.
 */
-void Window::setTitle (char* title)
-{
-  if (label)
-    delete []label;
-  label = new char[strlen(title)+1];
-  strcpy(label, title);
-#ifdef HAVE_GTK2
-  gtk_window_set_title (GTK_WINDOW (widget), title);
+void Window::setTitle(char* title)
+{
+  if (this->title)
+    delete []this->title;
+  this->title = new char[strlen(title)+1];
+  strcpy(this->title, title);
+#ifdef HAVE_GTK2
+  gtk_window_set_title(GTK_WINDOW(widget), title);
 #endif /* HAVE_GTK2 */
 }
@@ -403 +744 @@
    \brief opens up a Window and fixes the Focus to it
 */
-void Window::open()
+void Window::open(void)
 {
   if (this != mainWindow)
@@ -409 +750 @@
       isOpen = true;
 #ifdef HAVE_GTK2
-      gtk_widget_show_all(widget);
-      gtk_grab_add(widget);
+      gtk_widget_show_all(this->widget);
+      gtk_grab_add(this->widget);
 #endif /* HAVE_GTK2 */
     }
@@ -418 +759 @@
    \brief closes up a Window and removes the Focus from it
 */
-void Window::close()
+void Window::close(void)
 {
   if (this != mainWindow)
     {
-      isOpen = false;
-#ifdef HAVE_GTK2
-      gtk_grab_remove(widget);
-      gtk_widget_hide (widget);
-#endif /* HAVE_GTK2 */
-    }
-}
-
-#ifdef HAVE_GTK2
-/**
-   \brief opens up a window (not topmost Window).
+      this->isOpen = false;
+#ifdef HAVE_GTK2
+      gtk_grab_remove(this->widget);
+      gtk_widget_hide(this->widget);
+#endif /* HAVE_GTK2 */
+    }
+}
+
+#ifdef HAVE_GTK2
+/**
+   \brief opens up a window(not topmost Window).
    this is the Signal that does it. !!SIGNALS ARE STATIC!!
    \param widget the widget that did it.
@@ -438 +779 @@
    \param window the Window that should be opened
 */
-gint Window::windowOpen (GtkWidget *widget, GdkEvent* event, void* window)
+gint Window::windowOpen(GtkWidget *widget, GdkEvent* event, void* window)
 {
   static_cast<Window*>(window)->open();
@@ -444 +785 @@
 
 /**
-   \brief closes a window (not topmost Window).
+   \brief closes a window(not topmost Window).
    this is the Signal that does it. !!SIGNALS ARE STATIC!!
    \param widget the widget that did it!
@@ -450 +791 @@
    \param window the Window that should be closed
 */
-gint Window::windowClose (GtkWidget *widget, GdkEvent* event, void* window)
+gint Window::windowClose(GtkWidget *widget, GdkEvent* event, void* window)
 {
   static_cast<Window*>(window)->close();
 }
 
-/**
- * Quits the orxonox_GUI.
- * This can be called as a Signal and is therefor static
- \param widget The widget that called this function
- \param event the event that happened to execute this function
- \param data some data passed with the Signal
- */
-gint Window::orxonox_gui_quit (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-  if (exec->shouldsave())
-    exec->writeToFile (Window::mainWindow);
-
-  gtk_main_quit();
-  return FALSE;
-}
 #endif /* HAVE_GTK2 */
 
@@ -478 +804 @@
     \brief Creates a new Frame without a name
 */
-Frame::Frame (void)
+Frame::Frame(void)
 {
   this->init();
@@ -486 +812 @@
    \brief Creates a new Frame with name title
 */
-Frame::Frame (char* title)
+Frame::Frame(char* title)
 {
   this->init();
@@ -492 +818 @@
 }
 
+/**
+   \brief destrcucts a Frame
+*/
+Frame::~Frame(void)
+{
+  this->destroy();
+}
+
 /** 
     \brief Initializes a new Frame with default settings
 */
-void Frame::init()
+void Frame::init(void)
 {
   static_cast<Container*>(this)->init();
 
 #ifdef HAVE_GTK2
-  widget = gtk_frame_new ("");
-  gtk_container_set_border_width (GTK_CONTAINER (widget), 3);
-#endif /* HAVE_GTK2 */
+  this->widget = gtk_frame_new("");
+  gtk_container_set_border_width(GTK_CONTAINER(this->widget), 3);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief Destroys a Frame.
+*/
+void Frame::destroy(void)
+{ 
+  if (this->title)
+    PRINTF(3)("deleting the Frame: %s\n", this->title);
+  else 
+    PRINTF(3)("deleting the Frame.\n");
+
+   static_cast<Container*>(this)->destroy();
 }
 
@@ -509 +856 @@
    \param title The title the Frame should get.
 */
-void Frame::setTitle (char* title)
-{
-  if (label)
-    delete []label;
-  label = new char[strlen(title)+1];
-  strcpy(label, title);
-#ifdef HAVE_GTK2
-  gtk_frame_set_label (GTK_FRAME (widget), title);
+void Frame::setTitle(char* title)
+{
+  if (this->title)
+    delete []this->title;
+  this->title = new char[strlen(title)+1];
+  strcpy(this->title, title);
+#ifdef HAVE_GTK2
+  gtk_frame_set_label(GTK_FRAME(widget), title);
 #endif /* HAVE_GTK2 */
 }
@@ -525 +872 @@
    \brief Creates a new EventBox with default settings.
 */
-EventBox::EventBox ()
+EventBox::EventBox(void)
 {
   this->init();
 }
+
 /**
    \brief Creates a new EventBox with name title
-   \param title title the Eventbox should get (only data-structure-internal)
-*/
-EventBox::EventBox (char* title)
+   \param title title the Eventbox should get(only data-structure-internal)
+*/
+EventBox::EventBox(char* title)
 {
   this->init();
@@ -540 +888 @@
 
 /**
+   \brief destructs an EventBox.
+*/
+EventBox::~EventBox(void)
+{
+  this->destroy();
+
+}
+
+/**
    \brief Initializes a new EventBox
 */
 void EventBox::init(void)
 {
-  isOption = -1;
+  this->isOption = -1;
 
   static_cast<Container*>(this)->init();
 
 #ifdef HAVE_GTK2
-  widget = gtk_event_box_new ();
-  gtk_container_set_border_width (GTK_CONTAINER (widget), 3);
-#endif /* HAVE_GTK2 */
-}
-
-/**
-   \brief Sets the Title of the EventBox (not implemented)
-   \param title Name the EventBox should get (only datastructure-internal).
-*/
-void EventBox::setTitle (char* title)
-{
-  if (label)
-    delete []label;
-  label = new char[strlen(title)+1];
-  strcpy(label, title);
+  this->widget = gtk_event_box_new();
+  gtk_container_set_border_width(GTK_CONTAINER(this->widget), 3);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief Destroys an EventBox.
+*/
+void EventBox::destroy(void)
+{ 
+  if (this->title)
+    PRINTF(3)("deleting the EventBox: %s\n", this->title);
+  else 
+    PRINTF(3)("deleting the EventBox.\n");
+
+  static_cast<Container*>(this)->destroy();
+}
+
+/**
+   \brief Sets the Title of the EventBox(not implemented)
+   \param title Name the EventBox should get(only datastructure-internal).
+*/
+void EventBox::setTitle(char* title)
+{
+  if (this->title)
+    delete []this->title;
+  this->title = new char[strlen(title)+1];
+  strcpy(this->title, title);
 }
 
@@ -571 +941 @@
    \brief Creates a new horizontal Box
 */
-Box::Box (void)
+Box::Box(void)
 {
   this->init('h');
@@ -580 +950 @@
    \param boxtype if 'v' the Box will be vertically, if 'h' the Box will be horizontally
 */
-Box::Box (char boxtype)
+Box::Box(char boxtype)
 {
   this->init(boxtype);
+}
+
+/**
+   \brief destructs a Box.
+*/
+Box::~Box(void)
+{
+  this->destroy();
 }
 
@@ -591 +969 @@
 void Box::init(char boxtype)
 {
-  isOption = -2;
+  this->isOption = -2;
 
   static_cast<Packer*>(this)->init();
@@ -597 +975 @@
   if (boxtype == 'v')
     {
-      widget = gtk_vbox_new (FALSE, 0);
+      this->widget = gtk_vbox_new(FALSE, 0);
     }
   else
     {
-      widget = gtk_hbox_new (FALSE, 0);
-    }
-#endif /* HAVE_GTK2 */
-
+      this->widget = gtk_hbox_new(FALSE, 0);
+    }
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief Destroys a Box.
+*/
+void Box::destroy(void)
+{ 
+  if (this->title)
+    PRINTF(3)("deleting the Box: %s\n", this->title);
+  else 
+    PRINTF(3)("deleting the Box.\n");
+
+  static_cast<Packer*>(this)->destroy();
 }
 
@@ -613 +1003 @@
     It does this by apending the first one to its down-pointer and all its following ones to the preceding next-pointer. The last one will receive a NULL pointer as Next
 */
-void Box::fill (Widget *lowerWidget)
-{
-#ifdef HAVE_GTK2
-  gtk_box_pack_start (GTK_BOX (this->widget), lowerWidget->widget, TRUE, TRUE, 0);
+void Box::fill(Widget* lowerWidget)
+{
+#ifdef HAVE_GTK2
+  gtk_box_pack_start(GTK_BOX(this->widget), lowerWidget->widget, TRUE, TRUE, 0);
 #endif /* HAVE_GTK2 */
   if (this->down == NULL)
@@ -624 +1014 @@
       Widget* tmp;
       tmp = this->down;
-      while (tmp->next != NULL)
+      while(tmp->next != NULL)
         {
           tmp = tmp->next;
@@ -632 +1022 @@
 }
 
-/* IMAGE */
-
-/**
-   \brief Creates a new Image
-   \param imagename the location of the Image on the Hard Disc
-*/
-Image::Image (char* imagename)
-{
-  this->init();
-  if (label)
-    delete []label;
-  label = new char[strlen(imagename)+1];
-  strcpy(label, imagename);
-
-#ifdef HAVE_GTK2
-  widget = gtk_image_new_from_file (imagename);
-#endif /* HAVE_GTK2 */
-}
-
-/** 
-    \brief Initializes a new Image
-*/
-void Image::init()
-{
-  isOption = 0;
-
-  static_cast<Widget*>(this)->init();
-}
-
+/**
+   \brief Sets the Title of a Box.
+   \param title the new Title to set.
+*/
+void Box::setTitle(char* title)
+{
+  if (this->title)
+    delete []this->title;
+  this->title = new char[strlen(title)+1];
+  strcpy(this->title, title);
+}
 
 /* OPTION */
@@ -668 +1040 @@
    sets all Option-Specific-Values to their defaults.
 */
-void Option::init()
-{
-  value = 0;
-  flagName = NULL;
-  flagNameShort = NULL;
-  saveable = false;
-  defaultValue = 0;
+void Option::init(void)
+{
+  this->value = 0;
+  this->flagName = NULL;
+  this->flagNameShort = NULL;
+  this->saveable = false;
+  this->defaultValue = 0;
 
   static_cast<Widget*>(this)->init();
 
   return;
+}
+
+/**
+   \brief Destroys an Option.
+*/
+void Option::destroy(void)
+{ 
+  PRINTF(4)("deleting the Option Part.\n");
+  if (this->flagName)
+    delete []this->flagName;
+  if (this->flagNameShort)
+    delete []this->flagNameShort;
+
+  static_cast<Widget*>(this)->destroy();
 }
 
@@ -685 +1071 @@
    !! Options will be saved if flagname is different from NULL !!
    \param flagname the Name that will be displayed in the output
-   \param defaultvalue the default Value for this Option (see definition of defaultvalue
-*/
-void Option::setFlagName (char* flagname, int defaultvalue)
-{
-  if (flagName)
-    delete flagName;
-  flagName = new char [strlen(flagname)+1];
-  strcpy(flagName, flagname);
-  defaultValue = defaultvalue;
-
-  //  cout << "Set Flagname of " << label << " to " << flagname << endl;
+   \param defaultvalue the default Value for this Option(see definition of defaultvalue
+*/
+void Option::setFlagName(char* flagname, int defaultvalue)
+{
+  if (this->flagName)
+    delete this->flagName;
+  this->flagName = new char [strlen(flagname)+1];
+  strcpy(this->flagName, flagname);
+  this->defaultValue = defaultvalue;
+
+  //  cout << "Set Flagname of " << this->title << " to " << flagname << endl;
 }
 
 /** 
-    \brief see Option::setFlagName (char* flagname, int defaultvalue)
+    \brief see Option::setFlagName(char* flagname, int defaultvalue)
     \param flagname the Name that will be displayed in the output
-    \param defaultvalue the default Value for this Option (see definition of defaultvalue
+    \param defaultvalue the default Value for this Option(see definition of defaultvalue
     \param flagnameshort a short flagname to be displayed in the output
 */
-void Option::setFlagName (char* flagname, char* flagnameshort,  int defaultvalue)
-{
-  if (flagName)
-    delete flagName;
-  flagName = new char [strlen(flagname)+1];
-  strcpy(flagName, flagname);
-
-  if (flagNameShort)
-    delete flagNameShort;
-  flagNameShort = new char [strlen(flagnameshort)+1];
-  strcpy(flagNameShort, flagnameshort);
-  defaultValue = defaultvalue;
-  //  cout << "Set Flagname of " << label << " to " << flagname << endl;
-}
+void Option::setFlagName(char* flagname, char* flagnameshort,  int defaultvalue)
+{
+  if (this->flagName)
+    delete []this->flagName;
+  this->flagName = new char [strlen(flagname)+1];
+  strcpy(this->flagName, flagname);
+
+  if (this->flagNameShort)
+    delete []this->flagNameShort;
+  this->flagNameShort = new char [strlen(flagnameshort)+1];
+  strcpy(this->flagNameShort, flagnameshort);
+  this->defaultValue = defaultvalue;
+  //  cout << "Set Flagname of " << this->title << " to " << flagname << endl;
+}
+
+/**
+   \brief Sets the saveable-state of the option to true.
+*/
+void Option::saveability(void)
+{
+  this->saveable = true;
+}
+
+/**
+   \brief Sets the saveable-state of the option.
+   \param isSaveable the saveable-state to set.
+*/
+void Option::saveability(bool isSaveable)
+{
+  this->saveable = isSaveable;
+}
+
+/**
+   \returns The saveable-state.
+*/
+bool Option::isSaveable(void)
+{
+  return this->saveable;
+}
+
+#ifdef HAVE_GTK2
+/** 
+    \brief Signal OptionChange writes the Value from the Slider to its Object-Database.
+    \param widget The widget(Slider) that has a changed Value
+    \param slider the Slider-Object that should receive the change.
+*/
+gint Option::OptionChange(GtkWidget *widget, Widget* option)
+{
+  static_cast<Option*>(option)->changeOption();
+  flags->setTextFromFlags(Window::mainWindow);  //// must be different !!!
+}
+#endif /* HAVE_GTK2 */
 
 
@@ -733 +1157 @@
 
 /**
+   \brief destructs a Button.
+*/
+Button::~Button(void)
+{
+  this->destroy();
+}
+
+/**
    \brief Initializes a new Button
 */
@@ -742 +1174 @@
 
 #ifdef HAVE_GTK2
-  widget = gtk_button_new_with_label ("");
-#endif /* HAVE_GTK2 */
+  widget = gtk_button_new_with_label("");
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief Destroys a Button.
+*/
+void Button::destroy(void)
+{ 
+  if (this->title)
+    PRINTF(3)("deleting the Label: %s\n", this->title);
+  else 
+    PRINTF(3)("deleting the Label.\n");
+
+  static_cast<Option*>(this)->destroy();
 }
 
@@ -750 +1195 @@
    \param title The name the Button should get
 */
-void Button::setTitle (char *title)
-{
-  if (label)
-    delete []label;
-  label = new char[strlen(title)+1];
-  strcpy(label, title);
-#ifdef HAVE_GTK2
-  gtk_button_set_label (GTK_BUTTON(widget), title);
+void Button::setTitle(char *title)
+{
+  if (this->title)
+    delete []this->title;
+  this->title = new char[strlen(title)+1];
+  strcpy(this->title, title);
+#ifdef HAVE_GTK2
+  gtk_button_set_label(GTK_BUTTON(widget), title);
 #endif /* HAVE_GTK2 */
 }
@@ -765 +1210 @@
    not implemented yet
 */
-void Button::redraw ()
-{
+void Button::redraw(void)
+{
+}
+
+/**
+   \brief Button can not be changed, optionChange is empty)
+
+   \todo Actions for non-GTK-mode
+*/
+void Button::changeOption(void)
+{
+  // This will possibly be used for ACTIONS !
 }
 
@@ -775 +1230 @@
    \param buttonname The name the CheckButton should display.
 */
-CheckButton::CheckButton (char* buttonname)
+CheckButton::CheckButton(char* buttonname)
 {
   this->init();
@@ -781 +1236 @@
 
 #ifdef HAVE_GTK2
-  this->connectSignal ("clicked", this->OptionChange);
-#endif /* HAVE_GTK2 */
+  this->connectSignal("clicked", this->OptionChange);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief destructs a CheckButton.
+*/
+CheckButton::~CheckButton(void)
+{
+  this->destroy();
 }
 
@@ -790 +1253 @@
 void CheckButton::init(void)
 {
-  isOption = 1;
+  this->isOption = 1;
 
   static_cast<Option*>(this)->init();
 
 #ifdef HAVE_GTK2
-  widget = gtk_check_button_new_with_label ("");
-#endif /* HAVE_GTK2 */
+  this->widget = gtk_check_button_new_with_label("");
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief Destroys a CheckButton.
+*/
+void CheckButton::destroy(void)
+{ 
+  if (this->title)
+    PRINTF(3)("deleting the CheckButton: %s\n", this->title);
+  else 
+    PRINTF(3)("deleting the CheckButton.\n");
+
+  static_cast<Option*>(this)->destroy();
 }
 
@@ -805 +1281 @@
 void CheckButton::setTitle(char* title)
 {
-  if (label)
-    delete []label;
-  label = new char[strlen(title)+1];
-  strcpy(label, title);
+  if (this->title)
+    delete []this->title;
+  this->title = new char[strlen(title)+1];
+  strcpy(this->title, title);
 #ifdef HAVE_GTK2
   gtk_button_set_label(GTK_BUTTON(widget), title);
@@ -814 +1290 @@
 }
 
-bool CheckButton::isActive()
+bool CheckButton::isActive(void)
 {
 #ifdef HAVE_GTK2
@@ -821 +1297 @@
 }
 
-#ifdef HAVE_GTK2
-/** 
-    \brief Signal OptionChange writes the Value from the CheckButton to its Object-Database.
-    \param widget The widget(CheckButton) that has a changed Value
-    \param checkbutton the CheckButton-Object that should receive the change.
-*/
-gint CheckButton::OptionChange (GtkWidget *widget, Widget* checkbutton)
-{
-  static_cast<CheckButton*>(checkbutton)->value = (int)gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON ((CheckButton*)checkbutton->widget));
-  flags->setTextFromFlags(orxonoxGUI);   ////// must be different!!!
-  cout << static_cast<CheckButton*>(checkbutton)->label << " set to: " << static_cast<CheckButton*>(checkbutton)->value << endl;
-}
-#endif /* HAVE_GTK2 */
-
-/**
-   \brief Redraws the CheckButton (if option has changed).
+/**
+   \brief Changed the Option, call this Function
+*/
+void CheckButton::changeOption(void)
+{
+#ifdef HAVE_GTK2
+  this->value =(int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(this->widget));
+#else /* HAVE_GTK2 */
+  char tmpChar[20];
+  cout << "\nPlease give me a new value for " << this->title << " [0,1](defualt:" << this->defaultValue << "): ";
+  cin >> tmpChar;
+
+  if ((this->value = atoi(tmpChar))=!0)
+    this->value = 1;
+#endif /* HAVE_GTK2 */
+  cout << this->title << " set to: " << this->value << endl;
+}
+
+
+/**
+   \brief Redraws the CheckButton(if option has changed).
    Example: if new settings are loaded the Button must be redrawn for the GUI to display that Change
 */
-void CheckButton::redraw ()
-{
-#ifdef HAVE_GTK2
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);
+void CheckButton::redraw(void)
+{
+#ifdef HAVE_GTK2
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(this->widget), value);
 #endif /* HAVE_GTK2 */
 }
@@ -854 +1335 @@
    \param end The maximal Value of the slider.
 */
-Slider::Slider (char* slidername, int start, int end)
+Slider::Slider(char* slidername, int start, int end)
 {
   this->init(start, end);
@@ -860 +1341 @@
   this->setTitle(slidername);
 #ifdef HAVE_GTK2
-  this->connectSignal ("value_changed", this->OptionChange);
-#endif /* HAVE_GTK2 */
+  this->connectSignal("value_changed", this->OptionChange);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief destructs a Slider.
+*/
+Slider::~Slider(void)
+{
+  this->destroy();
 }
 
 /**
    \brief Initializes a Slider with start and end Values
-   params: see Slider::Slider (char* slidername, int start, int end)
+   params: see Slider::Slider(char* slidername, int start, int end)
 */
 void Slider::init(int start, int end)
 {
-  isOption = 2;
+  this->isOption = 2;
 
   static_cast<Option*>(this)->init();
 
-#ifdef HAVE_GTK2
- widget = gtk_hscale_new_with_range (start, end, 5);
-#endif /* HAVE_GTK2 */
+  this->start = start;
+  this->end = end;
+#ifdef HAVE_GTK2
+ widget = gtk_hscale_new_with_range(this->start, this->end, 5);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief Destroys a Slider.
+*/
+void Slider::destroy(void)
+{ 
+  if (this->title)
+    PRINTF(3)("deleting the Slider: %s\n", this->title);
+  else 
+    PRINTF(3)("deleting the Slider.\n");
+
+  static_cast<Option*>(this)->destroy();
+
 }
 
@@ -885 +1390 @@
 void Slider::setTitle(char* title)
 {
-  if (label)
-    delete []label;
-  label = new char[strlen(title)+1];
-  strcpy(label, title);
+  if (this->title)
+    delete []this->title;
+  this->title = new char[strlen(title)+1];
+  strcpy(this->title, title);
 }
 
@@ -900 +1405 @@
 }
 
-#ifdef HAVE_GTK2
-/** 
-    \brief Signal OptionChange writes the Value from the Slider to its Object-Database.
-    \param widget The widget(Slider) that has a changed Value
-    \param slider the Slider-Object that should receive the change.
-*/
-gint Slider::OptionChange (GtkWidget *widget, Widget* slider)
-{
-  static_cast<Slider*>(slider)->value = (int)gtk_range_get_value (GTK_RANGE ((Slider*)slider->widget));
-  flags->setTextFromFlags(orxonoxGUI);  //// must be different !!!
-  cout << static_cast<Slider*>(slider)->label << " set to: "<< static_cast<Slider*>(slider)->value << endl;
-}
-#endif /* HAVE_GTK2 */
-
 /**
    \brief Redraws the widget
-   Example: see void CheckButton::redraw ()
-*/
-void Slider::redraw ()
-{
-#ifdef HAVE_GTK2
-  gtk_range_set_value (GTK_RANGE (widget), value);
-#endif /* HAVE_GTK2 */
+   Example: see void CheckButton::redraw(void)
+*/
+void Slider::redraw(void)
+{
+#ifdef HAVE_GTK2
+  gtk_range_set_value(GTK_RANGE(this->widget), value);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief Changed the Option, call this Function
+*/
+void Slider::changeOption(void)
+{
+#ifdef HAVE_GTK2
+  this->value =(int)gtk_range_get_value(GTK_RANGE(this->widget));
+#else /* HAVE_GTK2 */
+  char tmpChar[20];
+  cout << "\nPlease give me a new value for " << this->title << " [" <<this->start << "-" << this->end << "](defualt:" << this->defaultValue << "): ";
+  cin >> tmpChar;
+
+  if ((this->value = atoi(tmpChar))> this->end)
+    this->value = this->end;
+  if (this->value <= this->start)
+    this->value = this->start;
+#endif /* HAVE_GTK2 */
+  cout << this->title << " set to: " << this->value << endl;
 }
 
@@ -933 +1444 @@
     \param ... items to be added to this Menu. !! Consider, that the last input argument has to be "lastItem" for this to work!!
 */
-Menu::Menu (char* menuname, ...)
+Menu::Menu(char* menuname, ...)
 {
   this->init();
@@ -941 +1452 @@
 
 #ifdef HAVE_GTK2             /////////////////////// REINPLEMENT
-  va_start (itemlist, menuname);
-  while (strcmp (itemName = va_arg (itemlist, char*), "lastItem"))
+  va_start(itemlist, menuname);
+  while(strcmp(itemName = va_arg(itemlist, char*), "lastItem"))
     {
       this->addItem(itemName);
@@ -950 +1461 @@
 
 #ifdef HAVE_GTK2
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (widget), menu);
-  this->connectSignal ("changed", this->OptionChange);
-#endif /* HAVE_GTK2 */
+  gtk_option_menu_set_menu(GTK_OPTION_MENU(this->widget), menu);
+  this->connectSignal("changed", this->OptionChange);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief destructs a Menu.
+*/
+Menu::~Menu(void)
+{
+  this->destroy();
 }
 
@@ -960 +1479 @@
 void Menu::init(void)
 {
-  isOption = 2;
+  this->isOption = 2;
 
   static_cast<Option*>(this)->init();
 
 #ifdef HAVE_GTK2
-  widget = gtk_option_menu_new ();
-  menu = gtk_menu_new ();
-#endif /* HAVE_GTK2 */
-
-}
+  this->widget = gtk_option_menu_new();
+  this->menu = gtk_menu_new();
+#endif /* HAVE_GTK2 */
+
+}
+
+/**
+   \brief Destroys a Menu.
+*/
+void Menu::destroy(void)
+{ 
+  if (this->title)
+    PRINTF(3)("deleting the Menu: %s\n", this->title);
+  else 
+    PRINTF(3)("deleting the Menu.\n");
+  //! \todo destroy menu
+  
+  static_cast<Option*>(this)->destroy();
+}
+
 
 /**
@@ -977 +1511 @@
 void Menu::setTitle(char* title)
 {
-  if (label)
-    delete []label;
-  label = new char[strlen(title)+1];
-  strcpy(label, title);
+  if (this->title)
+    delete []this->title;
+  this->title = new char[strlen(title)+1];
+  strcpy(this->title, title);
 }
 
@@ -986 +1520 @@
    \brief appends a new Item to the Menu-List.
    \param itemName the itemName to be appendet.
-*/
-void Menu::addItem (char* itemName)
-{
-#ifdef HAVE_GTK2
-  item = gtk_menu_item_new_with_label (itemName);
-  gtk_menu_shell_append(GTK_MENU_SHELL (menu), item);
-#endif /* HAVE_GTK2 */
-}
-
-#ifdef HAVE_GTK2
-/** 
-    \brief Signal OptionChange writes the Value from the Menu to its Object-Database.
-    \param widget The widget(Menu) that has a changed Value
-    \param menu the Menu-Object that should receive the change.
-*/
-gint Menu::OptionChange (GtkWidget *widget, Widget* menu)
-{
-  static_cast<Menu*>(menu)->value = (int)gtk_option_menu_get_history (GTK_OPTION_MENU (menu->widget));
-  flags->setTextFromFlags(orxonoxGUI); //// must be different !!!
-  cout << static_cast<Menu*>(menu)->label << " changed to : " << static_cast<Menu*>(menu)->value << endl;
-}
-#endif /* HAVE_GTK2 */
+
+   \todo make the item-list readable without GTK
+*/
+void Menu::addItem(char* itemName)
+{
+#ifdef HAVE_GTK2
+  this->item = gtk_menu_item_new_with_label(itemName);
+  gtk_menu_shell_append(GTK_MENU_SHELL(this->menu), this->item);
+#endif /* HAVE_GTK2 */
+}
 
 /**
    \brief Redraws the widget
-   Example: see void CheckButton::redraw ()
-*/
-void Menu::redraw ()
-{
-#ifdef HAVE_GTK2
- gtk_option_menu_set_history (GTK_OPTION_MENU (widget), value);
-#endif /* HAVE_GTK2 */
-}
+   Example: see void CheckButton::redraw(void)
+*/
+void Menu::redraw(void)
+{
+#ifdef HAVE_GTK2
+ gtk_option_menu_set_history(GTK_OPTION_MENU(this->widget), this->value);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief Changed the Option, call this Function
+*/
+void Menu::changeOption(void)
+{
+#ifdef HAVE_GTK2
+  this->value =(int)gtk_option_menu_get_history(GTK_OPTION_MENU(this->widget));
+#else /* HAVE_GTK2 */
+  char tmpChar[20];
+  cout << "\nPlease give me a new value for " << this->title << "(defualt:" << this->defaultValue << "): ";
+  cin >> tmpChar;
+  this->value = atoi(tmpChar);
+
+#endif /* HAVE_GTK2 */
+  cout << this->title << " set to: " << this->value << endl;
+}
+
+/* OPTION LABEL */
 
 /**
    \brief Creates a new OptionLabel with a LabelName and a Value.
    \param label The name of the OptionLabel.
-   \param value The Value of the OptionLabel (what will be displayed).
+   \param value The Value of the OptionLabel(what will be displayed).
 */
 OptionLabel::OptionLabel(char* label, char* value)
 {
-  init();
-  setTitle(label);
-  setValue(value);
+  this->init();
+  this->setTitle(label);
+  this->setValue(value);
+}
+
+/**
+   \brief destructs an OptionLabel.
+*/
+OptionLabel::~OptionLabel(void)
+{
+  this->destroy();
 }
 
@@ -1037 +1586 @@
 void OptionLabel::init(void)
 {
+  this->isOption = 5;
   static_cast<Option*>(this)->init();
-  isOption = 5;
+
   cValue = NULL;
 
 #ifdef HAVE_GTK2
-  widget = gtk_label_new ("");
-#endif /* HAVE_GTK2 */
-}
+  this->widget = gtk_label_new("");
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief Destroys a OptionLabel.
+*/
+void OptionLabel::destroy(void)
+{ 
+  if (this->title)
+    PRINTF(3)("deleting the OptionLabel: %s\n", this->title);
+  else 
+    PRINTF(3)("deleting the OptionLabel.\n");
+  if (this->cValue)
+    delete []this->cValue;
+
+  static_cast<Option*>(this)->destroy();
+}
+
 
 /**
@@ -1052 +1618 @@
 void OptionLabel::setValue(char* newValue)
 {
-  if (cValue)
-    delete cValue;
-  cValue = new char [strlen(newValue)+1];
-  strcpy(cValue, newValue);
-#ifdef HAVE_GTK2
-  gtk_label_set_text (GTK_LABEL (widget), cValue);
+  if (this->cValue)
+    delete []this->cValue;
+  this->cValue = new char [strlen(newValue)+1];
+  strcpy(this->cValue, newValue);
+#ifdef HAVE_GTK2
+  gtk_label_set_text(GTK_LABEL(this->widget), this->cValue);
 #endif /* HAVE_GTK2 */
 }
@@ -1067 +1633 @@
 void OptionLabel::setTitle(char* title)
 {
-  if (label)
-    delete []label;
-  label = new char [strlen(title)+1];
-  strcpy(label, title);
-#ifdef HAVE_GTK2
-  gtk_label_set_text (GTK_LABEL (widget), title);
-#endif /* HAVE_GTK2 */
-}
-
-/**
-   \brief Redraws an OptionLabel (not implemented yet, but it works).
+  if (this->title)
+    delete []this->title;
+  this->title = new char [strlen(title)+1];
+  strcpy(this->title, title);
+  this->redraw();
+}
+
+/**
+   \brief Redraws an OptionLabel(not implemented yet, but it works).
 */
 void OptionLabel::redraw(void)
 {
-  
-}
+#ifdef HAVE_GTK2
+  gtk_label_set_text(GTK_LABEL(widget), title);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief Changed the Option, call this Function
+*/
+void OptionLabel::changeOption(void)
+{
+#ifdef HAVE_GTK2
+  this->cValue =(char*)gtk_label_get_text(GTK_LABEL(this->widget));
+#else /* HAVE_GTK2 */
+  cout << "\nPlease give me a new input for " << this->title << ": ";
+  cin >> this->cValue;
+#endif /* HAVE_GTK2 */
+  cout << this->title << " set to: " << this->cValue << endl;
+}
+
 
 /**
@@ -1088 +1669 @@
    You migth consider adding Label::setTitle with this.
 */
-Label::Label ()
+Label::Label(void)
 {
   this->init();
@@ -1097 +1678 @@
    \param text The text to be displayed.
 */
-Label:: Label (char* text)
+Label:: Label(char* text)
 {
   this->init();
-  this->setText(text);
+  this->setTitle(text);
+}
+
+/**
+   \brief destructs a Label.
+*/
+Label::~Label(void)
+{
+  this->destroy();
 }
 
@@ -1108 +1697 @@
 void Label::init(void)
 {
-  isOption = 0;
+  this->isOption = 0;
 
   static_cast<Widget*>(this)->init();
 
 #ifdef HAVE_GTK2
-  widget = gtk_label_new ("");
-  gtk_label_set_line_wrap (GTK_LABEL(widget), TRUE);
-#endif /* HAVE_GTK2 */
+  this->widget = gtk_label_new("");
+  gtk_label_set_line_wrap(GTK_LABEL(this->widget), TRUE);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief Destroys a Label.
+*/
+void Label::destroy(void)
+{ 
+  if (this->title)
+    PRINTF(3)("deleting the Label: %s\n", this->title);
+  else 
+    PRINTF(3)("deleting the Label.\n");
+
+  static_cast<Widget*>(this)->destroy();
 }
 
@@ -1122 +1724 @@
    \param text The text to be inserted into the Label.
 */
-void Label::setText (char* text)
-{
-  if (label)
-    delete []label;
-  label = new char[strlen(text)+1];
-  strcpy(label, text);
-#ifdef HAVE_GTK2
-  gtk_label_set_text (GTK_LABEL (this->widget), text);
-#endif /* HAVE_GTK2 */
-}
+void Label::setTitle(char* text)
+{
+  if (this->title)
+    delete []this->title;
+  this->title = new char[strlen(text)+1];
+  strcpy(this->title, text);
+#ifdef HAVE_GTK2
+  gtk_label_set_text(GTK_LABEL(this->widget), this->title);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief ereases the Text of a Label
+*/
+void Label::ereaseText(void)
+{
+  this->setTitle("");
+}
+
+/** 
+    \brief appends some Text to a Label
+    \param textToAppend The text that will be appended to this Label
+*/
+void Label::appendText(char* textToAppend)
+{
+  if (this->title)
+    {
+      char* tmpTitle = new char[strlen(this->title)+strlen(textToAppend)+1];
+      strcpy(tmpTitle, title);  
+      strcat(tmpTitle, textToAppend);
+      delete []this->title;
+      this->title = tmpTitle;
+    }
+  else
+    {
+      this->title = new char[strlen(textToAppend)];
+    }
+  
+#ifdef HAVE_GTK2
+  gtk_label_set_text(GTK_LABEL(this->widget), title);
+#endif /* HAVE_GTK2 */
+}
+
+/** 
+    \brief Appends some integer to the Label
+    \param intToAppend The Int that will be added.
+    
+    it does this by just converting the int into a char* and send it to appendText
+*/
+void Label::appendInt(int intToAppend)
+{
+  char append [32];
+  sprintf(append, "%d", intToAppend);
+  this->appendText(append);
+}
+
 
 /**
@@ -1137 +1785 @@
    \return The Text the Label holds.
 */
-char* Label::getText ()
-{
-  return label;
-}
+char* Label::getText(void)
+{
+  return this->title;
+}
+
+/**
+   \brief Creates a new ProgressBar.
+*/
+ProgressBar::ProgressBar(void)
+{
+  this->init();
+}
+
+/**
+   \brief Creates a new ProgressBar.
+   \param label The name you want to get the ProgressBar.
+*/
+ProgressBar::ProgressBar(char* label)
+{
+  this->init();
+  this->setTitle(label);
+}
+
+/**
+   \brief destructs a ProgressBar
+*/
+ProgressBar::~ProgressBar(void)
+{
+  this->destroy();
+}
+
+/**
+   \brief Initializes a ProgressBar
+*/
+void ProgressBar::init(void)
+{
+  this->isOption = 0;
+  this->progress = 0.0;
+  this->totalSize = 0.0;
+
+  static_cast<Widget*>(this)->init();
+#ifdef HAVE_GTK2
+  this->adjustment =(GtkAdjustment*)gtk_adjustment_new(0, 0, 100, 0, 0, 0);
+  this->widget = gtk_progress_bar_new_with_adjustment(this->adjustment);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief Destroys a ProgressBar.
+*/
+void ProgressBar::destroy(void)
+{ 
+  if (this->title)
+    PRINTF(3)("deleting the ProgressBar: %s\n", this->title);
+  else 
+    PRINTF(3)("deleting the ProgressBar.\n");
+
+  static_cast<Widget*>(this)->destroy();
+}
+
+/**
+   \brief Sets a ned Title to the ProgressBar.
+   \param title The now title of the ProgressBar.
+*/
+void ProgressBar::setTitle(char* title)
+{
+  if (this->title)
+    delete []this->title;
+  this->title = new char [strlen(title)+1];
+  strcpy(this->title, title);
+}
+
+/**
+   \brief Sets the Total size of the Bar.(ex. The maximum one can download)
+*/
+void ProgressBar::setTotalSize(double totalSize)
+{
+  this->totalSize = totalSize;
+}
+
+/**
+   \brief Sets the progress maximum is this->totalSize
+*/
+void ProgressBar::setProgress(double progress)
+{
+  this->progress = progress;
+
+  if (this->progress > this->totalSize)
+    this->progress = this->totalSize;
+
+#ifdef HAVE_GTK2
+  gtk_progress_set_value(GTK_PROGRESS(widget), this->progress*100.0/this->totalSize);
+#endif /* HAVE_GTK2 */
+  PRINTF(3)("Progress: %f\n", this->progress*100.0/this->totalSize);
+}
+
+/**
+    \brief returns the Progress Status
+*/
+double ProgressBar::getProgress(void)
+{
+  return this->progress;
+}
+
+/* IMAGE */
+
+/**
+   \brief Creates a new Image
+   \param imagename the location of the Image on the Hard Disc
+*/
+Image::Image(char* imagename)
+{
+  this->init();
+  if (this->title)
+    delete []this->title;
+  this->title = new char[strlen(imagename)+1];
+  strcpy(this->title, imagename);
+
+#ifdef HAVE_GTK2
+  widget = gtk_image_new_from_file(imagename);
+#endif /* HAVE_GTK2 */
+}
+
+/**
+   \brief destructs an Image.
+*/
+Image::~Image(void)
+{
+  this->destroy();
+}
+
+/** 
+    \brief Initializes a new Image
+*/
+void Image::init(void)
+{
+  isOption = 0;
+
+  static_cast<Widget*>(this)->init();
+}
+
+/**
+   \brief Destroys a Image.
+*/
+void Image::destroy(void)
+{ 
+  if (this->title)
+    PRINTF(3)("deleting the Image: %s\n", this->title);
+  else 
+    PRINTF(3)("deleting the Image.\n");
+
+  static_cast<Widget*>(this)->destroy();
+}
+
+/**
+   \brief Sets a ned Title to the Image.
+   \param title The now title of the OptionLabel.
+*/
+void Image::setTitle(char* title)
+{
+  if (this->title)
+    delete []this->title;
+  this->title = new char [strlen(title)+1];
+  strcpy(this->title, title);
+}

orxonox/branches/trackManager/src/gui/orxonox_gui_gtk.h

@@ -3 +3 @@
  \brief Contains all th different Widgets.
 */
-
 #ifndef _ORXONOX_GUI_GTK_H
 #define _ORXONOX_GUI_GTK_H
@@ -10 +9 @@
 #include <config.h> 
 #endif
+
+//! verbose level, soon obsolete
+extern int verbose; // soon obsolete here
+
+#include "../debug.h"
 
 #ifdef HAVE_GTK2
@@ -26 +30 @@
 #include <gtk/gtkimage.h>
 #include <gtk/gtkeventbox.h>
-#endif /* HAVE_GTK2 */
-
-#ifdef HAVE_GTK2
-bool initGTK(int argc, char *argv[]);
-bool mainloopGTK(void);
-#endif /* HAVE_GTK2 */
-
+#include <gtk/gtkprogressbar.h>
+#endif /* HAVE_GTK2 */
+
+bool initGUI(int argc, char* argv[]);
+bool mainloopGUI(void);
 
 //! This is the topmost object that can be displayed all others are derived from it.
@@ -40 +42 @@
 
  public:
-  ~Widget ();
-
-  Widget* next; //!< next always points to the next Widget in the list. Every Widget has a next one, or has NULL as next
-#ifdef HAVE_GTK2
-  GtkWidget* widget; //!< widget is the gtk_widget that the specific Object Contains.
-#endif /* HAVE_GTK2 */
-  void init(void);
-  int isOption; //!< with this Paramenter one can set the option-type: -2:Container, -1: Box, 0: not an Option, 1: Bool-option, 2: int-option, 3: float option, 4:char option, 5: char* option
-  /**
-     \briefdefines isOption states
-  */
+  virtual ~Widget(void);
+  void init(void);
+  void destroy(void);
+
+  void show(void);
+  void hide(void);
+  void setSize(int width, int height);
+  virtual void setTitle(char* title) = 0;  //!< An abstract Function, that sets the title of Widgets.
+
+  Widget* findWidgetByName(char* name, unsigned int depth);
+  void walkThrough(void(*function)(Widget*), unsigned int depth);
+  void walkThrough(void(*function)(Widget*, void*), void* data, unsigned int depth);
+  static void listOptionsAndGroups(Widget* widget);
+  static void listOptions(Widget* widget);
+  static void listOptions(Widget* widget, void* data);
+  Widget* findOptionByNumber(int* number, unsigned int depth);
+  static void listGroups(Widget* widget);
+  static void listGroups(Widget* widget, void* data);
+  Widget* findGroupByNumber(int* number, unsigned int depth);
+  static void setOptions(Widget* widget);
+  static void flagCheck(Widget* widget, void* flagName);
+  
+#ifdef HAVE_GTK2
+  // Connection - Functions
+
+  gulong connectSignal(char* event, gint(*signal)(GtkWidget*, GdkEvent*, void* ));
+  gulong connectSignal(char* event, gint(*signal)(GtkWidget*, Widget* ));
+  gulong connectSignal(char* event, void* extObj, gint(*signal)(GtkWidget*, GdkEvent*, void* ));
+  gulong connectSignal(char* event, void* extObj, gint(*signal)(GtkWidget*, void* ));
+  gulong connectSignal(char* event, void* extObj, gint(*signal)(GtkWidget*, GdkEventKey*, void* ));
+  void disconnectSignal(gulong signalID);
+
+  // Signals
+  static gint doNothingSignal(GtkWidget* widget, GdkEvent* event, void* nothing);
+#endif /* HAVE_GTK2 */
+
+  Widget* next;                     //!< next always points to the next Widget in the list. Every Widget has a next one, or has NULL as next
+#ifdef HAVE_GTK2
+  GtkWidget* widget;                //!< widget is the gtk_widget that the specific Object Contains.
+#endif /* HAVE_GTK2 */
+  int isOption;                     //!< with this Paramenter one can set the option-type: -2:Container, -1: Box, 0: not an Option, 1: Bool-option, 2: int-option, 3: float option, 4:char option, 5: char* option
+
+  //! defines isOption states
   enum option { containerType = -2, boxType = -1, nothingType = 0, boolType = 1, intType = 2}; 
-  char* label; //!< The name of the Widget. Some do display it, Options need it to save;
-#ifdef HAVE_GTK2
-  gulong connectSignal (char* event, gint (*signal)(GtkWidget*, GdkEvent*, void *));
-  gulong connectSignal (char* event, gint (*signal)(GtkWidget*, Widget *));
-  gulong connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEvent*, void *));
-  gulong connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEventKey*, void *));
-  void disconnectSignal (gulong signalID);
-#endif /* HAVE_GTK2 */
-  void show ();
-  void hide ();
-  void setSize(int width, int height);
-
-  void walkThrough (void (*function)(Widget*));
-  static void listOptions (Widget* widget);
-  static void setOptions (Widget* widget);
-  
-#ifdef HAVE_GTK2
-  static gint doNothingSignal (GtkWidget *widget, GdkEvent* event, void* nothing);
-#endif /* HAVE_GTK2 */
+  char* title;                      //!< The name of the Widget. Some do display it, Options need it to save;
 };
 
@@ -81 +97 @@
 
   void init(void);
-  void setGroupName (char* name);
-  char* getGroupName (void);
+  void destroy(void);
+
+  void setGroupName(char* name);
+  char* getGroupName(void);
+
+  virtual void fill(Widget* lowerWidget) = 0; //!< An abstract function, that fills Packers.
 };
 
@@ -94 +114 @@
 {
  private:
-  int borderwidth;
-  int policy;
-  
- public:
-  void init(void);
-  //  void setBorderWidth (int borderwidth);
-  //  virtual void setTitle (char* title) = 0;
-  void fill (Widget *lowerWidget);
+  int borderwidth;          //!< The width of The Container Boarder.
+  int policy;               //!< The Update Policy of a Container.
+  
+ public:
+  void init(void);
+  void destroy(void);
+
+  //  void setBorderWidth(int borderwidth);
+  //  virtual void setTitle(char* title) = 0;
+  void fill(Widget* lowerWidget);
 };
 
@@ -112 +134 @@
 {
  private:
-  bool isOpen;                //!< A bool Variable that checks if a Window is already open.
- public:
-  static Window* mainWindow;  //!< Pointer to the First Window that was opened. By default this should be the GUI's main-Window.
+  bool isOpen;                      //!< A bool Variable that checks if a Window is already open.
+ public:
+  static Window* mainWindow;        //!< Pointer to the First Window that was opened. By default this should be the GUI's main-Window.
   static void addWindow(Window* windowToAdd);
 
-  Window (void);
-  Window (char* windowName);
-  void init ();
-  
-  void setTitle (char* title);
-  void showall ();
-  void open();
-  void close();
-
-#ifdef HAVE_GTK2
-  static gint windowOpen (GtkWidget *widget, GdkEvent* event, void* window);
-  static gint windowClose (GtkWidget *widget, GdkEvent* event, void* window);
-  static gint orxonox_gui_quit (GtkWidget *widget, GdkEvent *event, gpointer data);
+  Window(void);
+  Window(char* windowName);
+  ~Window(void);
+  void init(void);
+  void destroy(void);
+  
+  void setTitle(char* title);
+  void showall(void);
+  void open(void);
+  void close(void);
+
+#ifdef HAVE_GTK2
+  // Signals
+  static gint windowOpen(GtkWidget* widget, GdkEvent* event, void* window);
+  static gint windowClose(GtkWidget* widget, GdkEvent* event, void* window);
 #endif /* HAVE_GTK2 */
 };
@@ -141 +165 @@
 {
  public:
-  Frame (char* frameName);
-  Frame (void);
-  void init(void);
-  
-  void setTitle (char* title);
+  Frame(void);
+  Frame(char* frameName);
+  ~Frame(void);
+  void init(void);
+  void destroy(void);
+  
+  void setTitle(char* title);
 };
 
@@ -155 +181 @@
 {
  public:
-  EventBox (char* eventBoxName);
-  EventBox (void);
-  void init(void);
-  
-  void setTitle (char* title);
+  EventBox(void);
+  EventBox(char* eventBoxName);
+  ~EventBox(void);
+  void init(void);
+  void destroy(void);
+  
+  void setTitle(char* title);
 };
 
@@ -166 +194 @@
    A Box can Contain multiple Widgets, that are ordered either horizontally or vertically
    I defined the standartbox to be horizontally.
-   A Box is always filled left->right (horizontally) or up->down (vertically)
+   A Box is always filled left->right(horizontally) or up->down(vertically)
 */
 class Box : public Packer
 {
  public:
-  Box (void);
-  Box (char boxtype);
+  Box(void);
+  Box(char boxtype);
+  ~Box(void);
   void init(char boxtype);
-
-  void fill (Widget* lowerWidget);
-
+  void destroy(void);
+  
+  void fill(Widget* lowerWidget);
+
+  void setTitle(char* title);
+};
+
+//! An Option is a Widget that contains something that may change its state.
+/**
+ * Options are the essence of a GUI, they: Configure, Start, Quit, Execute, and make it worth something
+ */
+class Option : public Widget
+{
+ protected:
+  bool saveable;  //!< Options can be Saved.
+  
+ public:
+  void init(void);
+  void destroy(void);
+
+  int value; //!< every option has a value either true or false(0,1) or something else like 25 for 25% of the volume
+  char* flagName; //!< options have a flag name that will be appendet if you start the Program from the GUI.
+  char* flagNameShort; //!< like flag_name but shorter
+  int defaultValue; //!< A default value is good, for hiding a option if it is not needed.(hidden if value == default_value)
+
+  void saveability(void);
+  void saveability(bool isSaveable);
+  bool isSaveable(void);
+  void setFlagName(char* flagname, int defaultvalue);
+  void setFlagName(char* flagname, char* flagnameshort, int defaultvalue);
+  virtual void redraw(void) = 0; //!< A Option must be able to redraw itself.
+  virtual void changeOption(void) = 0; //!< What to do, if an Option is Changed. eacht option decides for itself.
+#ifdef HAVE_GTK2
+    // Signals  
+  static gint OptionChange(GtkWidget* widget, Widget* option); //!< Signal for Options that change.
+#endif /* HAVE_GTK2 */
+};
+
+//! Buttons can be pressed, and released.
+/**
+ * Buttons are mainly there for executing some action like Starting the Programm, or Quiting it.
+ */
+class Button : public Option 
+{
+ public:
+  Button(char* buttonname);
+  ~Button(void);
+  void init(void);
+  void destroy(void);
+
+  void setTitle(char* title);
+  void redraw(void);
+  void changeOption(void);
+};
+
+//! CheckButtons are a key in configuring bool Variables
+/** CheckButtons can configure bool Variables like wireframe on/off, enable_sound etc.
+ */
+class CheckButton : public Option
+{
+ public:
+  CheckButton(char* buttonname);
+  ~CheckButton(void);
+  void init(void);
+  void destroy(void);
+
+  void setTitle(char* title);
+  bool isActive(void);           //!< a Bool value to see, if this CheckButton is active.
+  void redraw(void);
+  void changeOption(void);
+};
+
+//! Sliders are Options that can be modified in their value
+/**
+ * good for volume, brightness, etc.
+ */
+class Slider : public Option
+{
+ private:
+  int start;                            //!< The beginning of the Slider-range.
+  int end;                              //!< The end of the Slider-range.
+ public:
+  Slider(char* slidername, int start, int end);
+  ~Slider(void);
+  void init(int start, int end);
+  void destroy(void);
+
+  void setTitle(char* title);
+  void setValue(int value);
+  void redraw(void);
+  void changeOption(void);
+};
+
+//! A Menu is an Option that has a dropdown menu, where you can chose between different Items
+class Menu : public Option
+{
+ private:
+#ifdef HAVE_GTK2
+  GtkWidget* menu;                      //!< The menu That will hold the Options.
+  GtkWidget* item;                      //!< One Item From a Menu.
+#endif /* HAVE_GTK2 */
+  va_list itemlist;                     //!< The list to readin multiple Options.
+  
+ public:
+  Menu(char* menuname, ...);
+  ~Menu(void);
+  void init(void);
+  void destroy(void);
+  
+  void setTitle(char* title);
+  void addItem(char* itemName);
+  void redraw(void);
+  void changeOption(void);
+};
+
+//! A OptionLabel is a simple Label, that holds a char*, and will be updated, if changed.
+class OptionLabel : public Option
+{
+ private:
+
+ public:
+  OptionLabel(char* label, char* value);
+  ~OptionLabel(void);
+  void init(void);
+  void destroy(void);
+  
+  
+  void setValue(char* newValue);
+  void setTitle(char* title);
+  void redraw(void);
+  void changeOption(void);
+
+  char* cValue;                          //!< The Value the Label will have. \todo make private
+
+};
+
+//! A label is a Widget, that displays a text
+class Label : public Widget
+{
+ public:
+  Label(void);
+  Label(char* text);
+  ~Label(void);
+  void init(void);
+  void destroy(void);
+  
+  void setTitle(char* text);
+  void ereaseText(void);
+  void appendText(char* textToAppend);
+  void appendInt(int intToAppend);
+  char* getText(void);
+};
+
+//! A ProgressBar is a Widget, that can display a Progress
+class ProgressBar : public Widget
+{
+ public:
+  ProgressBar(void);
+  ProgressBar(char* label);
+  ~ProgressBar(void);
+  void init(void);
+  void destroy(void);
+
+  void setTitle(char* title);
+  void setProgress(double progress);
+  void setTotalSize(double totalSize);
+  double getProgress(void);
+
+ private:
+  double totalSize;         //!< The total Size of a download Bar
+  double progress;          //!< The progress of a Bar.
+#ifdef HAVE_GTK2
+  GtkAdjustment* adjustment;
+#endif /* HAVE_GTK2 */
 };
 
@@ -187 +387 @@
 {
  public:
-  Image (char* imgaename);
-  void init(void);
-};
-
-//! An Option is a Widget that contains something that may change its state.
-/**
- * Options are the essence of a GUI, they: Configure, Start, Quit, Execute, and make it worth something
- */
-class Option : public Widget
-{
- public:
-  //virtual gint OptionChange (GtkWidget *widget, GdkEvent *event, gpointer data);
-  void init(void);
-
-  int value; //!< every option has a value either true or false (0,1) or something else like 25 for 25% of the volume
-  char* flagName; //!< options have a flag name that will be appendet if you start the Program from the GUI.
-  char* flagNameShort; //!< like flag_name but shorter
-  int defaultValue; //!< A default value is good, for hiding a option if it is not needed. (hidden if value == default_value)
-  bool saveable;  //!< Options can be Saved.
-
-  void setFlagName (char* flagname, int defaultvalue);
-  void setFlagName (char* flagname, char* flagnameshort, int defaultvalue);
-  virtual void redraw () = 0; //!< A Option must be able to redraw itself.
-};
-
-//! Buttons can be pressed, and released.
-/**
- * Buttons are mainly there for executing some action like Starting the Programm, or Quiting it.
- */
-class Button : public Option 
-{
- public:
-  Button (char* buttonname);
-  void init(void);
-
-  void setTitle(char* title);
-  
-  void redraw();
-};
-
-//! CheckButtons are a key in configuring bool Variables
-/** CheckButtons can configure bool Variables like wireframe on/off, enable_sound etc.
- */
-class CheckButton : public Option
-{
- public:
-  CheckButton (char* buttonname);
-#ifdef HAVE_GTK2
-  static gint OptionChange (GtkWidget* widget, Widget* checkbutton);
-#endif /* HAVE_GTK2 */
-  
-  void init(void);
-  void setTitle(char* title);
-
-  bool isActive();
-  void redraw ();
-};
-
-//! Sliders are Options that can be modified in their value
-/**
- * good for volume, brightness, etc.
- */
-class Slider : public Option
-{
- public:
-  Slider (char* slidername,int start, int end);
-  void init(int start, int end);
-
-  void setTitle(char* title);
-  void setValue(int value);
-
-#ifdef HAVE_GTK2
-  static gint OptionChange (GtkWidget* widget, Widget* slider);
-#endif /* HAVE_GTK2 */
-  void redraw();
-};
-
-//! A Menu is an Option that has a dropdown menu, where you can chose between different Items
-class Menu : public Option
-{
- private:
-#ifdef HAVE_GTK2
-  GtkWidget* menu;     //!< The menu That will hold the Options.
-  GtkWidget* item;     //!< One Item From a Menu.
-#endif /* HAVE_GTK2 */
-  va_list itemlist;    //!> The list to readin multiple Options.
-  
- public:
-  Menu (char* menuname, ...);
-  void init(void);
-
-  void setTitle(char* title);
-
-  void addItem(char* itemName);
-#ifdef HAVE_GTK2
-  static gint OptionChange (GtkWidget* widget, Widget* menu);
-#endif /* HAVE_GTK2 */
-  void redraw();
-};
-
-//! A CharLabel is a simple Label, that holds a char*, and will be updated, if changed.
-class OptionLabel : public Option
-{
- public:
-  OptionLabel(char* label, char* value);
-  void init(void);
-  
-  char* cValue;   //!< The Value the Label will have.
-  
-  void setValue(char* newValue);
-  void setTitle(char* title);
-  void redraw();
-};
-
-//! A label is a Widget, that displays a text
-class Label : public Widget
-{
- public:
-  Label ();
-  Label (char* text);
-  void init(void);
-  
-  void setText (char* text);
-  char* getText ();
-};
-
-
-//gint orxonox_gui_quit (GtkWidget *widget, GdkEvent *event, gpointer data);
+  Image(char* imgaename);
+  ~Image(void);
+  void init(void);
+  void destroy(void);
+
+  void setTitle(char* title);
+};
+
+//gint orxonox_gui_quit(GtkWidget* widget, GdkEvent* event, gpointer data);
 
 #endif /* _ORXONOX_GUI_GTK_H */

orxonox/branches/trackManager/src/gui/orxonox_gui_keys.cc

@@ -29 +29 @@
    \brief Creates an Keyboard-Frame
 */
-OrxonoxGuiKeys::OrxonoxGuiKeys ()
-{
-  keysFrame = new Frame ("Keyboard-Options:");
+OrxonoxGuiKeys::OrxonoxGuiKeys(void)
+{
+  this->keysFrame = new Frame("Keyboard-Options:");
   //  keysFrame->setGroupName("Keyboard");
-  keysBox = new Box ('h');
-  player1 = new Player("player1");
-  player2 = new Player("player2");
-
-  keysBox->fill(player1->getOpenButton());
-  keysBox->fill(player2->getOpenButton());
-
-  keysFrame->fill (keysBox);
+  this->keysBox = new Box('h');
+  this->player1 = new Player("player1");
+  this->player2 = new Player("player2");
+
+  this->keysBox->fill(this->player1->getOpenButton());
+  this->keysBox->fill(this->player2->getOpenButton());
+
+  this->keysFrame->fill(this->keysBox);
+}
+
+/**
+   \brief Destructs the Keys-stuff
+*/
+OrxonoxGuiKeys::~OrxonoxGuiKeys(void)
+{
+  // nothing to do here.
 }
 
@@ -47 +55 @@
    \return Returns the Audio-frame
 */
-Widget* OrxonoxGuiKeys::getWidget ()
-{
-  return keysFrame;
+Widget* OrxonoxGuiKeys::getWidget(void)
+{
+  return this->keysFrame;
 }
 
@@ -60 +68 @@
 Player::Player(char* player)
 {
-  char windowName[100] = "Keyboard settings of ";
-  strcat (windowName, player);
-  pKeyWindow = new Window(windowName);
-  pKeyFrame = new Frame (windowName);
-   pKeysBox = new Box('v');
-   pKeysBox->setGroupName (player);
-    pKeysBox->fill(addKey(UP, "up"));
-    pKeysBox->fill(addKey(DOWN, "down"));
-    pKeysBox->fill(addKey(LEFT, "left"));
-    pKeysBox->fill(addKey(RIGHT, "right"));
-    pKeysBox->fill(addKey(SHOOT, "shoot"));
-    
+  char* windowName = new char[strlen(player)+25];
+  strcpy(windowName, "Keyboard settings of ");
+  strcat(windowName, player);
+  this->pKeyWindow = new Window(windowName);
+  this->pKeyFrame = new Frame(windowName);
+   this->pKeysBox = new Box('v');
+   this->pKeysBox->setGroupName(player);
+    this->pKeysBox->fill(addKey(UP, "up"));
+    this->pKeysBox->fill(addKey(DOWN, "down"));
+    this->pKeysBox->fill(addKey(LEFT, "left"));
+    this->pKeysBox->fill(addKey(RIGHT, "right"));
+    this->pKeysBox->fill(addKey(SHOOT, "shoot"));
+    delete windowName;
     closeButton = new Button("close");
 #ifdef HAVE_GTK2
-    closeButton->connectSignal("button_press_event", pKeyWindow, Window::windowClose);
-#endif /* HAVE_GTK2 */
-
-    pKeysBox->fill(closeButton);
-    pKeyFrame->fill(pKeysBox);
-   pKeyWindow->fill(pKeyFrame);
-   Window::addWindow(pKeyWindow);
-#ifdef HAVE_GTK2
-   pKeyWindow->connectSignal("destroy", pKeyWindow, Window::windowClose);
-   pKeyWindow->connectSignal("delete_event", pKeyWindow, Window::windowClose);
-#endif /* HAVE_GTK2 */
-
-  openButton = new Button (player);
-#ifdef HAVE_GTK2
-  openButton->connectSignal("button_press_event", pKeyWindow, Window::windowOpen);
-#endif /* HAVE_GTK2 */
-
-  inputWindow = new Window("inputWindow");
-
-  inputButton = new Button ("test");
-  inputWindow->fill (inputButton);
-#ifdef HAVE_GTK2
-  inputWindow->connectSignal("destroy",  Widget::doNothingSignal);
-  inputWindow->connectSignal("delete_event", Widget::doNothingSignal);
+    this->closeButton->connectSignal("button_press_event", this->pKeyWindow, Window::windowClose);
+#endif /* HAVE_GTK2 */
+
+    this->pKeysBox->fill(this->closeButton);
+    this->pKeyFrame->fill(this->pKeysBox);
+   this->pKeyWindow->fill(this->pKeyFrame);
+   Window::addWindow(this->pKeyWindow);
+#ifdef HAVE_GTK2
+   this->pKeyWindow->connectSignal("destroy", this->pKeyWindow, Window::windowClose);
+   this->pKeyWindow->connectSignal("delete_event", this->pKeyWindow, Window::windowClose);
+#endif /* HAVE_GTK2 */
+
+  this->openButton = new Button(player);
+#ifdef HAVE_GTK2
+  this->openButton->connectSignal("button_press_event", this->pKeyWindow, Window::windowOpen);
+#endif /* HAVE_GTK2 */
+
+  this->inputWindow = new Window("inputWindow");
+
+  this->inputButton = new Button("test");
+  this->inputWindow->fill(inputButton);
+#ifdef HAVE_GTK2
+  this->inputWindow->connectSignal("destroy",  Widget::doNothingSignal);
+  this->inputWindow->connectSignal("delete_event", Widget::doNothingSignal);
 #endif /* HAVE_GTK2 */
 
@@ -108 +117 @@
    \returns A widget that has the Key-Box
 */
-Widget* Player::addKey (KEYS key, char* name)
-{
-  inputKey[key] = new InputKey;
-  inputKey[key]->pKeyBox = new Box();
-  inputKey[key]->pKeyButton = new Button(name);
-  inputKey[key]->pKeyOLabel = new OptionLabel (name, name);
-  inputKey[key]->pKeyOLabel->saveable = true;
+Widget* Player::addKey(KEYS key, char* name)
+{
+  this->inputKey[key] = new InputKey;
+  this->inputKey[key]->pKeyBox = new Box();
+  this->inputKey[key]->pKeyButton = new Button(name);
+  this->inputKey[key]->pKeyOLabel = new OptionLabel(name, name);
+  this->inputKey[key]->pKeyOLabel->saveability();
 
 #ifdef HAVE_GTK2
   //inputKey[key]->pKeyButton->connectSignal("key_press_event", inputKey[key]->pKeyButton, key_cb);
-  inputKey[key]->pKeyButton->connectSignal("button_press_event", inputKey[key], inputWindowEvent);
-#endif /* HAVE_GTK2 */
-  inputKey[key]->pKeyBox->fill(inputKey[key]->pKeyButton);
-  inputKey[key]->pKeyBox->fill(inputKey[key]->pKeyOLabel);
-  return inputKey[key]->pKeyBox;
+  this->inputKey[key]->pKeyButton->connectSignal("button_press_event", this->inputKey[key], inputWindowEvent);
+#endif /* HAVE_GTK2 */
+  this->inputKey[key]->pKeyBox->fill(this->inputKey[key]->pKeyButton);
+  this->inputKey[key]->pKeyBox->fill(this->inputKey[key]->pKeyOLabel);
+  return this->inputKey[key]->pKeyBox;
 }
 
@@ -128 +137 @@
    \returns the OpenButton of a Player
 */
-Button* Player::getOpenButton()
-{
-  return openButton;
-}
-
-/**
-   \brief sets a new Key (only output)
+Button* Player::getOpenButton(void)
+{
+  return this->openButton;
+}
+
+/**
+   \brief sets a new Key(only output)
    \param key the new Key.
 */
@@ -163 +172 @@
 gint Player::key_cb(GtkWidget* w, GdkEventKey* event, void* inputKey)
 {
-  InputKey* inputkey = (InputKey*) inputKey;
+  InputKey* inputkey =(InputKey*) inputKey;
   char title [20];
 
@@ -256 +265 @@
       char* tmp;
       sprintf(tmp, "%c", event->keyval);
-      printf ("other key %s \n", tmp);
+      printf("other key %s \n", tmp);
       strcpy(title, tmp);
       break;
     }
 
-  inputkey->pKeyOLabel->setValue (title);
+  inputkey->pKeyOLabel->setValue(title);
   inputButton->disconnectSignal(keySignal);
   inputWindow->close();

orxonox/branches/trackManager/src/gui/orxonox_gui_keys.h

@@ -15 +15 @@
    \brief defines the Possible Player Keys
 */
-enum KEYS { UP, DOWN, LEFT, RIGHT, SHOOT };
+enum KEYS {UP, DOWN, LEFT, RIGHT, SHOOT};
 
 class Player;
@@ -29 +29 @@
 
  public:
-  OrxonoxGuiKeys ();
-  ~OrxonoxGuiKeys ();
+  OrxonoxGuiKeys(void);
+  ~OrxonoxGuiKeys(void);
   
-  Widget* getWidget ();
+  Widget* getWidget(void);
 };
 
@@ -64 +64 @@
   Player(char* player);
 
-  Widget* addKey (KEYS key, char* name);
+  Widget* addKey(KEYS key, char* name);
 
-  Button* getOpenButton();
+  Button* getOpenButton(void);
 
 #ifdef HAVE_GTK2

orxonox/branches/trackManager/src/gui/orxonox_gui_video.cc

@@ -30 +30 @@
    \brief Creates the Video-Option-Frame
 */
-OrxonoxGuiVideo::OrxonoxGuiVideo ()
+OrxonoxGuiVideo::OrxonoxGuiVideo(void)
 {
-  videoFrame = new Frame ("Video-Options:");
-  videoBox = new Box ('v');
-  videoFrame->setGroupName("video");
+  this->videoFrame = new Frame("Video-Options:");
+  this->videoBox = new Box('v');
+  this->videoFrame->setGroupName("video");
   
-  fullscreen = new CheckButton ("Fullscreen-mode");
-  fullscreen->setFlagName ("windowed", "q", 1);
-  fullscreen->saveable = true;
-  videoBox->fill (fullscreen);
-  wireframe = new CheckButton ("WireFrame-mode");
-  wireframe->setFlagName ("wireframe", "w", 0);
-  wireframe->saveable = true;
-  videoBox->fill (wireframe);
+  this->fullscreen = new CheckButton("Fullscreen-mode");
+  this->fullscreen->setFlagName("windowed", "q", 1);
+  this->fullscreen->saveability();
+  this->videoBox->fill(fullscreen);
+  this->wireframe = new CheckButton("WireFrame-mode");
+  this->wireframe->setFlagName("wireframe", "w", 0);
+  this->wireframe->saveability();
+  this->videoBox->fill(wireframe);
 
-  videoFrame->fill (videoBox);
+  this->advancedWindowCreate();
+  this->videoBox->fill(this->advancedWindowGetButton());
+
+  this->videoFrame->fill(videoBox);
+}
+
+/**
+   \brief Destructs the Video-stuff
+*/
+OrxonoxGuiVideo::~OrxonoxGuiVideo(void)
+{
+  // nothing to do here.
 }
 
@@ -51 +62 @@
    \return Returns the Video-frame
 */
-Widget* OrxonoxGuiVideo::getWidget ()
+Widget* OrxonoxGuiVideo::getWidget(void)
 {
-  return videoFrame;
+  return this->videoFrame;
 }
+
+
+/**
+   \brief Creates a window, and all it contains for the Source-update.
+*/
+void OrxonoxGuiVideo::advancedWindowCreate(void)
+{
+  // the button, that opens this Window.
+  this->advancedButton = new Button("advanced");
+
+  // the Window itself
+  this->advancedWindow = new Window("Advanced Video Options");
+  this->advancedWindow->setGroupName("advancedVideoOptions");
+
+  this->advancedBox = new Box('v');
+
+  // Advanced Performance Options
+  this->shadows = new CheckButton("Shadows");
+  this->shadows->saveability();
+  this->advancedBox->fill(this->shadows);
+
+  this->fog = new CheckButton("Fog");
+  this->fog->saveability();
+  this->advancedBox->fill(this->fog);
+
+  this->reflections = new CheckButton("Reflections");
+  this->reflections->saveability();
+  this->advancedBox->fill(this->reflections);
+
+  this->textures = new CheckButton("Textures");
+  this->textures->saveability();
+  this->advancedBox->fill(this->textures);
+
+  this->textureDetail = new Menu("Texture Detail", "low", "medium", "high", "lastItem");
+  this->textureDetail->saveability();
+  this->advancedBox->fill(this->textureDetail);
+
+  this->modelDetailLabel = new Label("Model Detail");
+  this->advancedBox->fill(this->modelDetailLabel);
+  this->modelDetail = new Menu("Model Detail", "low", "medium", "high", "lastItem");
+  this->modelDetail->saveability();
+  this->advancedBox->fill(this->modelDetail);
+
+  this->antiAliasingLabel = new Label("Anti-Aliasing-depth:");
+  this->advancedBox->fill(this->antiAliasingLabel);
+  this->antiAliasing = new Menu("Anti Aliasing", "0", "1", "2", "4", "8",  "lastItem");
+  this->antiAliasing->saveability();
+  this->advancedBox->fill(this->antiAliasing);
+
+  this->filterMethodLabel = new Label("Filtering Method:");
+  this->advancedBox->fill(this->filterMethodLabel);
+  this->filterMethod = new Menu("Filtering Method", "none", "linear", "bilinear", "trilinear", "anisortopic", "lastItem");
+  this->filterMethod->saveability();
+  this->advancedBox->fill(this->filterMethod);
+  
+  this->closeButton = new Button("close");
+  this->advancedBox->fill(this->closeButton);
+
+  this->advancedWindow->fill(advancedBox);
+#ifdef HAVE_GTK2 
+  this->advancedButton->connectSignal("button_press_event", this->advancedWindow, Window::windowOpen);
+  this->closeButton->connectSignal("button_press_event", this->advancedWindow, Window::windowClose);
+  this->advancedWindow->connectSignal("destroy", this->advancedWindow, Window::windowClose);
+  this->advancedWindow->connectSignal("delete_event", this->advancedWindow, Window::windowClose);
+#endif /* HAVE_GTK2 */
+   Window::addWindow(this->advancedWindow);
+
+}
+
+/**
+   \returns A Pointer to the Button of the UpdaterSourceWindow
+*/
+Button* OrxonoxGuiVideo::advancedWindowGetButton(void)
+{
+  return this->advancedButton;
+}
+

orxonox/branches/trackManager/src/gui/orxonox_gui_video.h

@@ -16 +16 @@
   CheckButton* fullscreen;  //!< CheckButton for fullscreen-mode
   CheckButton* wireframe;   //!< CheckButton for wireframe Mode.
+
+  // advanced-Performance-Options
+  Window* advancedWindow;   //!< A Window to display advanced options.
+  Button* advancedButton;   //!< A Button to open the Advanced Video Performance Window.
+  Box* advancedBox;         //!< A Box to pack the options into.
+  CheckButton* shadows;     //!< CheckButton for shadows
+  CheckButton* fog;         //!< CheckButton for fog.
+  CheckButton* reflections; //!< CheckButton for reflections
+  CheckButton* textures;    //!< CheckButton for textures
+  Menu* textureDetail;      //!< Menu for the Texture-Detail.
+  
+  Label* modelDetailLabel;  //!< Label for model-detail.
+  Menu* modelDetail;        //!< model-detail.
+  
+  Label* antiAliasingLabel; //!< Label for the anti-aliasing mode.
+  Menu* antiAliasing;       //!< Menu for the Antialiasing-mode.
+
+  Label* filterMethodLabel; //!< Label for filtering-Method.
+  Menu* filterMethod;       //!< Menu for filtering Method.
+
+  Button* closeButton;      //!< A Button to close the Advanced-settingsWindow.
+
+  Button* advancedWindowGetButton(void);
+  void advancedWindowCreate(void);
+  
  public:
-  OrxonoxGuiVideo ();
-  ~OrxonoxGuiVideo ();
+  OrxonoxGuiVideo(void);
+  ~OrxonoxGuiVideo(void);
   
-  Widget* getWidget ();
+  Widget* getWidget(void);
 };
 #endif /* _ORXONOX_GUI_VIDEO_H */

orxonox/branches/trackManager/src/gui/rc

@@ -120 +120 @@
 # just listed in this document for the users reference.
 
-widget_class "GtkWindow" style "window"
-widget_class "GtkFrame" style "window"
-widget_class "Gtk*EventBox" style "window"
-widget_class "GtkDialog" style "window"
-widget_class "GtkFileSelection" style "window"
-widget_class "*Gtk*Scale" style "scale"
-widget_class "*GtkCheckButton*" style "toggle_button"
-widget_class "*Gtk*Menu*" style "toggle_button"
-widget_class "*GtkRadioButton*" style "toggle_button"
-widget_class "*GtkButton*" style "button"
-widget_class "*Ruler" style "ruler"
-widget_class "*GtkText" style "text"
-widget_class "*GtkLabel" style "text"
+widget_class "GtkWindow"           style "window"
+widget_class "GtkFrame"            style "window"
+widget_class "Gtk*EventBox"        style "window"
+widget_class "GtkDialog"           style "window"
+widget_class "GtkFileSelection"    style "window"
+widget_class "*Gtk*Scale"          style "scale"
+widget_class "*GtkCheckButton*"    style "toggle_button"
+widget_class "*Gtk*Menu*"          style "toggle_button"
+widget_class "*GtkRadioButton*"    style "toggle_button"
+widget_class "*GtkButton*"         style "button"
+widget_class "*Ruler"              style "ruler"
+widget_class "*GtkText"            style "text"
+widget_class "*GtkLabel"           style "text"
 
 

orxonox/branches/trackManager/src/importer/Makefile.am

@@ -9 +9 @@
                   windowHandler.cc \
                   model.cc \
+                  objModel.cc \
                   array.cc \
                   material.cc \
                   texture.cc \
-                  vector.cc 
+                  ../vector.cc
 
 noinst_HEADERS= framework.h \
                 windowHandler.h \
                 model.h \
+                objModel.h \
                 array.h \
                 material.h \

orxonox/branches/trackManager/src/importer/Makefile.in

@@ -54 +54 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
-        model.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \
-        texture.$(OBJEXT) vector.$(OBJEXT)
+        model.$(OBJEXT) objModel.$(OBJEXT) array.$(OBJEXT) \
+        material.$(OBJEXT) texture.$(OBJEXT) vector.$(OBJEXT)
 importer_OBJECTS = $(am_importer_OBJECTS)
 importer_LDADD = $(LDADD)
@@ -63 +63 @@
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/framework.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/texture.Po ./$(DEPDIR)/vector.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/windowHandler.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po ./$(DEPDIR)/texture.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -89 +89 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
@@ -104 +106 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
+HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
+HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
+HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
@@ -129 +137 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
+SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
@@ -178 +188 @@
                   windowHandler.cc \
                   model.cc \
+                  objModel.cc \
                   array.cc \
                   material.cc \
                   texture.cc \
-                  vector.cc 
+                  ../vector.cc
 
 noinst_HEADERS = framework.h \
                 windowHandler.h \
                 model.h \
+                objModel.h \
                 array.h \
                 material.h \
@@ -260 +272 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
@@ -279 +292 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+vector.o: ../vector.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.o -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.o `test -f '../vector.cc' || echo '$(srcdir)/'`../vector.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../vector.cc' object='vector.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.o `test -f '../vector.cc' || echo '$(srcdir)/'`../vector.cc
+
+vector.obj: ../vector.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.obj -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.obj `if test -f '../vector.cc'; then $(CYGPATH_W) '../vector.cc'; else $(CYGPATH_W) '$(srcdir)/../vector.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../vector.cc' object='vector.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.obj `if test -f '../vector.cc'; then $(CYGPATH_W) '../vector.cc'; else $(CYGPATH_W) '$(srcdir)/../vector.cc'; fi`
 uninstall-info-am:
 

orxonox/branches/trackManager/src/importer/array.h

@@ -12 +12 @@
 
 #include "../stdincl.h"
-#include <fstream>
-
 
 //! Array Class that handles dynamic-float arrays.

orxonox/branches/trackManager/src/importer/framework.cc

@@ -16 +16 @@
 #include "framework.h"
 
+#include "../vector.h"
+
+int verbose;
 void DrawGLScene()
 {
@@ -52 +55 @@
 int main(int argc, char *argv[])
 {
-  verbose = 2;
-
-  PRINTF(2)("This is The big verbose-Test %i, %s\n", 1, "cool");
+  verbose = 3;
 
   Uint8* keys; // This variable will be used in the keyboard routine
@@ -71 +72 @@
   PRINTF(2)("screensize: %i, %i\n", wHandler.screen->w, wHandler.screen->h);
   if (argc>=3)
-    obj = new Model (argv[1], atof(argv[2]));
+    obj = new OBJModel (argv[1], atof(argv[2]));
   else if (argc>=2)
-    obj = new Model(argv[1]);
+    obj = new OBJModel(argv[1]);
   else 
-    obj = new Model();
-  
+    {
+      // This is an example, of how it is possible, to create a new Model, and adding some vertex-information.
+      // This also packs everything into a DisplayList, and can be handled exactly as any other model.
+      // This is an example of a cube with Texture-Coordinates, but without explicite Vertex-Normals. (they are soft-created).
+      /*
+      obj = (OBJModel*) new Model();
+      obj->setName("CUBE");
+      obj->addVertex (-0.5, -0.5, 0.5);
+      obj->addVertex (0.5, -0.5, 0.5);
+      obj->addVertex (-0.5, 0.5, 0.5);
+      obj->addVertex (0.5, 0.5, 0.5);
+      obj->addVertex (-0.5, 0.5, -0.5);
+      obj->addVertex (0.5, 0.5, -0.5);
+      obj->addVertex (-0.5, -0.5, -0.5);
+      obj->addVertex (0.5, -0.5, -0.5);
+      
+      obj->addVertexTexture (0.0, 0.0);
+      obj->addVertexTexture (1.0, 0.0);
+      obj->addVertexTexture (0.0, 1.0);
+      obj->addVertexTexture (1.0, 1.0);
+      obj->addVertexTexture (0.0, 2.0);
+      obj->addVertexTexture (1.0, 2.0);
+      obj->addVertexTexture (0.0, 3.0);
+      obj->addVertexTexture (1.0, 3.0);
+      obj->addVertexTexture (0.0, 4.0);
+      obj->addVertexTexture (1.0, 4.0);
+      obj->addVertexTexture (2.0, 0.0);
+      obj->addVertexTexture (2.0, 1.0);
+      obj->addVertexTexture (-1.0, 0.0);
+      obj->addVertexTexture (-1.0, 1.0);
+
+      obj->addFace ("1 2 4 3");
+      obj->addFace ("3 4 6 5");
+      obj->addFace ("5 6 8 7");
+      obj->addFace ("7 8 2 1");
+      obj->addFace ("2 8 6 4");
+      obj->addFace ("7 1 3 5");
+      obj->finalize();
+      */
+      obj = (OBJModel*) new Model(CYLINDER);
+    }
   M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0); 
   rotAxis = Vector (0.0,1.0,0.0);
@@ -215 +255 @@
           case SDLK_c:
             if (!obj)
-              obj = new Model(argv[1]);
+              obj = new OBJModel(argv[1]);
             break;
+          case SDLK_a:
+            zoomTo /=2;
+            break;
+          case SDLK_z:
+            zoomTo *=2;
+
           }
         break;

orxonox/branches/trackManager/src/importer/framework.h

@@ -3 +3 @@
  
 #include "windowHandler.h" // Include the Whandler Basecode
-#include "model.h"
-#include "vector.h"
+#include "objModel.h"
+
+class Vector;
 
 float rotatorP;
@@ -33 +34 @@
 
 WindowHandler wHandler;  // Create an instance of the whandler basecode class
-Model* obj;
+OBJModel* obj;
 
 

orxonox/branches/trackManager/src/importer/material.cc

@@ -16 +16 @@
 
 #include "material.h"
+
+#include "texture.h"
+#include <stdlib.h>
+#include <string.h>
 
 using namespace std;
@@ -112 +116 @@
   while (searcher != NULL)
     {
-      PRINTF(2)(".");
+      PRINT(2)(".");
       if (!strcmp (searcher->getName(), mtlName))
         {
-          PRINTF(2)("found.\n");
+          PRINT(2)("found.\n");
           return searcher;
         }
       searcher = searcher->nextMat;
     }
-  PRINTF(2)("not found\n");
+  PRINT(2)("not found\n");
   return NULL;
 }

orxonox/branches/trackManager/src/importer/material.h

@@ -13 +13 @@
 extern int verbose; //!< will be obsolete soon.
 
-#include "../stdincl.h"
-#include "texture.h"
-
 #if HAVE_CONFIG_H 
 #include <config.h> 
 #endif /* HAVE_CONFIG_H */
 
-
+// FORWARD DEFINITIONS //
+class Texture;
 
 

orxonox/branches/trackManager/src/importer/model.cc

@@ -15 +15 @@
 
 #include "model.h"
-int verbose = 1; //! \todo should be GLOBAL
+
+#include <math.h>
+#include <stdarg.h>
+
+#include "array.h"
+#include "../vector.h"
+
 using namespace std;
 
 /**
-   \brief Creates a 3D-Model, but does not load any 3D-models.
-
-   This Constructor is pretty useless, because why load no model in an model-loader??
-*/
-Model::Model ()
-{
-
+   \brief Creates a 3D-Model.
+
+   This only initializes a 3D-Model, but does not cleanup the Faces.
+*/
+Model::Model(void)
+{
   this->initialize();
-
-  this->BoxModel();
-
+}
+
+/**
+   \brief Creates a 3D-Model of Primitive-Type type
+
+   if you want to just display a Cube/Sphere/Cylinder/... without any material.
+   
+   \todo implement Cube/Sphere/Cylinder/...
+*/
+Model::Model(PRIMITIVE type)
+{
+  this->initialize();
+
+  switch (type)
+    {
+    default:
+    case CUBE:
+      this->cubeModel();
+      break;
+    case SPHERE:
+      this->sphereModel();
+      break;
+    case CYLINDER:
+      this->cylinderModel();
+      break;
+
+    }
   this->importToGL ();
 
@@ -36 +65 @@
 
 /**
-   \brief Crates a 3D-Model and loads in a File.
-   \param fileName file to parse and load (must be a .obj file)
-*/
-Model::Model(char* fileName)
+   \brief Creates a 3D-Model. and assigns it a Name.
+*/
+Model::Model(char* modelName)
 {
   this->initialize();
-
-  this->importFile (fileName);
-
-  this->importToGL ();
-
-  this->cleanup();
-}
-
-/**
-   \brief Crates a 3D-Model, loads in a File and scales it.
-   \param fileName file to parse and load (must be a .obj file)
-   \param scaling The factor that the model will be scaled with.
-*/
-Model::Model(char* fileName, float scaling)
-{
-  this->initialize();
-  this->scaleFactor = scaling;
-
-  this->importFile (fileName);
-
-  this->importToGL ();
-
-  this->cleanup();
+  this->setName(modelName);
 }
 
@@ -72 +78 @@
    Looks if any from model allocated space is still in use, and if so deleted it.
 */
-Model::~Model()
-{
-  PRINTF(2)("Deleting display Lists.\n");
+Model::~Model(void)
+{
+  PRINTF(3)("Deleting Model ");
+  if (this->name)
+    {
+      PRINT(3)("%s\n", this->name);
+      delete []this->name;
+    }
+  else
+      PRINT(3)("\n");
+
+  PRINTF(3)("Deleting display Lists.\n");
   Group* walker = this->firstGroup;
   while (walker != NULL)
@@ -84 +99 @@
     }
 
-  if (this->objPath)
-    delete []this->objPath;
-  if (this->objFileName)
-    delete []this->objFileName;
-  if (this->mtlFileName)
-    delete []this->mtlFileName;
-  PRINTF(2)("Deleting Materials.\n");
+  PRINTF(3)("Deleting Materials.\n");
   if (this->material)
     delete this->material;
 }
 
+/**
+   \brief Finalizes an Object. This can be done outside of the Class.
+*/
+void Model::finalize(void)
+{
+  this->importToGL ();
+  
+  this->cleanup();
+
+  this->finalized = true;
+}
 
 /**
@@ -139 +159 @@
       walker = walker->next;
     }
-  PRINTF(1)("Model number %i in %s not Found.\n", groupNumber, this->objFileName);
+  PRINTF(1)("Model number %i in %s not Found.\n", groupNumber, this->name);
   return;
 
@@ -164 +184 @@
       walker = walker->next;
     }
-  PRINTF(1)("Model Named %s in %s not Found.\n", groupName, this->objFileName);
+  PRINTF(1)("Model Named %s in %s not Found.\n", groupName, this->name);
   return;
 }
@@ -186 +206 @@
   PRINTF(2)("new 3D-Model is being created\n"); 
 
+  this->name = NULL;
+  this->finalized = false;
   // setting the start group;
   this->firstGroup = new Group;
@@ -192 +214 @@
   
   this->initGroup (this->currentGroup);
-  this->objPath = NULL;
-  this->objFileName = NULL;
-  this->mtlFileName = NULL;
   this->scaleFactor = 1;
   this->material = new Material();
@@ -205 +224 @@
 }
 
+void Model::setName(const char* name)
+{
+  if (this->name) 
+    delete this->name;
+  this->name = new char[strlen(name)+1];
+  strcpy(this->name, name);
+}
 /**
    \brief initializes a new Group model
@@ -317 +343 @@
 
 /**
-   \brief Imports a obj file and handles the the relative location
-   \param fileName The file to import
-*/
-bool Model::importFile (char* fileName)
-{
-  PRINTF(3)("preparing to read in file: %s\n", fileName);
-
-
-#ifdef __WIN32__
-  // win32 path reading
-  char pathSplitter= '\\';
-#else /* __WIN32__ */
-  // unix path reading
-  char pathSplitter='/';
-#endif /* __WIN32__ */
-  char* tmpName = fileName;
-  if (tmpName[0] == pathSplitter)
-    tmpName++;
-  char* name = tmpName;
-  while (( tmpName = strchr (tmpName+1, pathSplitter)))
-    {
-      name = tmpName+1;
-    }
-  this->objPath = new char[name-fileName];
-  strncpy(this->objPath, fileName, name-fileName);
-  this->objPath[name-fileName] = '\0';
-  if (verbose >=2)
-    if (strlen(objPath)> 0)
-      PRINTF(0)("Resolved file %s to folder: %s.\n", name, objPath);
-    else
-      PRINTF(0)("Resolved file %s.\n", name);
-  
-  if (this->material)
-    this->material->addTexturePath(this->objPath);
-  this->objFileName = new char[strlen(name)+1];
-  strcpy (this->objFileName, name);
-  this->readFromObjFile ();
-  return true;
-}
-
-/**
-   \brief Reads in the .obj File and sets all the Values.
-   This function does read the file, parses it for the occurence of things like vertices, faces and so on, and executes the specific tasks
-*/
-bool Model::readFromObjFile (void)
-{
-  char* fileName = new char [strlen(objPath)+strlen(objFileName)+1];
-  if (this->objFileName != NULL && !strcmp(this->objFileName, ""))
-    return false;
-  strcpy(fileName, this->objPath);
-  strcat(fileName, this->objFileName);
-
-  ifstream* OBJ_FILE = new ifstream(fileName);
-  if (OBJ_FILE->fail())
-    {
-      PRINTF(1)("unable to open .OBJ file: %s\n Loading Box Model instead.\n", fileName);
-      BoxModel();
-      OBJ_FILE->close();
-      delete []fileName;
-      delete OBJ_FILE;
-      return false;
-    }
-  PRINTF(2)("Reading from opened file %s\n", fileName);
-  char Buffer[10000];
-  while(!OBJ_FILE->eof())
-    {
-      OBJ_FILE->getline(Buffer, 10000);
-      PRINTF(3)("Read input line: %s\n", Buffer);
-      
-
-      // case vertice
-      if (!strncmp(Buffer, "v ", 2))
-        {
-          this->readVertex(Buffer+2);
-        }
-
-      // case face
-      else if (!strncmp(Buffer, "f ", 2))
-        {
-          this->readFace (Buffer+2);
-        }
-      
-      else if (!strncmp(Buffer, "mtllib ", 7))
-        {
-          this->readMtlLib (Buffer+7);
-        }
-
-      else if (!strncmp(Buffer, "usemtl ", 7))
-        {
-          this->readUseMtl (Buffer+7);
-        }
-
-      // case VertexNormal
-      else if (!strncmp(Buffer, "vn ", 3))
-        {
-          this->readVertexNormal(Buffer+3);
-        }
-      
-      // case VertexTextureCoordinate
-      else if (!strncmp(Buffer, "vt ", 3))
-        {
-          this->readVertexTexture(Buffer+3);
-        }
-      // case group
-      else if (!strncmp(Buffer, "g ", 2))
-        {
-          this->readGroup (Buffer+2);
-        }
-      else if (!strncmp(Buffer, "s ", 2)) //! \todo smoothing groups have to be implemented
-        {
-          if (verbose >= 2)
-            PRINTF(2)("smoothing groups not supportet yet. line: %s\n", Buffer);
-        }
-    }
-  OBJ_FILE->close();
-  delete OBJ_FILE;
-  delete []fileName;
-  return true;
-
-}
-
-/**
    \brief parses a group String
    \param groupString the new Group to create
@@ -445 +349 @@
    With it you should be able to import .obj-files with more than one Models inside. 
 */
-bool Model::readGroup (char* groupString)
+bool Model::addGroup (char* groupString)
 {
   PRINTF(3)("Read Group: %s.\n", groupString);
@@ -470 +374 @@
    If a vertex line is found this function will inject it into the vertex-Array
 */
-bool Model::readVertex (char* vertexString)
+bool Model::addVertex (char* vertexString)
 {
   float subbuffer1;
@@ -482 +386 @@
 
 /**
+   \brief parses a vertex-String
+   \param x the X-coordinate of the Vertex to add.
+   \param y the Y-coordinate of the Vertex to add.
+   \param z the Z-coordinate of the Vertex to add.
+   
+*/
+bool Model::addVertex(const float x, const float y, const float z)
+{
+  PRINTF(4)("reading in a vertex: %f %f %f\n", x, y, z);
+  this->vertices->addEntry(x*scaleFactor, y*scaleFactor, z*scaleFactor);
+  return true;
+}
+
+/**
    \brief parses a face-string
    \param faceString The String that will be parsed.
 
    If a face line is found this function will add it to the glList.
-   The function makes a difference between QUADS and TRIANGLES, and will if changed re-open, set and re-close the gl-processe.
-*/
-bool Model::readFace (char* faceString)
+*/
+bool Model::addFace (char* faceString)
 {
   if (this->currentGroup->faceCount >0)
@@ -546 +463 @@
 
 /**
+   \brief adds a new Face
+   \param faceElemCount the number of Vertices to add to the Face.
+   \param type 0: vertex only, 1: vertex and normal, 2: vertex and Texture, 3 vertex, normal and texture
+*/
+bool Model::addFace(const float faceElemCount, int type, ...)
+{
+   if (this->currentGroup->faceCount > 0)
+    this->currentGroup->currentFace = this->currentGroup->currentFace->next = new Face;
+  this->initFace (this->currentGroup->currentFace);
+
+  FaceElement* tmpElem = this->currentGroup->currentFace->firstElem = new FaceElement;
+  tmpElem->next = NULL;
+  
+  va_list itemlist;
+  va_start (itemlist, type);
+
+  for (int i = 0; i < faceElemCount; i++)
+    {
+      if (this->currentGroup->currentFace->vertexCount>0)
+          tmpElem = tmpElem->next = new FaceElement;
+      tmpElem->next = NULL;
+
+      tmpElem->vertexNumber = va_arg (itemlist, int) -1;
+      if (type >= 2)
+        tmpElem->texCoordNumber = va_arg (itemlist, int) -1;
+      if (type == 1 || type ==3)
+        tmpElem->normalNumber = va_arg(itemlist, int) -1;
+      this->currentGroup->currentFace->vertexCount++;
+    }
+  va_end(itemlist);
+
+  this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount - 2;
+}
+
+/**
    \brief parses a vertexNormal-String
    \param normalString The String that will be parsed.
@@ -551 +503 @@
    If a vertexNormal line is found this function will inject it into the vertexNormal-Array
 */
-bool Model::readVertexNormal (char* normalString)
+bool Model::addVertexNormal (char* normalString)
 {
   float subbuffer1;
@@ -563 +515 @@
 
 /**
+   \brief adds a VertexNormal.
+   \param x The x coordinate of the Normal.
+   \param y The y coordinate of the Normal.
+   \param z The z coordinate of the Normal.
+
+   If a vertexNormal line is found this function will inject it into the vertexNormal-Array
+*/
+bool Model::addVertexNormal(const float x, const float y, const float z)
+{
+  PRINTF(3)("found vertex-Normal %f, %f, %f\n", x, y, z);
+  this->normals->addEntry(x, y, z);
+}
+
+/**
    \brief parses a vertexTextureCoordinate-String
    \param vTextureString The String that will be parsed.
@@ -569 +535 @@
    this function will inject it into the vertexTexture-Array
 */
-bool Model::readVertexTexture (char* vTextureString)
+bool Model::addVertexTexture (char* vTextureString)
 {
   float subbuffer1;
@@ -580 +546 @@
 }
 
-/** 
-    \brief Function to read in a mtl File.
-    \param mtlFile The .mtl file to read
-
-    This Function parses all Lines of an mtl File.
-    The reason for it not to be in the materials-class is,
-    that a material does not have to be able to read itself in from a File.
-
-*/
-bool Model::readMtlLib (char* mtlFile)
-{
-  this->mtlFileName = new char [strlen(mtlFile)+1];
-  strcpy(this->mtlFileName, mtlFile);
-  char* fileName = new char [strlen(objPath) + strlen(this->mtlFileName)+1];
-  strcpy(fileName, this->objPath);
-  strcat(fileName, this->mtlFileName);
-  
-
-  PRINTF(3)("Opening mtlFile: %s\n", fileName);
-
-  ifstream* MTL_FILE = new ifstream (fileName);
-  if (MTL_FILE->fail())
-    {
-      PRINTF(1)("unable to open file: %s\n", fileName);
-      MTL_FILE->close();
-      delete []fileName;
-      delete MTL_FILE;
-      return false;
-    }
-  char Buffer[500];
-  Material* tmpMat = material;
-  while(!MTL_FILE->eof())
-    {
-      MTL_FILE->getline(Buffer, 500);
-      PRINTF(4)("found line in mtlFile: %s\n", Buffer);
-      
-
-      // create new Material
-      if (!strncmp(Buffer, "newmtl ", 7))
-        {
-          tmpMat = tmpMat->addMaterial(Buffer+7);
-          //      PRINTF(2)("%s, %p\n", tmpMat->getName(), tmpMat);
-        }
-      // setting a illumMode
-      else if (!strncmp(Buffer, "illum ", 6))
-        {
-          tmpMat->setIllum(Buffer+6);
-
-        }
-      // setting Diffuse Color
-      else if (!strncmp(Buffer, "Kd ", 3))
-        {
-          tmpMat->setDiffuse(Buffer+3);
-        }
-      // setting Ambient Color
-      else if (!strncmp(Buffer, "Ka ", 3))
-        {
-          tmpMat->setAmbient(Buffer+3);
-        }
-      // setting Specular Color
-      else if (!strncmp(Buffer, "Ks ", 3))
-        {
-          tmpMat->setSpecular(Buffer+3);
-        }
-      // setting The Specular Shininess
-      else if (!strncmp(Buffer, "Ns ", 3))
-        {
-          tmpMat->setShininess(Buffer+3);
-        }
-      // setting up transparency
-      else if (!strncmp(Buffer, "d ", 2))
-        {
-          tmpMat->setTransparency(Buffer+2);
-        }
-      else if (!strncmp(Buffer, "Tf ", 3))
-        {
-          tmpMat->setTransparency(Buffer+3);
-        }
-      
-      else if (!strncmp(Buffer, "map_Kd ", 7))
-        {
-          tmpMat->setDiffuseMap(Buffer+7);
-        }
-      else if (!strncmp(Buffer, "map_Ka ", 7))
-        {
-          tmpMat->setAmbientMap(Buffer+7);
-        }
-      else if (!strncmp(Buffer, "map_Ks ", 7))
-        {
-          tmpMat->setSpecularMap(Buffer+7);
-        }
-      else if (!strncmp(Buffer, "bump ", 5))
-        {
-          tmpMat->setBump(Buffer+7);
-        }
-     
-
-    }
-  MTL_FILE->close();
-  delete []fileName;
-  delete MTL_FILE;
-  return true;
+/**
+   \brief adds a Texture Coordinate
+   \param u The u coordinate of the TextureCoordinate.
+   \param v The y coordinate of the TextureCoordinate.
+
+   If a TextureCoordinate line is found this function will inject it into the TextureCoordinate-Array
+*/
+bool Model::addVertexTexture(const float u, const float v)
+{
+  PRINTF(3)("found vertex-Texture %f, %f\n", u, v);
+  this->vTexture->addEntry(u);
+  this->vTexture->addEntry(v);
 }
 
@@ -688 +564 @@
    \param matString the Material that will be set.
 */
-bool Model::readUseMtl (char* matString)
-{
+bool Model::addUseMtl (char* matString)
+{
+  /*
   if (!this->mtlFileName)
     {
@@ -695 +572 @@
       return false;
     }
-      
+  */      
   if (this->currentGroup->faceCount >0)
     this->currentGroup->currentFace = this->currentGroup->currentFace->next = new Face;
@@ -717 +594 @@
   this->vertices->finalizeArray();
   this->vTexture->finalizeArray();
-  if (normals->getCount() == 0) // vertices-Array must be uilt for this
+  if (normals->getCount() == 0) // vertices-Array must be built for this
     this->buildVertexNormals();
   this->normals->finalizeArray();
@@ -743 +620 @@
                 glEnd();
               this->currentGroup->faceMode = 0;
-              PRINTF(2)("using material %s for coming Faces.\n", tmpFace->materialString);
               Material* tmpMat;
               if ((tmpMat = material->search(tmpFace->materialString)) != NULL)
-                tmpMat->select();
+                {
+                  tmpMat->select();
+                  PRINTF(2)("using material %s for coming Faces.\n", tmpFace->materialString);
+                }
+              else 
+                PRINTF(1)("material %s not found.\n", tmpFace->materialString);
+
 
             }
@@ -893 +775 @@
       normArray[i].normalize();
       PRINTF(3)("Found Normale number %d: (%f; %f, %f).\n", i, normArray[i].x, normArray[i].y, normArray[i].z);
-
+      
       this->normals->addEntry(normArray[i].x, normArray[i].y, normArray[i].z);
 
@@ -907 +789 @@
    This will inject a Cube, because this is the most basic model.
 */
-void Model::BoxModel(void)
-{
-  this->readVertex ("-0.5 -0.5 0.5");
-  this->readVertex ("0.5 -0.5 0.5");
-  this->readVertex ("-0.5 0.5 0.5");
-  this->readVertex ("0.5 0.5 0.5");
-  this->readVertex ("-0.5 0.5 -0.5");
-  this->readVertex ("0.5 0.5 -0.5");
-  this->readVertex ("-0.5 -0.5 -0.5");
-  this->readVertex ("0.5 -0.5 -0.5");
-
-  this->readVertexTexture ("0.0 0.0");
-  this->readVertexTexture ("1.0 0.0");
-  this->readVertexTexture ("0.0 1.0");
-  this->readVertexTexture ("1.0 1.0");
-  this->readVertexTexture ("0.0 2.0");
-  this->readVertexTexture ("1.0 2.0");
-  this->readVertexTexture ("0.0 3.0");
-  this->readVertexTexture ("1.0 3.0");
-  this->readVertexTexture ("0.0 4.0");
-  this->readVertexTexture ("1.0 4.0");
-  this->readVertexTexture ("2.0 0.0");
-  this->readVertexTexture ("2.0 1.0");
-  this->readVertexTexture ("-1.0 0.0");
-  this->readVertexTexture ("-1.0 1.0");
-
-  this->readVertexNormal ("0.0 0.0 1.0");
-  this->readVertexNormal ("0.0 0.0 1.0");
-  this->readVertexNormal ("0.0 0.0 1.0");
-  this->readVertexNormal ("0.0 0.0 1.0");
-  this->readVertexNormal ("0.0 1.0 0.0");
-  this->readVertexNormal ("0.0 1.0 0.0");
-  this->readVertexNormal ("0.0 1.0 0.0");
-  this->readVertexNormal ("0.0 1.0 0.0");
-  this->readVertexNormal ("0.0 0.0 -1.0");
-  this->readVertexNormal ("0.0 0.0 -1.0");
-  this->readVertexNormal ("0.0 0.0 -1.0");
-  this->readVertexNormal ("0.0 0.0 -1.0");
-  this->readVertexNormal ("0.0 -1.0 0.0");
-  this->readVertexNormal ("0.0 -1.0 0.0");
-  this->readVertexNormal ("0.0 -1.0 0.0");
-  this->readVertexNormal ("0.0 -1.0 0.0");
-  this->readVertexNormal ("1.0 0.0 0.0");
-  this->readVertexNormal ("1.0 0.0 0.0");
-  this->readVertexNormal ("1.0 0.0 0.0");
-  this->readVertexNormal ("1.0 0.0 0.0");
-  this->readVertexNormal ("-1.0 0.0 0.0");
-  this->readVertexNormal ("-1.0 0.0 0.0");
-  this->readVertexNormal ("-1.0 0.0 0.0");
-  this->readVertexNormal ("-1.0 0.0 0.0");
+void Model::cubeModel(void)
+{
+  this->addVertex ("-0.5 -0.5 0.5");
+  this->addVertex ("0.5 -0.5 0.5");
+  this->addVertex ("-0.5 0.5 0.5");
+  this->addVertex ("0.5 0.5 0.5");
+  this->addVertex ("-0.5 0.5 -0.5");
+  this->addVertex ("0.5 0.5 -0.5");
+  this->addVertex ("-0.5 -0.5 -0.5");
+  this->addVertex ("0.5 -0.5 -0.5");
+
+  this->addVertexTexture ("0.0 0.0");
+  this->addVertexTexture ("1.0 0.0");
+  this->addVertexTexture ("0.0 1.0");
+  this->addVertexTexture ("1.0 1.0");
+  this->addVertexTexture ("0.0 2.0");
+  this->addVertexTexture ("1.0 2.0");
+  this->addVertexTexture ("0.0 3.0");
+  this->addVertexTexture ("1.0 3.0");
+  this->addVertexTexture ("0.0 4.0");
+  this->addVertexTexture ("1.0 4.0");
+  this->addVertexTexture ("2.0 0.0");
+  this->addVertexTexture ("2.0 1.0");
+  this->addVertexTexture ("-1.0 0.0");
+  this->addVertexTexture ("-1.0 1.0");
+
+  this->addVertexNormal ("0.0 0.0 1.0");
+  this->addVertexNormal ("0.0 0.0 1.0");
+  this->addVertexNormal ("0.0 0.0 1.0");
+  this->addVertexNormal ("0.0 0.0 1.0");
+  this->addVertexNormal ("0.0 1.0 0.0");
+  this->addVertexNormal ("0.0 1.0 0.0");
+  this->addVertexNormal ("0.0 1.0 0.0");
+  this->addVertexNormal ("0.0 1.0 0.0");
+  this->addVertexNormal ("0.0 0.0 -1.0");
+  this->addVertexNormal ("0.0 0.0 -1.0");
+  this->addVertexNormal ("0.0 0.0 -1.0");
+  this->addVertexNormal ("0.0 0.0 -1.0");
+  this->addVertexNormal ("0.0 -1.0 0.0");
+  this->addVertexNormal ("0.0 -1.0 0.0");
+  this->addVertexNormal ("0.0 -1.0 0.0");
+  this->addVertexNormal ("0.0 -1.0 0.0");
+  this->addVertexNormal ("1.0 0.0 0.0");
+  this->addVertexNormal ("1.0 0.0 0.0");
+  this->addVertexNormal ("1.0 0.0 0.0");
+  this->addVertexNormal ("1.0 0.0 0.0");
+  this->addVertexNormal ("-1.0 0.0 0.0");
+  this->addVertexNormal ("-1.0 0.0 0.0");
+  this->addVertexNormal ("-1.0 0.0 0.0");
+  this->addVertexNormal ("-1.0 0.0 0.0");
 
   /* normaleLess-testingMode
-  this->readFace ("1 2 4 3");
-  this->readFace ("3 4 6 5");
-  this->readFace ("5 6 8 7");
-  this->readFace ("7 8 2 1");
-  this->readFace ("2 8 6 4");
-  this->readFace ("7 1 3 5");
+  this->addFace ("1 2 4 3");
+  this->addFace ("3 4 6 5");
+  this->addFace ("5 6 8 7");
+  this->addFace ("7 8 2 1");
+  this->addFace ("2 8 6 4");
+  this->addFace ("7 1 3 5");
   */
 
-  this->readFace ("1/1/1 2/2/2 4/4/3 3/3/4");
-  this->readFace ("3/3/5 4/4/6 6/6/7 5/5/8");
-  this->readFace ("5/5/9 6/6/10 8/8/11 7/7/12");
-  this->readFace ("7/7/13 8/8/14 2/10/15 1/9/16");
-  this->readFace ("2/2/17 8/11/18 6/12/19 4/4/20");
-  this->readFace ("7/13/21 1/1/22 3/3/23 5/14/24");
-
-}
+  this->addFace ("1/1/1 2/2/2 4/4/3 3/3/4");
+  this->addFace ("3/3/5 4/4/6 6/6/7 5/5/8");
+  this->addFace ("5/5/9 6/6/10 8/8/11 7/7/12");
+  this->addFace ("7/7/13 8/8/14 2/10/15 1/9/16");
+  this->addFace ("2/2/17 8/11/18 6/12/19 4/4/20");
+  this->addFace ("7/13/21 1/1/22 3/3/23 5/14/24");
+
+}
+
+
+void Model::sphereModel()
+{
+  int detail = 30;
+  if (detail <= 0) detail = 1;
+  float df = (float)detail;
+  for (float i = 0.0; i < df/2; i+=1.0)
+    {
+      for (float j = 0.0; j < df; j+=1.0)
+      {
+        float vz = i/df *2.0*PI - PI/2.0;
+        this->addVertex(cos(j/df*2.0*PI) * cos(vz) ,
+                        sin(j/df*2.0*PI) * cos(vz),
+                        sin(vz));
+        //if (j==0.0)
+        //printf ("%f %f\n", vz, sin (vz));
+        if (i==0.0)
+                  printf("%f, %f\n", j/df*2.0*PI, cos(j/df*PI));
+      }
+    }
+  vertices->debug();
+  for (int i = 0; i < detail/2; i++)
+    for (int j = 1; j < detail; j++)
+      {
+        unsigned int v1,v2,v3,v4;
+        v1 = i*detail +j;
+
+        /*      if (j+1 == detail)
+          {
+            v2 = i*detail +1;
+            v3 = i*detail+detail + 1;
+          }
+          else*/
+          {
+            v2 = i*detail +j+1;
+            v3 = i*detail+detail + j+1;
+          }
+        v4 = i*detail+detail + j;
+        //printf("%i %i %i %i\n", v1, v2, v3, v4);
+        this->addFace(4, 0, v1, v2, v3, v4);
+      }
+}
+
+/**
+   \brief Creates a Cylinder.
+*/
+void Model::cylinderModel(void)
+{
+  unsigned int detail = 20;
+  float size = 1.0;
+
+  // check if devision by zero
+  if (detail <= 3)
+    detail = 3;
+  int count = 0;
+  // defining Points of the Cylinder.
+  for (float phi = 0.0; phi < 2.0*PI; phi += 2.0*PI/(float)detail)
+    {
+      this->addVertex(size*cos(phi), size*sin(phi), -size);
+      this->addVertex(size*cos(phi), size*sin(phi), size);
+      count ++;
+    }
+  this->addVertex(0, 0, -size);
+  this->addVertex(0, 0, size);
+
+  
+  if (count != detail)
+    cout << "calculation error, count should be " << detail << " but is " << count << endl;
+  vertices->debug();
+
+  // adding Faces
+  for (int i = 0; i < detail-1; i++)
+    {
+      int p1, p2, p3, p4;
+      p1 = 2*i+1;
+      p2 = 2*i+2;
+      if (i <= detail);
+      p3 = 2*i+4;
+      p4 = 2*i+3;
+      cout <<i+1 <<": "<< p1 <<" "<< p2 <<" "<< p3 <<" "<< p4 <<endl;
+      this->addFace(4, 0, p1, p2, p3, p4);
+      this->addFace(3, 0, p4, p1, 2*detail+1);
+      this->addFace(3, 0, p2, p3, 2*detail+2);
+    }
+  addFace(4,0, 2*detail-1, 2*detail, 2, 1);
+  this->addFace(3, 0, 1, 2*detail-1, 2*detail+1);
+  this->addFace(3, 0, 2*detail, 2, 2*detail+2);
+
+}

orxonox/branches/trackManager/src/importer/model.h

@@ -7 +7 @@
 #define _MODEL_H
 
-#include "../stdincl.h"
+//#include "../stdincl.h"
 
-#include "array.h"
 #include "material.h"
-#include "vector.h"
-#include <fstream>
+
+// FORWARD DEFINITION //
+class Array;
+class Vector;
 
 using namespace std;
 
-
+enum PRIMITIVE {PLANE, CUBE, SPHERE, CYLINDER};
 
 //! Class that handles 3D-Models. it can also read them in and display them.
@@ -22 +23 @@
 {
  public:
-  Model ();
-  Model (char* fileName);
-  Model(char* fileName, float scaling);
-  ~Model ();
+  Model(void);
+  Model(PRIMITIVE type);
+  Model(char* modelName);
+  virtual ~Model(void);
+
+  void setName(const char* name);
   
-  void draw (void) const;
-  void draw (int groupNumber) const;
-  void draw (char* groupName) const;
+  void draw(void) const;
+  void draw(int groupNumber) const;
+  void draw(char* groupName) const;
   int getGroupCount() const;
 
- private:
+ protected:
+  char* name;            //!< This is the name of the Model.
+  bool finalized;        //!< Sets the Object to be finalized.
+  
   //! This is the placeholder of one Vertex beloning to a Face.
-  struct FaceElement 
+  struct FaceElement
   {
     int vertexNumber;    //!< The number of the Vertex out of the Array* vertices, this vertex points to.
@@ -43 +49 @@
 
   //! This is the placeholder of a Face belonging to a Group of Faces.
-  /**
-     \todo take Material to a call for itself.
-
-     This can also be a Material-Change switch. 
-     That means if you want to change a Material inside of a group,
-     you can create an empty face and apply a material to it, and the Importer will cahnge Colors
-  */
-  struct Face 
+  struct Face
   {
     int vertexCount;        //!< The Count of vertices this Face has.
@@ -65 +64 @@
     char* name;         //!< the Name of the Group. this is an identifier, that can be accessed via the draw (char* name) function.
 
-    GLuint listNumber;  //!< The number of the GL-List this Group gets.
+    unsigned int listNumber;//!< The number of the GL-List this Group gets.
     Face* firstFace;    //!< The first Face in this group.
     Face* currentFace;  //!< The current Face in this Group (the one we are currently working with.)
@@ -88 +87 @@
   float scaleFactor;    //!< The Factor with which the Model should be scaled. \todo maybe one wants to scale the Model after Initialisation
 
-  char* objPath;        //!< The Path wher the obj and mtl-file are located.
-  char* objFileName;    //!< The Name of the obj-file.
-  char* mtlFileName;    //!< The Name of the mtl-file (parsed out of the obj-file)
-
-  bool initialize (void);
+  bool initialize(void);
   bool initGroup(Group* group);
   bool initFace (Face* face);
@@ -100 +95 @@
   bool cleanupFaceElement(FaceElement* faceElem);
 
-  ///// readin ///
-  bool importFile (char* fileName);
-  bool readFromObjFile (void);
-  
-  bool readGroup (char* groupString);
-  bool readVertex (char* vertexString);
-  bool readFace (char* faceString);
-  bool readVertexNormal (char* normalString);
-  bool readVertexTexture (char* vTextureString);
-  bool readMtlLib (char* matFile);
-  bool readUseMtl (char* mtlString);
+ public:
+  bool addGroup(char* groupString);
+  bool addVertex(char* vertexString);
+  bool addVertex(const float x, const float y, const float z);
+  bool addFace(char* faceString);
+  bool addFace(const float faceElemCount, int type, ...);
+  bool addVertexNormal(char* normalString);
+  bool addVertexNormal(const float x, const float y, const float z);
+  bool addVertexTexture(char* vTextureString);
+  bool addVertexTexture(const float u, const float v);
+  bool addUseMtl(char* mtlString);
+  void finalize(void);
 
-  bool importToGL (void);
-  bool addGLElement (FaceElement* elem);
+ protected:
+  bool importToGL(void);
+  bool addGLElement(FaceElement* elem);
 
-  bool buildVertexNormals ();
+  bool buildVertexNormals(void);
 
-  void BoxModel (void);
+  void cubeModel(void);
+  void sphereModel(void);
+  void cylinderModel(void);
 };
 

orxonox/branches/trackManager/src/orxonox.cc

@@ -31 +31 @@
 #include "game_loader.h"
 #include <string.h>
+int verbose;
 
 using namespace std;

orxonox/branches/trackManager/src/player.cc

@@ -19 +19 @@
 #include "stdincl.h"
 #include "collision.h"
-#include "importer/model.h"
+#include "importer/objModel.h"
 
 using namespace std;
@@ -27 +27 @@
 {
 
-  this->model = new Model("reaplow.obj");
+  this->model = new OBJModel("../data/models/reaplow.obj");
   /*
   objectList = glGenLists(1);
@@ -104 +104 @@
   float matrix[4][4];
   
-  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-  //rotate
+  /* translate */
+  glTranslatef (this->getAbsCoor ().x, 
+                this->getAbsCoor ().y, 
+                this->getAbsCoor ().z);
+  /* rotate */
   this->getAbsDir ().matrix (matrix);
   glMultMatrixf((float*)matrix);

orxonox/branches/trackManager/src/player.h

@@ -9 +9 @@
 #include "world_entity.h"
 
-class Model;
+class OBJModel;
 
 //! Basic controllable WorldEntity

orxonox/branches/trackManager/src/track_manager.cc

@@ -376 +376 @@
   int tmpCurrentWorkingID = this->currentTrackElem->ID;
   this->workOn(trackIDs[0]);
-  float tmpLatestTime = this->currentTrackElem->endTime;
+  float tmpLatestTime = 0;
 
   TrackElement* firstJoint = this->currentTrackElem;
@@ -392 +392 @@
       if (tmpJoinElem->childCount == 0
           && tmpJoinElem->endTime > tmpLatestTime)
-            tmpLatestTime = tmpJoinElem->endTime;
+        tmpLatestTime = tmpJoinElem->endTime;
     }
   // Joining:

orxonox/branches/trackManager/src/track_manager.h

@@ -60 +60 @@
 //! The TrackManager handles the flow of the Players through the game.
 /**
-   \todo write the methodes
 
    <b>The TrackManager works as followed:</b> \n

orxonox/branches/trackManager/src/world.cc

@@ -27 +27 @@
 #include "helper_parent.h"
 #include "glmenu_imagescreen.h"
+#include "skysphere.h"
 
 using namespace std;
@@ -65 +66 @@
   this->localCamera->destroy();
 
-  this->nullParent->destroy ();
+  this->nullParent->destroy();
+  
+  delete this->skySphere;
 
   //delete this->trackManager;
@@ -148 +151 @@
   
   //GLMenuImageScreen* 
-  glmis = new GLMenuImageScreen();
-  glmis->init();
-  glmis->draw();
+  this->glmis = GLMenuImageScreen::getInstance();
+  this->glmis->init();
+  this->glmis->setMaximum(10);
+  this->glmis->draw();
  
   printf ("World::displayLoadScreen - end\n"); 
@@ -159 +163 @@
 {
   printf ("World::releaseLoadScreen - start\n"); 
-
+  this->glmis->setValue(this->glmis->getMaximum());
+  SDL_Delay(500);
   printf ("World::releaseLoadScreen - end\n"); 
 }
@@ -278 +283 @@
             
 
+            // Create SkySphere
+            skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
+
+            /*monitor progress*/
+            this->glmis->step();
+
             Vector* es = new Vector (50, 2, 0);
             Quaternion* qs = new Quaternion ();
@@ -329 +340 @@
             this->getCamera()->bind (myPlayer); 
             this->localPlayer->addChild (this->localCamera);
+
+            // Create SkySphere
+            skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
+
             break;
+
+
           }
         default:
@@ -592 +609 @@
   // draw debug coord system
   glCallList (objectList);
+
+  //! \todo skysphere is a WorldEntity and should be inside of the world-entity-list.
+  skySphere->draw();
 
 }
@@ -673 +693 @@
     }
 
+  skySphere->updatePosition(localCamera->absCoordinate);
   //for( int i = 0; i < tracklen; i++) track[i].tick (seconds);
 }

orxonox/branches/trackManager/src/world.h

@@ -16 +16 @@
 class PNode;
 class GLMenuImageScreen;
+class Skysphere;
 
 //! The game environment
@@ -74 +75 @@
   GLuint objectList;
   SDL_Surface *loadImage;
+  Skysphere* skySphere;
 
   WorldEntity* localPlayer;

orxonox/branches/trackManager/src/world_entity.h

@@ -11 +11 @@
 
 class CollisionCluster;
-class Model;
+class OBJModel;
 
 //! Basic class from which all interactive stuff in the world is derived from
@@ -22 +22 @@
   virtual ~WorldEntity ();
 
-  Model* model;
+  OBJModel* model;
   
   void setCollision (CollisionCluster* newhull);