Changeset 4833 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Jul 11, 2005, 5:46:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fight against the mighty segfault

Location:

orxonox/trunk/src/lib

Files:

• event/key_mapper.cc (modified) (1 diff)
• graphics/graphics_engine.cc (modified) (5 diffs)
• graphics/graphics_engine.h (modified) (1 diff)
• util/substring.cc (modified) (2 diffs)
• util/substring.h (modified) (1 diff)

orxonox/trunk/src/lib/event/key_mapper.cc

@@ -56 +56 @@
 
 //! this is the mapping array from names to ids: enter all orxonox.conf keys here
-orxKeyMapping map[] = { {&KeyMapper::PEV_UP,                   "Up"},
-                        {&KeyMapper::PEV_DOWN,                 "Down"},
-                        {&KeyMapper::PEV_LEFT,                 "Left"},
-                        {&KeyMapper::PEV_RIGHT,                "Right"},
-                        {&KeyMapper::PEV_STRAFE_LEFT,          "StrafeLeft"},
-                        {&KeyMapper::PEV_STRAFE_RIGHT,         "StrafeRight"},
-
-                        {&KeyMapper::PEV_FIRE1,                "Fire"},
-                        {&KeyMapper::PEV_FIRE1,                "Fire1"},
-                        {&KeyMapper::PEV_FIRE2,                "Fire2"},
-                        {&KeyMapper::PEV_NEXT_WEAPON,          "Next"},
-                        {&KeyMapper::PEV_PREVIOUS_WEAPON,      "Prev"},
-
-
-                        {&KeyMapper::PEV_VIEW0,                "view0"},
-                        {&KeyMapper::PEV_VIEW1,                "view1"},
-                        {&KeyMapper::PEV_VIEW2,                "view2"},
-                        {&KeyMapper::PEV_VIEW3,                "view3"},
-                        {&KeyMapper::PEV_VIEW4,                "view4"},
-                        {&KeyMapper::PEV_VIEW5,                "view5"},
-
-                        {&KeyMapper::PEV_NEXT_WORLD,           "Next-World"},
-                        {&KeyMapper::PEV_PREVIOUS_WORLD,       "Prev-World"},
-
-                        {&KeyMapper::PEV_PAUSE,                "Pause"},
-                        {&KeyMapper::PEV_QUIT,                 "Quit"},
-                        {NULL, NULL}};
+/** @todo use globals.h for this.... everything is done there for those Options,
+ * and you do not have to care about The namings
+ */
+orxKeyMapping map[] = {
+  {&KeyMapper::PEV_UP,                   "Up"},
+  {&KeyMapper::PEV_DOWN,                 "Down"},
+  {&KeyMapper::PEV_LEFT,                 "Left"},
+  {&KeyMapper::PEV_RIGHT,                "Right"},
+  {&KeyMapper::PEV_STRAFE_LEFT,          "StrafeLeft"},
+  {&KeyMapper::PEV_STRAFE_RIGHT,         "StrafeRight"},
+
+  {&KeyMapper::PEV_FIRE1,                "Fire"},
+  {&KeyMapper::PEV_FIRE1,                "Fire1"},
+  {&KeyMapper::PEV_FIRE2,                "Fire2"},
+  {&KeyMapper::PEV_NEXT_WEAPON,          "Next"},
+  {&KeyMapper::PEV_PREVIOUS_WEAPON,      "Prev"},
+
+
+  {&KeyMapper::PEV_VIEW0,                "view0"},
+  {&KeyMapper::PEV_VIEW1,                "view1"},
+  {&KeyMapper::PEV_VIEW2,                "view2"},
+  {&KeyMapper::PEV_VIEW3,                "view3"},
+  {&KeyMapper::PEV_VIEW4,                "view4"},
+  {&KeyMapper::PEV_VIEW5,                "view5"},
+
+  {&KeyMapper::PEV_NEXT_WORLD,           "Next-World"},
+  {&KeyMapper::PEV_PREVIOUS_WORLD,       "Prev-World"},
+
+  {&KeyMapper::PEV_PAUSE,                "Pause"},
+  {&KeyMapper::PEV_QUIT,                 "Quit"},
+  {NULL, NULL}
+};
 
 

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

@@ -45 +45 @@
 
   this->fullscreenFlag = 0;
-
-//  this->listModes();
-
-  // subscribe the resolutionChanged-event
-  EventHandler::getInstance()->subscribe(this, ES_GAME, EV_VIDEO_RESIZE);
-
 }
 
