Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5225 in orxonox.OLD


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/graphics/graphics_engine.cc

    r5216 r5225  
    5151
    5252  this->fullscreenFlag = 0;
     53  this->videoFlags = 0;
     54  this->screen = NULL;
    5355}
    5456
     
    6870  delete this->geTextMinFPS;
    6971
    70 
    7172  delete Render2D::getInstance();
     73
     74  SDL_QuitSubSystem(SDL_INIT_VIDEO);
    7275  GraphicsEngine::singletonRef = NULL;
    7376}
     
    124127    return -1;
    125128  //   initialize SDL_VIDEO
    126   if (SDL_Init(SDL_INIT_VIDEO) == -1)
     129  if (SDL_InitSubSystem(SDL_INIT_VIDEO) == -1)
    127130  {
    128131    PRINTF(1)("could not initialize SDL Video\n");
     
    133136
    134137  // setting the Video Flags.
    135   this->videoFlags = SDL_OPENGL | SDL_HWPALETTE | SDL_RESIZABLE | SDL_DOUBLEBUF;
     138  this->videoFlags = SDL_OPENGL | SDL_HWPALETTE | SDL_RESIZABLE | SDL_DOUBLEBUF | SDL_GL_DOUBLEBUFFER;
    136139
    137140  /* query SDL for information about our video hardware */
  • trunk/src/lib/math/curve.h

    r5039 r5225  
    1212#include "vector.h"
    1313
     14template<class T> class tList;
     15template<class T> class tIterator;
     16
    1417//! An Enumerator that defines what sort of Curves are availible
    15 enum CurveType {CURVE_BEZIER};
     18enum CurveType {
     19  CURVE_BEZIER
     20};
    1621
    1722
     
    5863
    5964 protected:
    60   int         nodeCount;       //!< The count of nodes the Curve has.
    61   Vector      curvePoint;      //!< The point on the Cureve at a local Time.
    62   float       localTime;       //!< If the time of one point is asked more than once the programm will not calculate it again.
    63   int         derivation;      //!< Which derivation of a Curve is this.
     65  int                   nodeCount;       //!< The count of nodes the Curve has.
     66  Vector                curvePoint;      //!< The point on the Cureve at a local Time.
     67  float                 localTime;       //!< If the time of one point is asked more than once the programm will not calculate it again.
     68  int                   derivation;      //!< Which derivation of a Curve is this.
    6469
    65   Curve*      dirCurve;        //!< The derivation-curve of this Curve.
     70  Curve*                dirCurve;        //!< The derivation-curve of this Curve.
    6671
    67   PathNode*   firstNode;       //!< First node of the curve.
    68   PathNode*   currentNode;     //!< The node we are working with (the Last node).
     72  tList<PathNode>*      nodeList;        //!< A list of all the Nodes of a Curve.
     73  tIterator<PathNode>*  nodeIterator;    //!< An iterator that should point to the current Node
     74  PathNode*             firstNode;       //!< First node of the curve.
     75  PathNode*             currentNode;     //!< The node we are working with (the Last node).
    6976
    7077};
  • trunk/src/orxonox.cc

    r5219 r5225  
    104104  delete[] this->configFileName;
    105105
     106  SDL_QuitSubSystem(SDL_INIT_TIMER);
    106107  ClassList::debug();
    107108
     
    172173
    173174  // initialize everything
    174   SDL_Init (SDL_INIT_TIMER);
     175  SDL_InitSubSystem (SDL_INIT_TIMER);
    175176  if( initResources () == -1) return -1;
    176177  if( initVideo() == -1) return -1;
     
    195196
    196197  char* iconName = ResourceManager::getFullName("pictures/fighter-top-32x32.bmp");
    197   GraphicsEngine::getInstance()->setWindowName(PACKAGE_NAME " " PACKAGE_VERSION, iconName);
    198   delete[] iconName;
     198  if (iconName != NULL)
     199  {
     200    GraphicsEngine::getInstance()->setWindowName(PACKAGE_NAME " " PACKAGE_VERSION, iconName);
     201    delete[] iconName;
     202  }
    199203  return 0;
    200204}
     
    206210{
    207211  PRINT(3)("> Initializing sound\n");
    208   // SDL_Init(SDL_INIT_AUDIO);
     212  // SDL_InitSubSystem(SDL_INIT_AUDIO);
    209213  SoundEngine::getInstance()->initAudio();
    210214
Note: See TracChangeset for help on using the changeset viewer.