Mercurial > sdl-ios-xcode
view src/audio/mint/SDL_mintaudio.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 | 185acc07127a |
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 */ /* MiNT audio driver Patrice Mandin */ #ifndef _SDL_mintaudio_h #define _SDL_mintaudio_h #include "SDL_sysaudio.h" #include "SDL_mintaudio_stfa.h" /* Hidden "this" pointer for the audio functions */ #define _THIS SDL_AudioDevice *this struct SDL_PrivateAudioData { Uint32 hardfreq[16]; /* Array of replay freqs of the hardware */ int sfreq; /* First number of freq to use in the array */ int nfreq; /* Number of freqs to use in the array */ int numfreq; /* Number of selected frequency */ }; /* Old variable names */ #define MINTAUDIO_hardfreq (this->hidden->hardfreq) #define MINTAUDIO_sfreq (this->hidden->sfreq) #define MINTAUDIO_nfreq (this->hidden->nfreq) #define MINTAUDIO_numfreq (this->hidden->numfreq) /* _MCH cookie (values>>16) */ enum { MCH_ST=0, MCH_STE, MCH_TT, MCH_F30 }; /* Master clocks for replay frequencies */ #define MASTERCLOCK_STE 8010666 /* Not sure of this one */ #define MASTERCLOCK_TT 16107953 /* Not sure of this one */ #define MASTERCLOCK_FALCON1 25175000 #define MASTERCLOCK_FALCON2 32000000 /* Only usable for DSP56K */ #define MASTERCLOCK_FALCONEXT -1 /* Clock on DSP56K port, unknown */ #define MASTERCLOCK_44K 22579200 /* Standard clock for 44.1 Khz */ #define MASTERCLOCK_48K 24576000 /* Standard clock for 48 Khz */ /* Master clock predivisors */ #define MASTERPREDIV_STE 160 #define MASTERPREDIV_TT 320 #define MASTERPREDIV_FALCON 256 #define MASTERPREDIV_MILAN 256 /* MFP 68901 interrupt sources */ enum { MFP_PARALLEL=0, MFP_DCD, MFP_CTS, MFP_BITBLT, MFP_TIMERD, MFP_BAUDRATE=MFP_TIMERD, MFP_TIMERC, MFP_200HZ=MFP_TIMERC, MFP_ACIA, MFP_DISK, MFP_TIMERB, MFP_HBLANK=MFP_TIMERB, MFP_TERR, MFP_TBE, MFP_RERR, MFP_RBF, MFP_TIMERA, MFP_DMASOUND=MFP_TIMERA, MFP_RING, MFP_MONODETECT }; /* Xbtimer() timers */ enum { XB_TIMERA=0, XB_TIMERB, XB_TIMERC, XB_TIMERD }; /* Variables */ extern SDL_AudioDevice *SDL_MintAudio_device; extern Uint8 *SDL_MintAudio_audiobuf[2]; /* Pointers to buffers */ extern unsigned long SDL_MintAudio_audiosize; /* Length of audio buffer=spec->size */ extern unsigned short SDL_MintAudio_numbuf; /* Buffer to play */ extern unsigned short SDL_MintAudio_mutex; extern cookie_stfa_t *SDL_MintAudio_stfa; /* Functions */ void SDL_MintAudio_Callback(void); int SDL_MintAudio_SearchFrequency(_THIS, int falcon_codec, int desired_freq); /* ASM interrupt functions */ void SDL_MintAudio_GsxbInterrupt(void); void SDL_MintAudio_EmptyGsxbInterrupt(void); void SDL_MintAudio_XbiosInterrupt(void); void SDL_MintAudio_Dma8Interrupt(void); void SDL_MintAudio_StfaInterrupt(void); #endif /* _SDL_mintaudio_h */