Changeset 4770 in orxonox.OLD for orxonox

Timestamp:

Jul 2, 2005, 1:20:56 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: GraphicsEngine now parses the INI-file

Location:

orxonox/trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (2 diffs)
• lib/graphics/graphics_engine.h (modified) (2 diffs)
• orxonox.cc (modified) (1 diff)
• subprojects/gui/Makefile.am (modified) (1 diff)
• subprojects/gui/Makefile.in (modified) (5 diffs)

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -21 +21 @@
 #include "debug.h"
 #include "text_engine.h"
+
+#include "ini_parser.h"
+#include "substring.h"
 
 using namespace std;
@@ -102 +105 @@
   glEnable(GL_DEPTH_TEST);
 }
+
+/**
+ * loads the GraphicsEngine's settings from a given ini-file and section
+ * @param iniParser the iniParser to load from
+ * @param section the Section in the ini-file to load from
+ * @returns nothing usefull
+ */
+int GraphicsEngine::loadFromIniFile(IniParser* iniParser, const char* section)
+{
+  // searching for a usefull resolution
+  SubString resolution(iniParser->getVar(CONFIG_NAME_RESOLUTION, section, "640x480"), 'x');
+  this->setResolution(atoi(resolution.getString(0)), atoi(resolution.getString(1)), 16);
+
+  // looking if we are in fullscreen-mode
+  const char* fullscreen = iniParser->getVar(CONFIG_NAME_FULLSCREEN, section, "0");
+  if (strchr(fullscreen, '1'))
+    this->setFullscreen(true);
+}
+
 
 

orxonox/trunk/src/lib/graphics/graphics_engine.h

@@ -17 +17 @@
 // Forward Declaration
 class Text;
+class IniParser;
 
 //! class to handle graphics
@@ -30 +31 @@
 
     int initVideo();
+    int loadFromIniFile(IniParser* iniParser, const char* section);
 
     void setWindowName(const char* windowName, const char* icon);

orxonox/trunk/src/orxonox.cc

@@ -153 +153 @@
   GraphicsEngine::getInstance()->setWindowName(PACKAGE_NAME " " PACKAGE_VERSION, PACKAGE_NAME " " PACKAGE_VERSION);
 
-
-  SubString resolution(this->iniParser->getVar(CONFIG_NAME_RESOLUTION, CONFIG_SECTION_VIDEO, "640x480"), 'x');
-  GraphicsEngine::getInstance()->setResolution(atoi(resolution.getString(0)), atoi(resolution.getString(1)), 16);
-
-  const char* fullscreen = this->iniParser->getVar(CONFIG_NAME_FULLSCREEN, CONFIG_SECTION_VIDEO, "0");
-  printf("%s\n", fullscreen);
-  if (strchr(fullscreen, '1'))
-    GraphicsEngine::getInstance()->setFullscreen(true);
+  GraphicsEngine::getInstance()->loadFromIniFile(this->iniParser, CONFIG_SECTION_VIDEO);
 
   return 0;

orxonox/trunk/src/subprojects/gui/Makefile.am

@@ -24 +24 @@
              $(MAINSRCDIR)/util/resource_manager.cc \
              $(MAINSRCDIR)/lib/util/substring.cc \
-             $(MAINSRCDIR)/util/loading/load_param.cc
+             $(MAINSRCDIR)/util/loading/load_param.cc \
+             $(MAINSRCDIR)/lib/util/ini_parser.cc
 
 noinst_HEADERS=

orxonox/trunk/src/subprojects/gui/Makefile.in

@@ -56 +56 @@
         gui-base_object.$(OBJEXT) gui-class_list.$(OBJEXT) \
         gui-vector.$(OBJEXT) gui-resource_manager.$(OBJEXT) \
-        gui-substring.$(OBJEXT) gui-load_param.$(OBJEXT)
+        gui-substring.$(OBJEXT) gui-load_param.$(OBJEXT) \
+        gui-ini_parser.$(OBJEXT)
 gui_OBJECTS = $(am_gui_OBJECTS)
 am__DEPENDENCIES_1 =
@@ -66 +67 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/gui-graphics_engine.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/gui-gui_main.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/gui-ini_parser.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/gui-load_param.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/gui-resource_manager.Po \
@@ -206 +208 @@
              $(MAINSRCDIR)/util/resource_manager.cc \
              $(MAINSRCDIR)/lib/util/substring.cc \
-             $(MAINSRCDIR)/util/loading/load_param.cc
+             $(MAINSRCDIR)/util/loading/load_param.cc \
+             $(MAINSRCDIR)/lib/util/ini_parser.cc
 
 noinst_HEADERS = 
@@ -279 +282 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-graphics_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-gui_main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-ini_parser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-load_param.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-resource_manager.Po@am__quote@
@@ -427 +431 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-load_param.obj `if test -f '$(MAINSRCDIR)/util/loading/load_param.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/load_param.cc'; fi`
+
+gui-ini_parser.o: $(MAINSRCDIR)/lib/util/ini_parser.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gui-ini_parser.o -MD -MP -MF "$(DEPDIR)/gui-ini_parser.Tpo" -c -o gui-ini_parser.o `test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/ini_parser.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/gui-ini_parser.Tpo" "$(DEPDIR)/gui-ini_parser.Po"; else rm -f "$(DEPDIR)/gui-ini_parser.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/ini_parser.cc' object='gui-ini_parser.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/gui-ini_parser.Po' tmpdepfile='$(DEPDIR)/gui-ini_parser.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-ini_parser.o `test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/ini_parser.cc
+
+gui-ini_parser.obj: $(MAINSRCDIR)/lib/util/ini_parser.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gui-ini_parser.obj -MD -MP -MF "$(DEPDIR)/gui-ini_parser.Tpo" -c -o gui-ini_parser.obj `if test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/ini_parser.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/ini_parser.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/gui-ini_parser.Tpo" "$(DEPDIR)/gui-ini_parser.Po"; else rm -f "$(DEPDIR)/gui-ini_parser.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/ini_parser.cc' object='gui-ini_parser.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/gui-ini_parser.Po' tmpdepfile='$(DEPDIR)/gui-ini_parser.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-ini_parser.obj `if test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/ini_parser.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/ini_parser.cc'; fi`
 uninstall-info-am: