summaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorJon Bergli Heier <snakebite@jvnv.net>2011-05-01 21:24:44 +0200
committerJon Bergli Heier <snakebite@jvnv.net>2011-05-01 21:24:44 +0200
commit965956ff2411bef4a26e66154fe56e6dc5d482ed (patch)
tree906785f5cbb96768f9e44d234748f000207a1507 /main.cpp
parentae0130e815c353c7fc045d7bb510e919f0f87231 (diff)
Added makefile, debugging stuff.
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/main.cpp b/main.cpp
index 643b3b4..3dc9e27 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,32 +3,34 @@
#include "gl.h"
+#include <SDL_image.h>
+
int main(int argc, char **argv) {
video::width = 1280;
video::height = 720;
video::init();
+ IMG_Init(IMG_INIT_PNG | IMG_INIT_JPG);
#ifdef WIN32
win32_gl_init();
-#ifdef CEGUI_STATIC
-#warning "cegui static"
-#endif
#endif
- Scene scene;
+ Scene *scene = new Scene();
SDL_ShowCursor(SDL_DISABLE);
SDL_WarpMouse(video::width/2, video::height/2);
- scene.last_time = SDL_GetTicks();
- scene.update();
- while(scene.running) {
- scene.events();
- scene.render();
+ scene->last_time = SDL_GetTicks();
+ scene->update();
+ std::cout << "foo" << std::endl;
+ while(scene->running) {
+ scene->events();
+ scene->render();
SDL_Delay(1);
}
+ delete scene;
video::free();
return 0;