Changeset 5225 in orxonox.OLD

Timestamp:

Sep 23, 2005, 10:07:20 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: removing some initialisation-stuff… i hope this works

Location:

trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (4 diffs)
• lib/math/curve.h (modified) (2 diffs)
• orxonox.cc (modified) (4 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -51 +51 @@
 
   this->fullscreenFlag = 0;
+  this->videoFlags = 0;
+  this->screen = NULL;
 }
 
@@ -68 +70 @@
   delete this->geTextMinFPS;
 
-
   delete Render2D::getInstance();
+
+  SDL_QuitSubSystem(SDL_INIT_VIDEO);
   GraphicsEngine::singletonRef = NULL;
 }
@@ -124 +127 @@
     return -1;
   //   initialize SDL_VIDEO
-  if (SDL_Init(SDL_INIT_VIDEO) == -1)
+  if (SDL_InitSubSystem(SDL_INIT_VIDEO) == -1)
   {
     PRINTF(1)("could not initialize SDL Video\n");
@@ -133 +136 @@
 
   // setting the Video Flags.
-  this->videoFlags = SDL_OPENGL | SDL_HWPALETTE | SDL_RESIZABLE | SDL_DOUBLEBUF;
+  this->videoFlags = SDL_OPENGL | SDL_HWPALETTE | SDL_RESIZABLE | SDL_DOUBLEBUF | SDL_GL_DOUBLEBUFFER;
 
   /* query SDL for information about our video hardware */

trunk/src/lib/math/curve.h

@@ -12 +12 @@
 #include "vector.h"
 
+template<class T> class tList;
+template<class T> class tIterator;
+
 //! An Enumerator that defines what sort of Curves are availible
-enum CurveType {CURVE_BEZIER};
+enum CurveType {
+  CURVE_BEZIER
+};
 
 
@@ -58 +63 @@
 
  protected:
-  int         nodeCount;       //!< The count of nodes the Curve has.
-  Vector      curvePoint;      //!< The point on the Cureve at a local Time.
-  float       localTime;       //!< If the time of one point is asked more than once the programm will not calculate it again.
-  int         derivation;      //!< Which derivation of a Curve is this.
+  int                   nodeCount;       //!< The count of nodes the Curve has.
+  Vector                curvePoint;      //!< The point on the Cureve at a local Time.
+  float                 localTime;       //!< If the time of one point is asked more than once the programm will not calculate it again.
+  int                   derivation;      //!< Which derivation of a Curve is this.
 
-  Curve*      dirCurve;        //!< The derivation-curve of this Curve.
+  Curve*                dirCurve;        //!< The derivation-curve of this Curve.
 
-  PathNode*   firstNode;       //!< First node of the curve.
-  PathNode*   currentNode;     //!< The node we are working with (the Last node).
+  tList<PathNode>*      nodeList;        //!< A list of all the Nodes of a Curve.
+  tIterator<PathNode>*  nodeIterator;    //!< An iterator that should point to the current Node
+  PathNode*             firstNode;       //!< First node of the curve.
+  PathNode*             currentNode;     //!< The node we are working with (the Last node).
 
 };

trunk/src/orxonox.cc

@@ -104 +104 @@
   delete[] this->configFileName;
 
+  SDL_QuitSubSystem(SDL_INIT_TIMER);
   ClassList::debug();
 
@@ -172 +173 @@
 
   // initialize everything
-  SDL_Init (SDL_INIT_TIMER);
+  SDL_InitSubSystem (SDL_INIT_TIMER);
   if( initResources () == -1) return -1;
   if( initVideo() == -1) return -1;
@@ -195 +196 @@
 
   char* iconName = ResourceManager::getFullName("pictures/fighter-top-32x32.bmp");
-  GraphicsEngine::getInstance()->setWindowName(PACKAGE_NAME " " PACKAGE_VERSION, iconName);
-  delete[] iconName;
+  if (iconName != NULL)
+  {
+    GraphicsEngine::getInstance()->setWindowName(PACKAGE_NAME " " PACKAGE_VERSION, iconName);
+    delete[] iconName;
+  }
   return 0;
 }
@@ -206 +210 @@
 {
   PRINT(3)("> Initializing sound\n");
-  // SDL_Init(SDL_INIT_AUDIO);
+  // SDL_InitSubSystem(SDL_INIT_AUDIO);
   SoundEngine::getInstance()->initAudio();