@@ -85 +79 @@
 int GraphicsEngine::initFromIniFile(IniParser* iniParser)
 {
-
   // looking if we are in fullscreen-mode
   const char* fullscreen = iniParser->getVar(CONFIG_NAME_FULLSCREEN, CONFIG_SECTION_VIDEO, "0");
@@ -101 +94 @@
 
   // searching for a usefull resolution
-  SubString resolution(iniParser->getVar(CONFIG_NAME_RESOLUTION, CONFIG_SECTION_VIDEO, "640x480"), 'x');
-  this->initVideo(atoi(resolution.getString(0)), atoi(resolution.getString(1)), 16);
+//  SubString resolution(iniParser->getVar(CONFIG_NAME_RESOLUTION, CONFIG_SECTION_VIDEO, "640x480"), 'x');
+  //resolution.debug();
+
+  //this->initVideo(atoi(resolution.getString(0)), atoi(resolution.getString(1)), 16);
+  this->initVideo(640,480,16);
 }
 
@@ -154 +150 @@
   glEnable(GL_DEPTH_TEST);
 
+
+  // subscribe the resolutionChanged-event
+  //EventHandler::getInstance()->subscribe(this, ES_GAME, EV_VIDEO_RESIZE);
+  //! @todo eventSystem craps up the Starting of orxonox -> see why.
+
   this->isInit = true;
 }
@@ -247 +248 @@
 
 /**
-   \brief if Textures should be enabled
+ * if Textures should be enabled
 */
 bool GraphicsEngine::texturesEnabled = true;
 
+
+
+/**
+ *
+ * @param show if The mouse-cursor should be visible
+ */
+void GraphicsEngine::showMouse(bool show)
+{
+  if (show)
+    SDL_ShowCursor(SDL_ENABLE);
+  else
+    SDL_ShowCursor(SDL_DISABLE);
+}
+
+/**
+ *
+ * @returns The Visinility of the mouse-cursor (true if visible, false if it is invisible)
+ */
+bool GraphicsEngine::isMouseVisible()
+{
+  if (SDL_ShowCursor(SDL_QUERY) == SDL_ENABLE)
+    return true;
+  else
+    return false;
+}
+
+/**
+ *
+ * @param steal If the Winodow-Managers Events should be stolen to this app
+ * (steals the mouse, and all WM-clicks)
+ *
+ * This only happens, if the HARD-Debug-level is set to 0,1,2, because otherwise a Segfault could
+ * result in the loss of System-controll
+ */
+void GraphicsEngine::stealWMEvents(bool steal)
+{
+#if DEBUG < 3
+   if (steal)
+     SDL_WM_GrabInput(SDL_GRAB_ON);
+   else SDL_WM_GrabInput(SDL_GRAB_OFF);
+#endif
+}
+
+/**
+ *
+ * @returns true if Events are stolen from the WM, false if not.
+ */
+bool GraphicsEngine::isStealingEvents()
+{
+   if (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_ON)
+     return true;
+   else
+     return false;
+};
 
 

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

@@ -49 +49 @@
     int resolutionChanged(const SDL_ResizeEvent& resizeInfo);
 
-    /** @param show if The mouse-cursor should be visible */
-    inline static void showMouse(bool show) { (show)?SDL_ShowCursor(SDL_ENABLE):SDL_ShowCursor(SDL_DISABLE); };
-    /** @returns The Visinility of the mouse-cursor (true if visible, false if it is invisible) */
-    static bool isMouseVisible() { return (SDL_ShowCursor(SDL_QUERY) == SDL_ENABLE)?true:false; };
-    /** @param steal If the Winodow-Managers Events should be stolen to this app (steals the mouse, and all WM-clicks) */
-    static void stealWMEvents(bool steal) { (steal)?SDL_WM_GrabInput(SDL_GRAB_ON):SDL_WM_GrabInput(SDL_GRAB_OFF); };
-    /** @returns true if Events are stolen from the WM, false if not. */
-    static bool isStealingEvents() { if (SDL_GRAB_ON) return true; };
+    static void showMouse(bool show);
+    static bool isMouseVisible();
+    static void stealWMEvents(bool steal);
+    static bool isStealingEvents();
 
     static void enter2DMode();

orxonox/trunk/src/lib/util/substring.cc

@@ -24 +24 @@
 #include "substring.h"
 
+#include "debug.h"
 #include <string.h>
 #include <assert.h>
@@ -91 +92 @@
     return NULL;
 }
+
+
+
+/**
+ * Some nice debug information about this SubString
+ */
+void SubString::debug() const
+{
+  PRINT(0)("Substring-information::count=%d ::", this->splittersCount);
+  for (int i = 0; i < this->splittersCount; i++)
+    PRINT(0)("s%d:%s::", i, this->strings[i]);
+  PRINT(0)("\n");
+}

orxonox/trunk/src/lib/util/substring.h

@@ -17 +17 @@
   const char* getString( int i);
 
+  void debug() const;
+
  private:
   char**     strings;                      //!< strings produced from a single string splitted in multiple strings