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

Timestamp:

Jul 11, 2005, 5:43:37 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: implemented aim

Location:

orxonox/trunk/src/lib

Files:

• graphics/graphics_engine.cc (modified) (2 diffs)
• graphics/importer/model.h (modified) (2 diffs)
• graphics/text_engine.cc (modified) (2 diffs)
• gui/gui_exec.cc (modified) (11 diffs)
• sound/sound_engine.cc (modified) (2 diffs)
• sound/sound_engine.h (modified) (1 diff)
• util/substring.cc (modified) (4 diffs)
• util/substring.h (modified) (1 diff)

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

@@ -67 +67 @@
 }
 
+/**
+ * initializes the GraphicsEngine with default settings.
+ */
 int GraphicsEngine::init()
 {
-  this->initVideo(640,480,16);
-}
+  if (this->isInit)
+    return -1;
+  this->initVideo(640, 480, 16);
+  this->isInit = true;
+}
+
+/**
+ * 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::initFromIniFile(IniParser* iniParser)
+{
+
+  // looking if we are in fullscreen-mode
+  const char* fullscreen = iniParser->getVar(CONFIG_NAME_FULLSCREEN, CONFIG_SECTION_VIDEO, "0");
+  if (strchr(fullscreen, '1'))
+    this->fullscreenFlag = SDL_FULLSCREEN;
+
+
+
+  // looking if we are in fullscreen-mode
+  const char* textures = iniParser->getVar(CONFIG_NAME_TEXTURES, CONFIG_SECTION_VIDEO_ADVANCED, "0");
+  if (strchr(textures, '1'))
+    this->texturesEnabled = true;
+  else
+    this->texturesEnabled = false;
+
+  // 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);
+}
+
+
 
 /**
@@ -123 +159 @@
 
 /**
- * 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::initFromIniFile(IniParser* iniParser)
-{
-  // 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);
-
-  // looking if we are in fullscreen-mode
-  const char* fullscreen = iniParser->getVar(CONFIG_NAME_FULLSCREEN, CONFIG_SECTION_VIDEO, "0");
-  if (strchr(fullscreen, '1'))
-    this->setFullscreen(true);
-
-  // looking if we are in fullscreen-mode
-  const char* textures = iniParser->getVar(CONFIG_NAME_TEXTURES, CONFIG_SECTION_VIDEO_ADVANCED, "0");
-  if (strchr(textures, '1'))
-    this->texturesEnabled = true;
-  else
-    this->texturesEnabled = false;
-
-}
-
-
-
-/**
  * sets the Window Captions and the Name of the icon.
  * @param windowName The name of the Window

orxonox/trunk/src/lib/graphics/importer/model.h

@@ -26 +26 @@
  * \todo implement this stuff
 */
-typedef enum MODEL_TYPE {MODEL_DISPLAY_LIST,
-                         MODEL_VERTEX_ARRAY};
+typedef enum MODEL_TYPE {
+  MODEL_DISPLAY_LIST,
+  MODEL_VERTEX_ARRAY
+};
 
 
@@ -36 +38 @@
 
 //! an enumerator for VERTEX_FORMAT
-typedef enum VERTEX_FORMAT { VERTEX_ONLY = VERTEX,
-                             VERTEX_NORMAL = NORMAL,
-                             VERTEX_TEXCOORD = TEXCOORD,
-                             VERTEX_TEXCOORD_NORMAL = NORMAL | TEXCOORD };
+typedef enum VERTEX_FORMAT {
+  VERTEX_ONLY = VERTEX,
+  VERTEX_NORMAL = NORMAL,
+  VERTEX_TEXCOORD = TEXCOORD,
+  VERTEX_TEXCOORD_NORMAL = NORMAL | TEXCOORD
+};
 
 ////////////////////

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

@@ -254 +254 @@
       glTranslatef(pos.x, pos.y, 0);
 
