X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmain.cc;h=d24428cc65e9362b8820a5f525a60ad5da0f0ed0;hb=0429831551b044dc8e4d6ba7c842e1ce4761ed69;hp=01c9d12e6b3e66e322566624460c5c37053f85de;hpb=c5c29f4044110dd153ee5ca3b018c812d518a053;p=laserbrain_demo

diff --git a/src/main.cc b/src/main.cc
index 01c9d12..d24428c 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -17,11 +17,13 @@ static bool quit;
 static unsigned int start_time;
 static unsigned int modkeys;
 
+SDL_GameController *gamepad;
+
 static int scale_factor = 1;
 
 int main(int argc, char **argv)
 {
-	if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0) {
+	if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_GAMECONTROLLER) != 0) {
 		fprintf(stderr, "failed to initialize SDL\n");
 		return 1;
 	}
@@ -41,7 +43,12 @@ int main(int argc, char **argv)
 			SDL_Quit();
 			return 1;
 		}
+		fprintf(stderr, "failed to get an sRGB framebuffer.\n");
 	}
+	int val;
+	SDL_GL_GetAttribute(SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, &val);
+	printf("SDL says we %s an sRGB framebuffer\n", val ? "got" : "didn't get");
+	fb_srgb = val;
 
 	if(!(ctx = SDL_GL_CreateContext(win))) {
 		fprintf(stderr, "failed to create OpenGL context\n");
@@ -51,6 +58,17 @@ int main(int argc, char **argv)
 	SDL_GL_GetDrawableSize(win, &win_width, &win_height);
 	win_aspect = (float)win_width / (float)win_height;
 
+	printf("detected %d joysticks\n", SDL_NumJoysticks());
+	for(int i=0; i<SDL_NumJoysticks(); i++) {
+		if(SDL_IsGameController(i)) {
+			if(!(gamepad = SDL_GameControllerOpen(i))) {
+				fprintf(stderr, "failed to open game controller %i: %s\n", i, SDL_GetError());
+				continue;
+			}
+			printf("Using gamepad: %s\n", SDL_GameControllerNameForIndex(i));
+		}
+	}
+
 	if(!init(argc, argv)) {
 		SDL_Quit();
 		return 1;
@@ -113,8 +131,11 @@ bool app_is_fullscreen()
 
 void app_grab_mouse(bool grab)
 {
-	SDL_SetWindowGrab(win, grab ? SDL_TRUE : SDL_FALSE);
-	SDL_ShowCursor(grab ? 1 : 0);
+	if(grab) {
+		SDL_WarpMouseInWindow(win, win_width / 2, win_height / 2);
+	}
+	//SDL_SetWindowGrab(win, grab ? SDL_TRUE : SDL_FALSE);
+	//SDL_ShowCursor(grab ? 1 : 0);
 	SDL_SetRelativeMouseMode(grab ? SDL_TRUE : SDL_FALSE);
 	mouse_grabbed = grab;
 }
@@ -171,13 +192,22 @@ static void process_event(SDL_Event *ev)
 		break;
 
 	case SDL_WINDOWEVENT:
-		if(ev->window.event == SDL_WINDOWEVENT_RESIZED) {
+		if(ev->window.event == SDL_WINDOWEVENT_SIZE_CHANGED) {
 			SDL_GL_GetDrawableSize(win, &win_width, &win_height);
 			win_aspect = (float)win_width / (float)win_height;
 			scale_factor = win_width / ev->window.data1;
 			app_reshape(win_width, win_height);
 		}
 		break;
+
+	case SDL_CONTROLLERAXISMOTION:
+		app_gamepad_axis(ev->caxis.axis, ev->caxis.value / 32768.0f);
+		break;
+
+	case SDL_CONTROLLERBUTTONDOWN:
+	case SDL_CONTROLLERBUTTONUP:
+		app_gamepad_button(ev->cbutton.button, ev->type == SDL_CONTROLLERBUTTONDOWN);
+		break;
 	}
 }