oculus2

diff src/main.c @ 20:6a3a9840c303

fixed on macosx
author John Tsiombikas <nuclear@member.fsf.org>
date Wed, 21 Jan 2015 11:29:30 +0200
parents 1a832e88854a
children 46291bf81d0a
line diff
     1.1 --- a/src/main.c	Wed Jan 14 07:11:11 2015 +0200
     1.2 +++ b/src/main.c	Wed Jan 21 11:29:30 2015 +0200
     1.3 @@ -95,7 +95,7 @@
     1.4  
     1.5  	x = y = SDL_WINDOWPOS_UNDEFINED;
     1.6  	flags = SDL_WINDOW_OPENGL;
     1.7 -	if(!(win = SDL_CreateWindow("press 'f' to move to the HMD", x, y, 1280, 800, flags))) {
     1.8 +	if(!(win = SDL_CreateWindow("press 'f' to move to the HMD", x, y, 1024, 640, flags))) {
     1.9  		fprintf(stderr, "failed to create window\n");
    1.10  		return -1;
    1.11  	}
    1.12 @@ -150,13 +150,14 @@
    1.13  	 */
    1.14  	memset(&glcfg, 0, sizeof glcfg);
    1.15  	glcfg.OGL.Header.API = ovrRenderAPI_OpenGL;
    1.16 -	glcfg.OGL.Header.BackBufferSize = hmd->Resolution;
    1.17 +	glcfg.OGL.Header.BackBufferSize.w = win_width;
    1.18 +	glcfg.OGL.Header.BackBufferSize.h = win_height;
    1.19  	glcfg.OGL.Header.Multisample = 1;
    1.20  
    1.21 -#ifdef WIN32
    1.22 +#ifdef OVR_OS_WIN32
    1.23  	glcfg.OGL.Window = GetActiveWindow();
    1.24  	glcfg.OGL.DC = wglGetCurrentDC();
    1.25 -#else
    1.26 +#elif defined(OVR_OS_LINUX)
    1.27  	glcfg.OGL.Disp = glXGetCurrentDisplay();
    1.28  #endif
    1.29  
    1.30 @@ -169,7 +170,7 @@
    1.31  		 */
    1.32  #ifdef WIN32
    1.33  		ovrHmd_AttachToWindow(hmd, glcfg.OGL.Window, 0, 0);
    1.34 -#else
    1.35 +#elif defined(OVR_OS_LINUX)
    1.36  		ovrHmd_AttachToWindow(hmd, (void*)glXGetCurrentDrawable(), 0, 0);
    1.37  #endif
    1.38  		printf("running in \"direct-hmd\" mode\n");
    1.39 @@ -183,7 +184,7 @@
    1.40  	 * timewrap, which shifts the image before drawing to counter any lattency between the call
    1.41  	 * to ovrHmd_GetEyePose and ovrHmd_EndFrame.
    1.42  	 */
    1.43 -	distort_caps = ovrDistortionCap_Chromatic | ovrDistortionCap_Vignette | ovrDistortionCap_TimeWarp |
    1.44 +	distort_caps = ovrDistortionCap_Chromatic | ovrDistortionCap_TimeWarp |
    1.45  		ovrDistortionCap_Overdrive;
    1.46  	if(!ovrHmd_ConfigureRendering(hmd, &glcfg.Config, distort_caps, hmd->DefaultEyeFov, eye_rdesc)) {
    1.47  		fprintf(stderr, "failed to configure distortion renderer\n");