*******************************************************************************/
#include <cstdlib> // exit
-#include <iostream>
#include <string>
#include <SDL/SDL.h>
#include "fastevents.h"
-#include <SDL/SDL_sound.h>
#include <AL/alut.h>
#include "Dispatcher.hh"
#include "Engine.hh"
+#include "Log.hh"
#include "Random.hh"
#include "Settings.hh"
#include "Timer.hh"
Impl(int argc, char* argv[], const std::string& configFile,
const std::string& name, const std::string& iconFile,
Engine* outer) :
- interface(outer),
- settings(argc, argv)
+ interface(outer)
{
- if (SDL_Init(SDL_INIT_EVERYTHING | SDL_INIT_EVENTTHREAD) != 0)
+#if defined(_WIN32) || defined (_WIN64) || defined(__WIN32__)
+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0)
+#else
+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTTHREAD) != 0)
+#endif
{
- throw Exception(SDL_GetError());
+ logError("sdl is complaining: %s", SDL_GetError());
+ throw Exception(Exception::SDL_ERROR);
}
if (FE_Init() != 0)
{
- throw Exception(FE_GetError());
- }
- if (Sound_Init() != 0)
- {
- //throw Exception(Sound_GetError());
- std::cerr << Sound_GetError() << std::endl;
+ logError("fast events error: %s", FE_GetError());
+ throw Exception(Exception::SDL_ERROR);
}
alutInit(&argc, argv);
+ Settings& settings = Settings::getInstance();
+ settings.parseArgs(argc, argv);
settings.loadFromFile(configFile);
long randomSeed;
printFps = false;
settings.get("video.printfps", printFps);
- video = VideoPtr(new Video(name, iconFile));
+ video = Video::alloc(name, iconFile);
video->makeActive();
}
video.reset();
alutExit();
- Sound_Quit();
FE_Quit();
SDL_Quit();
}
int run()
{
- Scalar ticksNow = getTicks();
+ Scalar ticksNow = Timer::getTicks();
Scalar nextStep = ticksNow;
Scalar nextDraw = ticksNow;
running = true;
do
{
- Scalar newTicks = getTicks();
+ Scalar newTicks = Timer::getTicks();
deltaTime = newTicks - ticksNow;
ticksNow = newTicks;
if (deltaTime >= 0.25) deltaTime = 0.25;
accumulator += deltaTime;
+ Timer::fireIfExpired(ticksNow);
+
while (accumulator >= timestep)
{
dispatchEvents();
if (printFps)
{
- std::cout << "FPS: " << fps << std::endl;
+ logInfo("framerate: %d fps", fps);
}
}
}
// be a good citizen and give back what you don't need
- sleep(std::min(nextStep, nextDraw), true);
+ Timer::sleep(std::min(std::min(nextStep, nextDraw),
+ Timer::getNextFire()), true);
}
while (running);
Engine* interface;
- Settings settings;
- Dispatcher dispatcher;
- VideoPtr video;
+ VideoP video;
bool running;
int exitCode;