-      char* tmpText = this->text;
+      const char* tmpText = this->text;
       while (*tmpText != '\0')
         {
@@ -921 +921 @@
   // drawing all the texts
   tIterator<Text>* textIterator = textList->getIterator();
-  Text* text = textIterator->nextElement();
-  while( text != NULL)
-    {
-      text->draw();
-      text = textIterator->nextElement();
+  Text* drawText = textIterator->nextElement();
+  while( drawText != NULL)
+    {
+      drawText->draw();
+      drawText = textIterator->nextElement();
     }
   delete textIterator;

orxonox/trunk/src/lib/gui/gui_exec.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -16 +16 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
@@ -38 +38 @@
 HashTable* orxonoxFlagHash;
 
-/** 
+/**
     \brief Creates the Exec-Frame
 */
@@ -59 +59 @@
       CheckButton* alwaysShow;     //!< A CheckButton, for if orxonox should start with or without gui.
       Button* quit;                //!< A Button to quit the Gui without starting orxonox.
-      
+
       start = new Button("Start");
 #ifdef HAVE_GTK2
@@ -73 +73 @@
       verboseMode = new Menu(CONFIG_NAME_VERBOSE_MODE, "nothing",
 #if DEBUG >=1
-                             "error",
+                             "error",
 #endif
 #if DEBUG >=2
-                             "warning",
+                             "warning",
 #endif
 #if DEBUG >=3
-                             "info",
+                             "info",
 #endif
 #if DEBUG >=4
-                             "debug",
+                             "debug",
 #endif
 #if DEBUG >=5
-                             "heavydebug",
-#endif
-                             "lastItem");
+                             "heavydebug",
+#endif
+                             "lastItem");
       verboseMode->setFlagName("verbose", "v", 2);
       verboseMode->setDescription("Sets the Output Mode", "This Enables Outbug messages\n"
-                                  "0: nothing will be displayed, but stuff one cannot do without (eg.GUI)\n"
+                                  "0: nothing will be displayed, but stuff one cannot do without (eg.GUI)\n"
 #if DEBUG >=1
-                                  "1: error: outputs all the above and errors"
+                                  "1: error: outputs all the above and errors"
 #endif
 #if DEBUG >=2
-                                  "2: warning: outputs all the above plus warnings"
+                                  "2: warning: outputs all the above plus warnings"
 #endif
 #if DEBUG >=3
-                                  "3: info: outputs all the above plus Information"
+                                  "3: info: outputs all the above plus Information"
 #endif
 #if DEBUG >=4
-                                  "4: debug: displays all the above plus debug information"
+                                  "4: debug: displays all the above plus debug information"
 #endif
 #if DEBUG >=5
-                                  "5: heavydebug: displays all the above plus heavy debug information: WARNING: the game will run very slow with this."
-#endif
-                                  );
+                                  "5: heavydebug: displays all the above plus heavy debug information: WARNING: the game will run very slow with this."
+#endif
+                                  );
       verboseMode->saveability();
       execBox->fill(verboseMode);
@@ -152 +152 @@
 
   PRINTF(5)("Config Directory is: %s.\n", this->confDir);
-  //! \todo F** Windows-support
+  //! @todo F** Windows-support
 #ifndef __WIN32__
   mkdir(this->confDir, 0755);
@@ -192 +192 @@
 }
 
-/** 
+/**
     \brief Saves the configuration-file to the Disk.\n
     \param widget from which Widget on should be saved.
@@ -215 +215 @@
   int counter = 0;
   while(counter < depth &&((widget->optionType > GUI_NOTHING
-                              &&(static_cast<Option*>(widget)->isSaveable()))
-                             ||(widget->optionType < GUI_NOTHING
-                                && static_cast<Packer*>(widget)->getGroupName())))
+                              &&(static_cast<Option*>(widget)->isSaveable()))
+                             ||(widget->optionType < GUI_NOTHING
+                                && 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->optionType < GUI_NOTHING)
     {
       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");
-        }
+        {
+          fprintf(CONFIG_FILE, "[%s]\n", static_cast<Packer*>(widget)->getGroupName());
+          this->writeFileText(static_cast<Packer*>(widget)->down, depth+1);
+          fprintf(CONFIG_FILE, "\n");
+        }
       else
-        {
-          this->writeFileText(static_cast<Packer*>(widget)->down, depth);
-        }
-    } 
+        {
+          this->writeFileText(static_cast<Packer*>(widget)->down, depth);
+        }
+    }
 
   if(widget->optionType > GUI_NOTHING)
     if (static_cast<Option*>(widget)->isSaveable())
       {
-        char Buffer[256];
-        char* space2under;
-        strcpy(Buffer, static_cast<Option*>(widget)->title);
-        if(strchr(Buffer, '_'))
-          PRINTF(2)("Optionname %s is not Valid for Saving, because it includes an underscore\n", Buffer);
-        while(space2under = strchr(Buffer, ' '))
-          {
-            space2under[0] = '_';
-          }
-          fprintf(CONFIG_FILE, "%s = %s\n", Buffer, static_cast<Option*>(widget)->save());
+        char Buffer[256];
+        char* space2under;
+        strcpy(Buffer, static_cast<Option*>(widget)->title);
+        if(strchr(Buffer, '_'))
+          PRINTF(2)("Optionname %s is not Valid for Saving, because it includes an underscore\n", Buffer);
+        while(space2under = strchr(Buffer, ' '))
+          {
+            space2under[0] = '_';
+          }
+          fprintf(CONFIG_FILE, "%s = %s\n", Buffer, static_cast<Option*>(widget)->save());
       }
 
@@ -272 +272 @@
       char* Value;
       while(fscanf(this->CONFIG_FILE, "%s", Buffer) != EOF)
-        {
-          // group-search //
-          if(!strncmp(Buffer, "[", 1))
-            {
-              if((groupWidget = locateGroup(widget, Buffer, 1))==NULL)
-                {
-                  PRINTF(2)("!!There is no group called %s in this GUI.\n First best Widget will get the Infos assigned.\n Config-File will be updated in next Save\n", Buffer);
-                  groupWidget = widget;
-                }
-              else
-                PRINT(5)("Group %s located.\n", static_cast<Packer*>(groupWidget)->groupName);
-            }
-          // option-setting //
-          if(!strcmp(Buffer, "="))
-            {
-              char* under2space;
-              while(under2space = strchr(Variable, '_'))
-                {
-                  sprintf(under2space, " %s", under2space+1);
-                }
-              
-              fscanf(this->CONFIG_FILE, "%s", Buffer);
-              varInfo.variableName = Variable;
-              varInfo.variableValue = Buffer;
-              groupWidget->walkThrough(this->readFileText, &varInfo, 0);
-              sprintf(Variable, "");
-            }
-          sprintf(Variable, "%s", Buffer);
-        }
+        {
+          // group-search //
+          if(!strncmp(Buffer, "[", 1))
+            {
+              if((groupWidget = locateGroup(widget, Buffer, 1))==NULL)
+                {
+                  PRINTF(2)("!!There is no group called %s in this GUI.\n First best Widget will get the Infos assigned.\n Config-File will be updated in next Save\n", Buffer);
+                  groupWidget = widget;
+                }
+              else
+                PRINT(5)("Group %s located.\n", static_cast<Packer*>(groupWidget)->groupName);
+            }
+          // option-setting //
+          if(!strcmp(Buffer, "="))
+            {
+              char* under2space;
+              while(under2space = strchr(Variable, '_'))
+                {
+                  sprintf(under2space, " %s", under2space+1);
+                }
+
+              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, 0);
     }
+    fclose(this->CONFIG_FILE);
 }
 
@@ -317 +318 @@
       PRINT(5)("Located Option %s.\n", widget->title);
       if(widget->optionType > GUI_NOTHING)
-        static_cast<Option*>(widget)->load(info->variableValue);
+        static_cast<Option*>(widget)->load(info->variableValue);
     }
 }
@@ -344 +345 @@
     {
       if(static_cast<Packer*>(widget)->getGroupName() &&
-         !strcmp(groupName, static_cast<Packer*>(widget)->getGroupName()))
-        {
-          return widget;
-        }
+         !strcmp(groupName, static_cast<Packer*>(widget)->getGroupName()))
+        {
+          return widget;
+        }
       else
-        {
-          if((tmp = locateGroup(static_cast<Packer*>(widget)->down, groupName, depth+1)) != NULL)
-            return tmp;
-        }
-    } 
-  
+        {
+          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)
-        return tmp;
+        return tmp;
     }
   return NULL;

orxonox/trunk/src/lib/sound/sound_engine.cc

@@ -378 +378 @@
 void SoundEngine::flushAllBuffers()
 {
-    tIterator<SoundBuffer>* bufferIterator = this->bufferList->getIterator();
+  tIterator<SoundBuffer>* bufferIterator = this->bufferList->getIterator();
   SoundBuffer* enumBuffer = bufferIterator->nextElement();
   while (enumBuffer)
@@ -389 +389 @@
 
 /**
+  * @brief SourceEngine::flushAllBuffers
+ */
+void SoundEngine::flushAllSources()
+{
+  tIterator<SoundSource>* Iterator = this->sourceList->getIterator();
+  SoundSource* enumSource = Iterator->nextElement();
+  while (enumSource)
+  {
+    delete enumSource;
+    enumSource = Iterator->nextElement();
+  }
+  delete Iterator;
+}
+
+
+/**
    \brief initializes Audio in general
 */

orxonox/trunk/src/lib/sound/sound_engine.h

@@ -91 +91 @@
   void flushUnusedBuffers();
   void flushAllBuffers();
+  void flushAllSources();
   bool initAudio();
 

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

@@ -29 +29 @@
 SubString::SubString( const char* string, char splitter)
 {
-  n = 0;
+  this->splittersCount = 0;
 
   assert( string != NULL);
 
-  for( int i = 0; i < strlen(string); i++) if( string[i] == splitter) n++;
+  for( int i = 0; i < strlen(string); i++) if( string[i] == splitter)
+      splittersCount++;
 
-  n += 1;
+  this->splittersCount += 1;
 
-  strings = new char*[n];
-
+  this->strings = new char*[this->splittersCount];
   assert (strings != NULL);
 
@@ -48 +48 @@
   while( end != NULL)
     {
-      assert( i < n);
+      assert( i < this->splittersCount);
       l = end - offset;
-      strings[i] = new char[l + 1];
+      this->strings[i] = new char[l + 1];
       assert( strings[i] != NULL);
       strncpy( strings[i], offset, l);
@@ -71 +71 @@
 SubString::~SubString()
 {
-  for( int i = 0; i < n; i++)
+  for( int i = 0; i < this->splittersCount; i++)
     {
-      delete strings[i];
+      delete this->strings[i];
     }
 
-  delete strings;
-}
-
-/**
-   \brief get the amount of substrings
-   \returns the amount of substrings
-*/
-int SubString::getCount()
-{
-  return n;
+  delete this->strings;
 }
 
@@ -95 +86 @@
 const char* SubString::getString( int i)
 {
-  if( i < n && i >= 0) return strings[i];
-  else return NULL;
+  if( i < this->splittersCount && i >= 0)
+    return this->strings[i];
+  else
+    return NULL;
 }

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

@@ -14 +14 @@
   ~SubString();
 
-  int getCount();
+  inline int getCount() { return this->splittersCount; };
   const char* getString( int i);
 
  private:
-  char**     strings;         //!< strings produced from a single string splitted in multiple strings
-  int        n;               //!< how many splitted parts
+  char**     strings;                      //!< strings produced from a single string splitted in multiple strings
+  int        splittersCount;               //!< how many splitted parts
 };