Mercurial > sdl-ios-xcode
annotate sdl-config.in @ 876:9e84d106ec19
(Said Max Horn on the SDL mailing list...)
Hi folks,
based on Eric Wing's patch, I created the attached patch which fixes
the OpenGL coordinate inversion bug in SDL. It works fine over here on
10.3 with Ryan's test program (which I also attached).
There is another change in it: I removed the "- 1" in the two lines
using CGDisplayPixelsHigh()... while I understand from a logical point
of view why they *should* be correct, I checked the actual values
computed that way, and they were off-by-one. After removing the " - 1",
the returned mouse coordinates are correct. I checked this by moving
the mouse to the screen top/bottom in fullscreen mode, BTW. With the
change, the proper values 0 and 479 are returned (in 640x480 mode).
Sam, you may still want to test on 10.1, it's very simple using Ryan's
minimal test code :-)
Cheers,
Max
(Here is the reproduction case for revision history's sake...)
/*
* To compile:
* gcc -o test test.c `sdl-config --cflags` `sdl-config --libs` -framework OpenGL
*
* --ryan.
*/
#include <stdio.h>
#include "SDL.h"
#include "SDL_opengl.h"
int main(int argc, char **argv)
{
Uint32 flags = SDL_OPENGL /* | SDL_FULLSCREEN */;
SDL_Surface *screen;
SDL_Event event;
int done = 0;
GLfloat ratio;
SDL_Init(SDL_INIT_VIDEO);
SDL_ShowCursor(0);
if ((argv[1]) && (strcmp(argv[1], "--grab") == 0))
SDL_WM_GrabInput(SDL_GRAB_ON);
screen = SDL_SetVideoMode(640, 480, 0, flags);
if (!screen)
return(42);
ratio = ((GLfloat) screen->w) / ((GLfloat) screen->h);
glClearColor( 0.0f, 0.0f, 0.0f, 0.0f );
glClearDepth( 1.0f );
glEnable( GL_DEPTH_TEST );
glDepthFunc( GL_LEQUAL );
glViewport( 0, 0, screen->w, screen->h);
glMatrixMode( GL_PROJECTION );
glLoadIdentity();
gluPerspective( 45.0f, ratio, 0.1f, 100.0f );
glMatrixMode( GL_MODELVIEW );
glLoadIdentity();
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
SDL_GL_SwapBuffers();
// eh, close enough.
#define MAX_X 6.12
#define MAX_Y 4.50
while (!done)
{
int x, y;
GLfloat glx, gly;
if (!SDL_WaitEvent(&event))
break;
switch (event.type)
{
case SDL_KEYUP:
if (event.key.keysym.sym == SDLK_ESCAPE)
done = 1;
break;
}
SDL_GetMouseState(&x, &y);
glx = ((((GLfloat) x) / ((GLfloat) screen->w)) - 0.5f) * MAX_X;
gly = ((((GLfloat) y) / ((GLfloat) screen->h)) - 0.5f) * MAX_Y;
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glLoadIdentity();
glTranslatef(glx,-gly,-6.0f);
glBegin(GL_TRIANGLES);
glColor3f(1,0,0); glVertex3f( 0.00f, 0.25f, 0.00f);
glColor3f(0,1,0); glVertex3f(-0.25f, -0.25f, 0.00f);
glColor3f(0,0,1); glVertex3f( 0.25f, -0.25f, 0.00f);
glEnd();
SDL_GL_SwapBuffers();
}
SDL_Quit();
return(0);
}
/* end of test.c ... */
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Mon, 22 Mar 2004 09:38:20 +0000 |
parents | 674df5617bba |
children | 19418e4422cb |
rev | line source |
---|---|
0 | 1 #!/bin/sh |
2 | |
3 prefix=@prefix@ | |
4 exec_prefix=@exec_prefix@ | |
5 exec_prefix_set=no | |
6 | |
7 usage="\ | |
296
fab1ddc4d7bf
Removed the API changes to preserve SDL 1.2 stability
Sam Lantinga <slouken@libsdl.org>
parents:
257
diff
changeset
|
8 Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]" |
0 | 9 |
10 if test $# -eq 0; then | |
11 echo "${usage}" 1>&2 | |
12 exit 1 | |
13 fi | |
14 | |
15 while test $# -gt 0; do | |
16 case "$1" in | |
17 -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; | |
18 *) optarg= ;; | |
19 esac | |
20 | |
21 case $1 in | |
22 --prefix=*) | |
23 prefix=$optarg | |
24 if test $exec_prefix_set = no ; then | |
25 exec_prefix=$optarg | |
26 fi | |
27 ;; | |
28 --prefix) | |
29 echo $prefix | |
30 ;; | |
31 --exec-prefix=*) | |
32 exec_prefix=$optarg | |
33 exec_prefix_set=yes | |
34 ;; | |
35 --exec-prefix) | |
36 echo $exec_prefix | |
37 ;; | |
38 --version) | |
39 echo @SDL_VERSION@ | |
40 ;; | |
41 --cflags) | |
490
7e53d17ec798
The portable way of including SDL is #include "SDL.h"
Sam Lantinga <slouken@libsdl.org>
parents:
296
diff
changeset
|
42 echo -I@includedir@/SDL @SDL_CFLAGS@ |
0 | 43 |
490
7e53d17ec798
The portable way of including SDL is #include "SDL.h"
Sam Lantinga <slouken@libsdl.org>
parents:
296
diff
changeset
|
44 # The portable way of including SDL is #include "SDL.h" |
7e53d17ec798
The portable way of including SDL is #include "SDL.h"
Sam Lantinga <slouken@libsdl.org>
parents:
296
diff
changeset
|
45 #if test @includedir@ != /usr/include ; then |
7e53d17ec798
The portable way of including SDL is #include "SDL.h"
Sam Lantinga <slouken@libsdl.org>
parents:
296
diff
changeset
|
46 # # Handle oddities in Win32 path handling (assumes prefix) |
7e53d17ec798
The portable way of including SDL is #include "SDL.h"
Sam Lantinga <slouken@libsdl.org>
parents:
296
diff
changeset
|
47 # prefix=`echo ${prefix} | sed 's,^//\([A-Z]\),\1:,'` |
7e53d17ec798
The portable way of including SDL is #include "SDL.h"
Sam Lantinga <slouken@libsdl.org>
parents:
296
diff
changeset
|
48 # |
7e53d17ec798
The portable way of including SDL is #include "SDL.h"
Sam Lantinga <slouken@libsdl.org>
parents:
296
diff
changeset
|
49 # includes=-I@includedir@ |
7e53d17ec798
The portable way of including SDL is #include "SDL.h"
Sam Lantinga <slouken@libsdl.org>
parents:
296
diff
changeset
|
50 #fi |
7e53d17ec798
The portable way of including SDL is #include "SDL.h"
Sam Lantinga <slouken@libsdl.org>
parents:
296
diff
changeset
|
51 #echo $includes -I@includedir@/SDL @SDL_CFLAGS@ |
0 | 52 ;; |
53 @ENABLE_SHARED_TRUE@ --libs) | |
54 @ENABLE_SHARED_TRUE@ libdirs="-L@libdir@ @SDL_RLD_FLAGS@" | |
257
9ac9ab945955
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
221
diff
changeset
|
55 @ENABLE_SHARED_TRUE@ echo $libdirs @SDL_LIBS@ @SHARED_SYSTEM_LIBS@ |
0 | 56 @ENABLE_SHARED_TRUE@ ;; |
57 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) | |
58 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) | |
59 @ENABLE_STATIC_TRUE@ libdirs="-L@libdir@ @SDL_RLD_FLAGS@" | |
807
674df5617bba
Fixed static linking on MacOS X (thanks Max!)
Sam Lantinga <slouken@libsdl.org>
parents:
490
diff
changeset
|
60 @ENABLE_STATIC_TRUE@ echo $libdirs @SDL_STATIC_LIBS@ @STATIC_SYSTEM_LIBS@ |
0 | 61 @ENABLE_STATIC_TRUE@ ;; |
62 *) | |
63 echo "${usage}" 1>&2 | |
64 exit 1 | |
65 ;; | |
66 esac | |
67 shift | |
68 done |