Final merge of Google Summer of Code 2008 work...
Bring SDL to iPhone and iPod Touch by Holmes Futrell, mentored by Sam Lantinga --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403222
This commit is contained in:
Sam Lantinga
parent
338ff54f1e
commit
c6ac35a2bb
113 changed files with 27686 additions and 22 deletions
|
|
@ -68,6 +68,7 @@ main(int argc, char *argv[])
|
|||
Uint8 gradient;
|
||||
SDL_Color palette[256];
|
||||
|
||||
int video_w, video_h;
|
||||
|
||||
/* Initialize SDL */
|
||||
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
|
||||
|
|
@ -96,10 +97,19 @@ main(int argc, char *argv[])
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef __IPHONEOS__
|
||||
video_w = 320;
|
||||
video_h = 480;
|
||||
#else
|
||||
video_w = 640;
|
||||
video_h = 480;
|
||||
#endif
|
||||
|
||||
/* Set 640x480 video mode */
|
||||
if ((screen = SDL_SetVideoMode(640, 480, video_bpp, videoflags)) == NULL) {
|
||||
fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
|
||||
video_bpp, SDL_GetError());
|
||||
if ((screen =
|
||||
SDL_SetVideoMode(video_w, video_h, video_bpp, videoflags)) == NULL) {
|
||||
fprintf(stderr, "Couldn't set %%d%d video mode: %s\n", video_w,
|
||||
video_h, video_bpp, SDL_GetError());
|
||||
quit(2);
|
||||
}
|
||||
|
||||
|
|
|
|||
213
test/testdyngles.c
Normal file
213
test/testdyngles.c
Normal file
|
|
@ -0,0 +1,213 @@
|
|||
/*
|
||||
* Small SDL example to demonstrate dynamically loading
|
||||
* OpenGL lib and functions
|
||||
*
|
||||
* (FYI it was supposed to look like snow in the wind or something...)
|
||||
*
|
||||
* Compile with :
|
||||
* gcc testdyngl.c `sdl-config --libs --cflags` -o testdyngl -DHAVE_OPENGL
|
||||
*
|
||||
* You can specify a different OpenGL lib on the command line, i.e. :
|
||||
* ./testdyngl /usr/X11R6/lib/libGL.so.1.2
|
||||
* or
|
||||
* ./testdyngl /usr/lib/libGL.so.1.0.4496
|
||||
*
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "SDL.h"
|
||||
|
||||
#ifdef __IPHONEOS__
|
||||
#define HAVE_OPENGLES
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_OPENGLES
|
||||
|
||||
#include "SDL_opengles.h"
|
||||
|
||||
/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
|
||||
static void
|
||||
quit(int rc)
|
||||
{
|
||||
SDL_Quit();
|
||||
exit(rc);
|
||||
}
|
||||
|
||||
void *
|
||||
get_funcaddr(const char *p)
|
||||
{
|
||||
void *f = SDL_GL_GetProcAddress(p);
|
||||
if (f) {
|
||||
return f;
|
||||
} else {
|
||||
printf("Unable to get function pointer for %s\n", p);
|
||||
quit(1);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
typedef struct
|
||||
{
|
||||
//void (APIENTRY * glBegin) (GLenum);
|
||||
//void (APIENTRY * glEnd) ();
|
||||
//void (APIENTRY * glVertex3f) (GLfloat, GLfloat, GLfloat);
|
||||
|
||||
void (APIENTRY * glEnableClientState) (GLenum array);
|
||||
void (APIENTRY * glVertexPointer) (GLint size, GLenum type,
|
||||
GLsizei stride,
|
||||
const GLvoid * pointer);
|
||||
void (APIENTRY * glDrawArrays) (GLenum mode, GLint first, GLsizei count);
|
||||
|
||||
|
||||
void (APIENTRY * glClearColor) (GLfloat, GLfloat, GLfloat, GLfloat);
|
||||
void (APIENTRY * glClear) (GLbitfield);
|
||||
void (APIENTRY * glDisable) (GLenum);
|
||||
void (APIENTRY * glEnable) (GLenum);
|
||||
void (APIENTRY * glColor4ub) (GLubyte, GLubyte, GLubyte, GLubyte);
|
||||
void (APIENTRY * glPointSize) (GLfloat);
|
||||
void (APIENTRY * glHint) (GLenum, GLenum);
|
||||
void (APIENTRY * glBlendFunc) (GLenum, GLenum);
|
||||
void (APIENTRY * glMatrixMode) (GLenum);
|
||||
void (APIENTRY * glLoadIdentity) ();
|
||||
void (APIENTRY * glOrthof) (GLfloat, GLfloat, GLfloat, GLfloat,
|
||||
GLfloat, GLfloat);
|
||||
void (APIENTRY * glRotatef) (GLfloat, GLfloat, GLfloat, GLfloat);
|
||||
void (APIENTRY * glViewport) (GLint, GLint, GLsizei, GLsizei);
|
||||
void (APIENTRY * glFogf) (GLenum, GLfloat);
|
||||
}
|
||||
glfuncs;
|
||||
|
||||
void
|
||||
init_glfuncs(glfuncs * f)
|
||||
{
|
||||
f->glEnableClientState = get_funcaddr("glEnableClientState");
|
||||
f->glVertexPointer = get_funcaddr("glVertexPointer");
|
||||
f->glDrawArrays = get_funcaddr("glDrawArrays");
|
||||
f->glClearColor = get_funcaddr("glClearColor");
|
||||
f->glClear = get_funcaddr("glClear");
|
||||
f->glDisable = get_funcaddr("glDisable");
|
||||
f->glEnable = get_funcaddr("glEnable");
|
||||
f->glColor4ub = get_funcaddr("glColor4ub");
|
||||
f->glPointSize = get_funcaddr("glPointSize");
|
||||
f->glHint = get_funcaddr("glHint");
|
||||
f->glBlendFunc = get_funcaddr("glBlendFunc");
|
||||
f->glMatrixMode = get_funcaddr("glMatrixMode");
|
||||
f->glLoadIdentity = get_funcaddr("glLoadIdentity");
|
||||
f->glOrthof = get_funcaddr("glOrthof");
|
||||
f->glRotatef = get_funcaddr("glRotatef");
|
||||
f->glViewport = get_funcaddr("glViewport");
|
||||
f->glFogf = get_funcaddr("glFogf");
|
||||
}
|
||||
|
||||
#define NB_PIXELS 1000
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
glfuncs f;
|
||||
int i;
|
||||
SDL_Event event;
|
||||
int done = 0;
|
||||
GLfloat pixels[NB_PIXELS * 3];
|
||||
const char *gl_library = NULL; /* Use the default GL library */
|
||||
|
||||
int video_w, video_h;
|
||||
|
||||
/* you may want to change these according to the platform */
|
||||
video_w = 320;
|
||||
video_h = 480;
|
||||
|
||||
if (argv[1]) {
|
||||
gl_library = argv[1];
|
||||
}
|
||||
|
||||
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
|
||||
printf("Unable to init SDL : %s\n", SDL_GetError());
|
||||
return (1);
|
||||
}
|
||||
|
||||
if (SDL_GL_LoadLibrary(gl_library) < 0) {
|
||||
printf("Unable to dynamically open GL lib : %s\n", SDL_GetError());
|
||||
quit(1);
|
||||
}
|
||||
|
||||
if (SDL_SetVideoMode(video_h, video_w, 0, SDL_OPENGL) == NULL) {
|
||||
printf("Unable to open video mode : %s\n", SDL_GetError());
|
||||
quit(1);
|
||||
}
|
||||
|
||||
/* Set the window manager title bar */
|
||||
SDL_WM_SetCaption("SDL Dynamic OpenGL Loading Test", "testdyngl");
|
||||
|
||||
init_glfuncs(&f);
|
||||
|
||||
for (i = 0; i < NB_PIXELS; i++) {
|
||||
pixels[3 * i] = rand() % 250 - 125;
|
||||
pixels[3 * i + 1] = rand() % 250 - 125;
|
||||
pixels[3 * i + 2] = rand() % 250 - 125;
|
||||
}
|
||||
|
||||
f.glViewport(0, 0, video_w, video_h);
|
||||
|
||||
f.glMatrixMode(GL_PROJECTION);
|
||||
f.glLoadIdentity();
|
||||
f.glOrthof(-100, 100, -100, 100, -500, 500);
|
||||
|
||||
f.glMatrixMode(GL_MODELVIEW);
|
||||
f.glLoadIdentity();
|
||||
|
||||
f.glEnable(GL_DEPTH_TEST);
|
||||
f.glDisable(GL_TEXTURE_2D);
|
||||
f.glEnable(GL_BLEND);
|
||||
f.glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
f.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
||||
f.glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
||||
|
||||
f.glEnable(GL_POINT_SMOOTH);
|
||||
f.glHint(GL_POINT_SMOOTH_HINT, GL_NICEST);
|
||||
f.glPointSize(5.0f);
|
||||
f.glEnable(GL_FOG);
|
||||
f.glFogf(GL_FOG_START, -500);
|
||||
f.glFogf(GL_FOG_END, 500);
|
||||
f.glFogf(GL_FOG_DENSITY, 0.005);
|
||||
|
||||
do {
|
||||
f.glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
||||
|
||||
f.glRotatef(2.0, 1.0, 1.0, 1.0);
|
||||
f.glRotatef(1.0, 0.0, 1.0, 1.0);
|
||||
|
||||
f.glColor4ub(255, 255, 255, 255);
|
||||
|
||||
f.glEnableClientState(GL_VERTEX_ARRAY);
|
||||
f.glVertexPointer(3, GL_FLOAT, 0, pixels);
|
||||
f.glDrawArrays(GL_POINTS, 0, NB_PIXELS);
|
||||
|
||||
SDL_GL_SwapBuffers();
|
||||
|
||||
while (SDL_PollEvent(&event)) {
|
||||
if (event.type == SDL_KEYDOWN)
|
||||
done = 1;
|
||||
}
|
||||
|
||||
SDL_Delay(20);
|
||||
}
|
||||
while (!done);
|
||||
|
||||
SDL_Quit();
|
||||
return 0;
|
||||
}
|
||||
|
||||
#else /* HAVE_OPENGLES */
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
printf("No OpenGL support on this system\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
#endif /* HAVE_OPENGLES */
|
||||
|
|
@ -14,9 +14,14 @@
|
|||
#include <stdio.h>
|
||||
|
||||
/* WARNING ! those 2 files will be destroyed by this test program */
|
||||
#define FBASENAME1 "sdldata1" /* this file will be created during tests */
|
||||
#define FBASENAME2 "sdldata2" /* this file should not exists before starting test */
|
||||
|
||||
#ifdef __IPHONEOS__
|
||||
#define FBASENAME1 "../Documents/sdldata1" /* this file will be created during tests */
|
||||
#define FBASENAME2 "../Documents/sdldata2" /* this file should not exist before starting test */
|
||||
#else
|
||||
#define FBASENAME1 "sdldata1" /* this file will be created during tests */
|
||||
#define FBASENAME2 "sdldata2" /* this file should not exist before starting test */
|
||||
#endif
|
||||
|
||||
#ifndef NULL
|
||||
#define NULL ((void *)0)
|
||||
|
|
|
|||
232
test/testgles.c
Normal file
232
test/testgles.c
Normal file
|
|
@ -0,0 +1,232 @@
|
|||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
#ifdef __IPHONEOS__
|
||||
#define HAVE_OPENGLES
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_OPENGLES
|
||||
|
||||
#include "SDL_opengles.h"
|
||||
|
||||
static CommonState *state;
|
||||
static SDL_GLContext context;
|
||||
|
||||
/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
|
||||
static void
|
||||
quit(int rc)
|
||||
{
|
||||
if (context) {
|
||||
/* SDL_GL_MakeCurrent(0, NULL); *//* doesn't do anything */
|
||||
SDL_GL_DeleteContext(context);
|
||||
}
|
||||
CommonQuit(state);
|
||||
exit(rc);
|
||||
}
|
||||
|
||||
static void
|
||||
Render()
|
||||
{
|
||||
static GLubyte color[8][4] = { {255, 0, 0, 0},
|
||||
{255, 0, 0, 255},
|
||||
{0, 255, 0, 255},
|
||||
{0, 255, 0, 255},
|
||||
{0, 255, 0, 255},
|
||||
{255, 255, 255, 255},
|
||||
{255, 0, 255, 255},
|
||||
{0, 0, 255, 255}
|
||||
};
|
||||
static GLfloat cube[8][3] = { {0.5, 0.5, -0.5},
|
||||
{0.5f, -0.5f, -0.5f},
|
||||
{-0.5f, -0.5f, -0.5f},
|
||||
{-0.5f, 0.5f, -0.5f},
|
||||
{-0.5f, 0.5f, 0.5f},
|
||||
{0.5f, 0.5f, 0.5f},
|
||||
{0.5f, -0.5f, 0.5f},
|
||||
{-0.5f, -0.5f, 0.5f}
|
||||
};
|
||||
static GLubyte indices[36] = { 0, 3, 4,
|
||||
4, 5, 0,
|
||||
0, 5, 6,
|
||||
6, 1, 0,
|
||||
6, 7, 2,
|
||||
2, 1, 6,
|
||||
7, 4, 3,
|
||||
3, 2, 7,
|
||||
5, 4, 7,
|
||||
7, 6, 5,
|
||||
2, 3, 1,
|
||||
3, 0, 1
|
||||
};
|
||||
|
||||
|
||||
/* Do our drawing, too. */
|
||||
glClearColor(0.0, 0.0, 0.0, 1.0);
|
||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
||||
|
||||
/* Draw the cube */
|
||||
glColorPointer(4, GL_UNSIGNED_BYTE, 0, color);
|
||||
glEnableClientState(GL_COLOR_ARRAY);
|
||||
glVertexPointer(3, GL_FLOAT, 0, cube);
|
||||
glEnableClientState(GL_VERTEX_ARRAY);
|
||||
glDrawElements(GL_TRIANGLES, 36, GL_UNSIGNED_BYTE, indices);
|
||||
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glRotatef(5.0, 1.0, 1.0, 1.0);
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
int fsaa, accel;
|
||||
int value;
|
||||
int i, done;
|
||||
SDL_DisplayMode mode;
|
||||
SDL_Event event;
|
||||
Uint32 then, now, frames;
|
||||
|
||||
/* Initialize parameters */
|
||||
fsaa = 0;
|
||||
accel = 0;
|
||||
|
||||
/* Initialize test framework */
|
||||
state = CommonCreateState(argv, SDL_INIT_VIDEO);
|
||||
if (!state) {
|
||||
return 1;
|
||||
}
|
||||
for (i = 1; i < argc;) {
|
||||
int consumed;
|
||||
|
||||
consumed = CommonArg(state, i);
|
||||
if (consumed == 0) {
|
||||
if (SDL_strcasecmp(argv[i], "--fsaa") == 0) {
|
||||
++fsaa;
|
||||
consumed = 1;
|
||||
} else if (SDL_strcasecmp(argv[i], "--accel") == 0) {
|
||||
++accel;
|
||||
consumed = 1;
|
||||
} else {
|
||||
consumed = -1;
|
||||
}
|
||||
}
|
||||
if (consumed < 0) {
|
||||
fprintf(stderr, "Usage: %s %s [--fsaa] [--accel]\n", argv[0],
|
||||
CommonUsage(state));
|
||||
quit(1);
|
||||
}
|
||||
i += consumed;
|
||||
}
|
||||
|
||||
/* Set OpenGL parameters */
|
||||
state->window_flags |= SDL_WINDOW_OPENGL;
|
||||
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
|
||||
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
|
||||
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
|
||||
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
|
||||
if (fsaa) {
|
||||
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
|
||||
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, fsaa);
|
||||
}
|
||||
if (accel) {
|
||||
SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1);
|
||||
}
|
||||
if (!CommonInit(state)) {
|
||||
quit(2);
|
||||
}
|
||||
|
||||
/* Create OpenGL context */
|
||||
context = SDL_GL_CreateContext(state->windows[0]);
|
||||
if (!context) {
|
||||
fprintf(stderr, "SDL_GL_CreateContext(): %s\n", SDL_GetError());
|
||||
quit(2);
|
||||
}
|
||||
|
||||
if (state->render_flags & SDL_RENDERER_PRESENTVSYNC) {
|
||||
SDL_GL_SetSwapInterval(1);
|
||||
} else {
|
||||
SDL_GL_SetSwapInterval(0);
|
||||
}
|
||||
|
||||
SDL_GetCurrentDisplayMode(&mode);
|
||||
printf("Screen BPP: %d\n", SDL_BITSPERPIXEL(mode.format));
|
||||
printf("\n");
|
||||
printf("Vendor : %s\n", glGetString(GL_VENDOR));
|
||||
printf("Renderer : %s\n", glGetString(GL_RENDERER));
|
||||
printf("Version : %s\n", glGetString(GL_VERSION));
|
||||
printf("Extensions : %s\n", glGetString(GL_EXTENSIONS));
|
||||
printf("\n");
|
||||
|
||||
SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &value);
|
||||
printf("SDL_GL_RED_SIZE: requested %d, got %d\n", 5, value);
|
||||
SDL_GL_GetAttribute(SDL_GL_GREEN_SIZE, &value);
|
||||
printf("SDL_GL_GREEN_SIZE: requested %d, got %d\n", 5, value);
|
||||
SDL_GL_GetAttribute(SDL_GL_BLUE_SIZE, &value);
|
||||
printf("SDL_GL_BLUE_SIZE: requested %d, got %d\n", 5, value);
|
||||
SDL_GL_GetAttribute(SDL_GL_DEPTH_SIZE, &value);
|
||||
printf("SDL_GL_DEPTH_SIZE: requested %d, got %d\n", 16, value);
|
||||
if (fsaa) {
|
||||
SDL_GL_GetAttribute(SDL_GL_MULTISAMPLEBUFFERS, &value);
|
||||
printf("SDL_GL_MULTISAMPLEBUFFERS: requested 1, got %d\n", value);
|
||||
SDL_GL_GetAttribute(SDL_GL_MULTISAMPLESAMPLES, &value);
|
||||
printf("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa,
|
||||
value);
|
||||
}
|
||||
if (accel) {
|
||||
SDL_GL_GetAttribute(SDL_GL_ACCELERATED_VISUAL, &value);
|
||||
printf("SDL_GL_ACCELERATED_VISUAL: requested 1, got %d\n", value);
|
||||
}
|
||||
|
||||
/* Set rendering settings */
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glLoadIdentity();
|
||||
glOrthof(-2.0, 2.0, -2.0, 2.0, -20.0, 20.0);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glLoadIdentity();
|
||||
glEnable(GL_DEPTH_TEST);
|
||||
glDepthFunc(GL_LESS);
|
||||
glShadeModel(GL_SMOOTH);
|
||||
|
||||
/* Main render loop */
|
||||
frames = 0;
|
||||
then = SDL_GetTicks();
|
||||
done = 0;
|
||||
while (!done) {
|
||||
/* Check for events */
|
||||
++frames;
|
||||
while (SDL_PollEvent(&event)) {
|
||||
CommonEvent(state, &event, &done);
|
||||
}
|
||||
for (i = 0; i < state->num_windows; ++i) {
|
||||
int w, h;
|
||||
SDL_GL_MakeCurrent(state->windows[i], context);
|
||||
SDL_GetWindowSize(state->windows[i], &w, &h);
|
||||
glViewport(0, 0, w, h);
|
||||
Render();
|
||||
SDL_GL_SwapWindow(state->windows[i]);
|
||||
}
|
||||
}
|
||||
|
||||
/* Print out some timing information */
|
||||
now = SDL_GetTicks();
|
||||
if (now > then) {
|
||||
printf("%2.2f frames per second\n",
|
||||
((double) frames * 1000) / (now - then));
|
||||
}
|
||||
quit(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#else /* HAVE_OPENGLES */
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
printf("No OpenGL ES support on this system\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
#endif /* HAVE_OPENGLES */
|
||||
|
|
@ -7,8 +7,13 @@
|
|||
|
||||
#include "SDL.h"
|
||||
|
||||
#ifdef __IPHONEOS__
|
||||
#define SCREEN_WIDTH 320
|
||||
#define SCREEN_HEIGHT 480
|
||||
#else
|
||||
#define SCREEN_WIDTH 640
|
||||
#define SCREEN_HEIGHT 480
|
||||
#endif
|
||||
|
||||
void
|
||||
WatchJoystick(SDL_Joystick * joystick)
|
||||
|
|
@ -129,6 +134,7 @@ WatchJoystick(SDL_Joystick * joystick)
|
|||
} else if (y > (SCREEN_HEIGHT - 16)) {
|
||||
y = SCREEN_HEIGHT - 16;
|
||||
}
|
||||
|
||||
axis_area[i][draw].x = (Sint16) x;
|
||||
axis_area[i][draw].y = (Sint16) y;
|
||||
axis_area[i][draw].w = 16;
|
||||
|
|
|
|||
|
|
@ -200,6 +200,8 @@ main(int argc, char *argv[])
|
|||
#else
|
||||
"Windows"
|
||||
#endif
|
||||
#elif __IPHONEOS__
|
||||
"iPhone OS"
|
||||
#else
|
||||
"an unknown operating system! (see SDL_platform.h)"
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue