Mercurial > sdl-ios-xcode
view src/video/SDL_blit_0.c @ 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 | e9d23bb80140 |
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 #include <stdio.h> #include <string.h> #include "SDL_types.h" #include "SDL_video.h" #include "SDL_blit.h" /* Functions to blit from bitmaps to other surfaces */ static void BlitBto1(SDL_BlitInfo *info) { int c; int width, height; Uint8 *src, *map, *dst; int srcskip, dstskip; /* Set up some basic variables */ width = info->d_width; height = info->d_height; src = info->s_pixels; srcskip = info->s_skip; dst = info->d_pixels; dstskip = info->d_skip; map = info->table; srcskip += width-(width+7)/8; if ( map ) { while ( height-- ) { Uint8 byte = 0, bit; for ( c=0; c<width; ++c ) { if ( (c&7) == 0 ) { byte = *src++; } bit = (byte&0x80)>>7; if ( 1 ) { *dst = map[bit]; } dst++; byte <<= 1; } src += srcskip; dst += dstskip; } } else { while ( height-- ) { Uint8 byte = 0, bit; for ( c=0; c<width; ++c ) { if ( (c&7) == 0 ) { byte = *src++; } bit = (byte&0x80)>>7; if ( 1 ) { *dst = bit; } dst++; byte <<= 1; } src += srcskip; dst += dstskip; } } } static void BlitBto2(SDL_BlitInfo *info) { int c; int width, height; Uint8 *src; Uint16 *map, *dst; int srcskip, dstskip; /* Set up some basic variables */ width = info->d_width; height = info->d_height; src = info->s_pixels; srcskip = info->s_skip; dst = (Uint16 *)info->d_pixels; dstskip = info->d_skip/2; map = (Uint16 *)info->table; srcskip += width-(width+7)/8; while ( height-- ) { Uint8 byte = 0, bit; for ( c=0; c<width; ++c ) { if ( (c&7) == 0 ) { byte = *src++; } bit = (byte&0x80)>>7; if ( 1 ) { *dst = map[bit]; } byte <<= 1; dst++; } src += srcskip; dst += dstskip; } } static void BlitBto3(SDL_BlitInfo *info) { int c, o; int width, height; Uint8 *src, *map, *dst; int srcskip, dstskip; /* Set up some basic variables */ width = info->d_width; height = info->d_height; src = info->s_pixels; srcskip = info->s_skip; dst = info->d_pixels; dstskip = info->d_skip; map = info->table; srcskip += width-(width+7)/8; while ( height-- ) { Uint8 byte = 0, bit; for ( c=0; c<width; ++c ) { if ( (c&7) == 0 ) { byte = *src++; } bit = (byte&0x80)>>7; if ( 1 ) { o = bit * 4; dst[0] = map[o++]; dst[1] = map[o++]; dst[2] = map[o++]; } byte <<= 1; dst += 3; } src += srcskip; dst += dstskip; } } static void BlitBto4(SDL_BlitInfo *info) { int width, height; Uint8 *src; Uint32 *map, *dst; int srcskip, dstskip; int c; /* Set up some basic variables */ width = info->d_width; height = info->d_height; src = info->s_pixels; srcskip = info->s_skip; dst = (Uint32 *)info->d_pixels; dstskip = info->d_skip/4; map = (Uint32 *)info->table; srcskip += width-(width+7)/8; while ( height-- ) { Uint8 byte = 0, bit; for ( c=0; c<width; ++c ) { if ( (c&7) == 0 ) { byte = *src++; } bit = (byte&0x80)>>7; if ( 1 ) { *dst = map[bit]; } byte <<= 1; dst++; } src += srcskip; dst += dstskip; } } static void BlitBto1Key(SDL_BlitInfo *info) { int width = info->d_width; int height = info->d_height; Uint8 *src = info->s_pixels; Uint8 *dst = info->d_pixels; int srcskip = info->s_skip; int dstskip = info->d_skip; Uint32 ckey = info->src->colorkey; Uint8 *palmap = info->table; int c; /* Set up some basic variables */ srcskip += width-(width+7)/8; if ( palmap ) { while ( height-- ) { Uint8 byte = 0, bit; for ( c=0; c<width; ++c ) { if ( (c&7) == 0 ) { byte = *src++; } bit = (byte&0x80)>>7; if ( bit != ckey ) { *dst = palmap[bit]; } dst++; byte <<= 1; } src += srcskip; dst += dstskip; } } else { while ( height-- ) { Uint8 byte = 0, bit; for ( c=0; c<width; ++c ) { if ( (c&7) == 0 ) { byte = *src++; } bit = (byte&0x80)>>7; if ( bit != ckey ) { *dst = bit; } dst++; byte <<= 1; } src += srcskip; dst += dstskip; } } } static void BlitBto2Key(SDL_BlitInfo *info) { int width = info->d_width; int height = info->d_height; Uint8 *src = info->s_pixels; Uint16 *dstp = (Uint16 *)info->d_pixels; int srcskip = info->s_skip; int dstskip = info->d_skip; Uint32 ckey = info->src->colorkey; Uint8 *palmap = info->table; int c; /* Set up some basic variables */ srcskip += width-(width+7)/8; dstskip /= 2; while ( height-- ) { Uint8 byte = 0, bit; for ( c=0; c<width; ++c ) { if ( (c&7) == 0 ) { byte = *src++; } bit = (byte&0x80)>>7; if ( bit != ckey ) { *dstp=((Uint16 *)palmap)[bit]; } byte <<= 1; dstp++; } src += srcskip; dstp += dstskip; } } static void BlitBto3Key(SDL_BlitInfo *info) { int width = info->d_width; int height = info->d_height; Uint8 *src = info->s_pixels; Uint8 *dst = info->d_pixels; int srcskip = info->s_skip; int dstskip = info->d_skip; Uint32 ckey = info->src->colorkey; Uint8 *palmap = info->table; int c; /* Set up some basic variables */ srcskip += width-(width+7)/8; while ( height-- ) { Uint8 byte = 0, bit; for ( c=0; c<width; ++c ) { if ( (c&7) == 0 ) { byte = *src++; } bit = (byte&0x80)>>7; if ( bit != ckey ) { memcpy(dst, &palmap[bit*4], 3); } byte <<= 1; dst += 3; } src += srcskip; dst += dstskip; } } static void BlitBto4Key(SDL_BlitInfo *info) { int width = info->d_width; int height = info->d_height; Uint8 *src = info->s_pixels; Uint32 *dstp = (Uint32 *)info->d_pixels; int srcskip = info->s_skip; int dstskip = info->d_skip; Uint32 ckey = info->src->colorkey; Uint8 *palmap = info->table; int c; /* Set up some basic variables */ srcskip += width-(width+7)/8; dstskip /= 4; while ( height-- ) { Uint8 byte = 0, bit; for ( c=0; c<width; ++c ) { if ( (c&7) == 0 ) { byte = *src++; } bit = (byte&0x80)>>7; if ( bit != ckey ) { *dstp=((Uint32 *)palmap)[bit]; } byte <<= 1; dstp++; } src += srcskip; dstp += dstskip; } } static void BlitBtoNAlpha(SDL_BlitInfo *info) { int width = info->d_width; int height = info->d_height; Uint8 *src = info->s_pixels; Uint8 *dst = info->d_pixels; int srcskip = info->s_skip; int dstskip = info->d_skip; const SDL_Color *srcpal = info->src->palette->colors; SDL_PixelFormat *dstfmt = info->dst; int dstbpp; int c; const int A = info->src->alpha; /* Set up some basic variables */ dstbpp = dstfmt->BytesPerPixel; srcskip += width-(width+7)/8; while ( height-- ) { Uint8 byte = 0, bit; for ( c=0; c<width; ++c ) { if ( (c&7) == 0 ) { byte = *src++; } bit = (byte&0x80)>>7; if ( 1 ) { Uint32 pixel; unsigned sR, sG, sB; unsigned dR, dG, dB; sR = srcpal[bit].r; sG = srcpal[bit].g; sB = srcpal[bit].b; DISEMBLE_RGB(dst, dstbpp, dstfmt, pixel, dR, dG, dB); ALPHA_BLEND(sR, sG, sB, A, dR, dG, dB); ASSEMBLE_RGB(dst, dstbpp, dstfmt, dR, dG, dB); } byte <<= 1; dst += dstbpp; } src += srcskip; dst += dstskip; } } static void BlitBtoNAlphaKey(SDL_BlitInfo *info) { int width = info->d_width; int height = info->d_height; Uint8 *src = info->s_pixels; Uint8 *dst = info->d_pixels; int srcskip = info->s_skip; int dstskip = info->d_skip; SDL_PixelFormat *srcfmt = info->src; SDL_PixelFormat *dstfmt = info->dst; const SDL_Color *srcpal = srcfmt->palette->colors; int dstbpp; int c; const int A = srcfmt->alpha; Uint32 ckey = srcfmt->colorkey; /* Set up some basic variables */ dstbpp = dstfmt->BytesPerPixel; srcskip += width-(width+7)/8; while ( height-- ) { Uint8 byte = 0, bit; for ( c=0; c<width; ++c ) { if ( (c&7) == 0 ) { byte = *src++; } bit = (byte&0x80)>>7; if ( bit != ckey ) { int sR, sG, sB; int dR, dG, dB; Uint32 pixel; sR = srcpal[bit].r; sG = srcpal[bit].g; sB = srcpal[bit].b; DISEMBLE_RGB(dst, dstbpp, dstfmt, pixel, dR, dG, dB); ALPHA_BLEND(sR, sG, sB, A, dR, dG, dB); ASSEMBLE_RGB(dst, dstbpp, dstfmt, dR, dG, dB); } byte <<= 1; dst += dstbpp; } src += srcskip; dst += dstskip; } } static SDL_loblit bitmap_blit[] = { NULL, BlitBto1, BlitBto2, BlitBto3, BlitBto4 }; static SDL_loblit colorkey_blit[] = { NULL, BlitBto1Key, BlitBto2Key, BlitBto3Key, BlitBto4Key }; SDL_loblit SDL_CalculateBlit0(SDL_Surface *surface, int blit_index) { int which; if ( surface->map->dst->format->BitsPerPixel < 8 ) { which = 0; } else { which = surface->map->dst->format->BytesPerPixel; } switch(blit_index) { case 0: /* copy */ return bitmap_blit[which]; case 1: /* colorkey */ return colorkey_blit[which]; case 2: /* alpha */ return which >= 2 ? BlitBtoNAlpha : NULL; case 4: /* alpha + colorkey */ return which >= 2 ? BlitBtoNAlphaKey : NULL; } return NULL; }