projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VR mode
[laserbrain_demo]
/
src
/
main.cc
diff --git
a/src/main.cc
b/src/main.cc
index
f21c406
..
01c9d12
100644
(file)
--- a/
src/main.cc
+++ b/
src/main.cc
@@
-5,7
+5,7
@@
#include <SDL2/SDL.h>
#include "app.h"
#include <SDL2/SDL.h>
#include "app.h"
-static bool init();
+static bool init(int argc, char **argv);
static void process_event(SDL_Event *ev);
static void proc_modkeys();
static void process_event(SDL_Event *ev);
static void proc_modkeys();
@@
-51,7
+51,7
@@
int main(int argc, char **argv)
SDL_GL_GetDrawableSize(win, &win_width, &win_height);
win_aspect = (float)win_width / (float)win_height;
SDL_GL_GetDrawableSize(win, &win_width, &win_height);
win_aspect = (float)win_width / (float)win_height;
- if(!init()) {
+ if(!init(argc, argv)) {
SDL_Quit();
return 1;
}
SDL_Quit();
return 1;
}
@@
-113,9
+113,8
@@
bool app_is_fullscreen()
void app_grab_mouse(bool grab)
{
void app_grab_mouse(bool grab)
{
- /*SDL_SetWindowGrab(win, grab ? SDL_TRUE : SDL_FALSE);
+ SDL_SetWindowGrab(win, grab ? SDL_TRUE : SDL_FALSE);
SDL_ShowCursor(grab ? 1 : 0);
SDL_ShowCursor(grab ? 1 : 0);
- */
SDL_SetRelativeMouseMode(grab ? SDL_TRUE : SDL_FALSE);
mouse_grabbed = grab;
}
SDL_SetRelativeMouseMode(grab ? SDL_TRUE : SDL_FALSE);
mouse_grabbed = grab;
}
@@
-131,11
+130,11
@@
bool app_is_mouse_grabbed()
}
}
-static bool init()
+static bool init(int argc, char **argv)
{
glewInit();
{
glewInit();
- if(!app_init()) {
+ if(!app_init(argc, argv)) {
return false;
}
return false;
}