Mercurial > sdl-ios-xcode
view src/video/qtopia/SDL_QWin.h @ 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 | b8d311d90021 |
children | c9b51268668f |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2004 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif #ifndef _SDL_QWin_h #define _SDL_QWin_h #include <stdio.h> #include <qimage.h> #include <qpixmap.h> #include <qwidget.h> #include <qpainter.h> #include <qdirectpainter_qws.h> #include "SDL_events.h" extern "C" { #include "SDL_events_c.h" }; typedef enum { SDL_QT_NO_ROTATION = 0, SDL_QT_ROTATION_90, SDL_QT_ROTATION_270 } screenRotationT; extern screenRotationT screenRotation; class SDL_QWin : public QWidget { void QueueKey(QKeyEvent *e, int pressed); public: SDL_QWin(const QSize& size); virtual ~SDL_QWin(); virtual bool shown(void) { return isVisible(); } /* If called, the next resize event will not be forwarded to SDL. */ virtual void inhibitResize(void) { my_inhibit_resize = true; } void setImage(QImage *image); void setOffset(int x, int y) { my_offset = QPoint(x, y); } void GetXYOffset(int &x, int &y) { x = my_offset.x(); y = my_offset.y(); } QImage *image(void) { return my_image; } void setWFlags(WFlags flags) { QWidget::setWFlags(flags); my_flags = flags; } const QPoint& mousePos() const { return my_mouse_pos; } void setMousePos(const QPoint& newpos); void setFullscreen(bool); bool lockScreen(bool force=false); void unlockScreen(); void repaintRect(const QRect& rect); protected: /* Handle resizing of the window */ virtual void resizeEvent(QResizeEvent *e); void focusInEvent(QFocusEvent *); void focusOutEvent(QFocusEvent *); void closeEvent(QCloseEvent *e); void mouseMoveEvent(QMouseEvent *e); void mousePressEvent(QMouseEvent *e); void mouseReleaseEvent(QMouseEvent *e); void paintEvent(QPaintEvent *ev); void keyPressEvent(QKeyEvent *e) { QueueKey(e, 1); } void keyReleaseEvent(QKeyEvent *e) { QueueKey(e, 0); } private: bool repaintRotation0(const QRect& rect); bool repaintRotation1(const QRect& rect); bool repaintRotation3(const QRect& rect); void enableFullscreen(); QDirectPainter *my_painter; QImage *my_image; bool my_inhibit_resize; QPoint my_offset; QPoint my_mouse_pos; WFlags my_flags; WFlags my_has_fullscreen; unsigned int my_locked; }; #endif /* _SDL_QWin_h */