#include <SDL/SDL.h>
#include "fastevents.h"
-#include <SDL/SDL_sound.h>
#include <AL/alut.h>
#include "Dispatcher.hh"
Impl(int argc, char* argv[], const std::string& configFile,
const std::string& name, const std::string& iconFile,
Engine* outer) :
- interface(outer)
+ interface(outer),
+ timestep(0.01),
+ printFps(false)
{
#if defined(_WIN32) || defined (_WIN64) || defined(__WIN32__)
- if (SDL_Init(SDL_INIT_EVERYTHING) != 0)
+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0)
#else
- if (SDL_Init(SDL_INIT_EVERYTHING | SDL_INIT_EVENTTHREAD) != 0)
+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTTHREAD) != 0)
#endif
{
logError("sdl is complaining: %s", SDL_GetError());
logError("fast events error: %s", FE_GetError());
throw Exception(Exception::SDL_ERROR);
}
- if (Sound_Init() == 0)
- {
- logError("sound initialization failed: %s", Sound_GetError());
- throw Exception(Exception::SDL_ERROR);
- }
alutInit(&argc, argv);
Settings& settings = Settings::getInstance();
- settings.parseArgs(argc, argv);
settings.loadFromFile(configFile);
+ settings.parseArgs(argc, argv);
long randomSeed;
- if (settings.get("engine.rngseed", randomSeed)) setSeed(randomSeed);
+ if (settings.get("rngseed", randomSeed)) setSeed(randomSeed);
else setSeed();
- double ts = 0.01;
- settings.get("engine.timestep", ts);
- timestep = Scalar(ts);
+ settings.get("timestep", timestep);
long maxFps = 40;
- settings.getNumber("video.maxfps", maxFps);
+ settings.get("maxfps", maxFps);
drawRate = 1.0 / Scalar(maxFps);
- printFps = false;
- settings.get("video.printfps", printFps);
+ settings.get("printfps", printFps);
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)
{
- logInfo("framerate: %d fps", fps);
+ logInfo("%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);