FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A few more stubs for Android

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1228 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
beuc 2012-04-01 15:42:47 +00:00
parent a0643b8c0c
commit 2707583c09
5 changed files with 94 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -52,6 +52,8 @@ freeglut/freeglut/progs/demos/spaceball/vmath.h -text
freeglut/freeglut/progs/demos/spaceball/vmath.inl -text
freeglut/freeglut/progs/demos/subwin/subwin.c -text
freeglut/freeglut/progs/demos/timer/timer.c -text
freeglut/freeglut/src/android/fg_cursor_android.c -text
freeglut/freeglut/src/android/fg_ext_android.c -text
freeglut/freeglut/src/android/fg_gamemode_android.c -text
freeglut/freeglut/src/android/fg_init_android.c -text
freeglut/freeglut/src/android/fg_input_devices_android.c -text

8
freeglut/freeglut/CMakeLists.txt
View File

@ -114,17 +114,19 @@ ELSEIF(ANDROID)
src/egl/fg_window_egl.h
src/android/native_app_glue/android_native_app_glue.c
src/android/native_app_glue/android_native_app_glue.h
src/android/fg_runtime_android.c
src/android/fg_internal_android.h
src/android/fg_cursor_android.c
src/android/fg_ext_android.c
src/android/fg_gamemode_android.c
src/android/fg_structure_android.c
src/android/fg_init_android.c
src/android/fg_input_devices_android.c
src/android/fg_joystick_android.c
src/android/fg_main_android.c
src/android/fg_runtime_android.c
src/android/fg_spaceball_android.c
src/android/fg_state_android.c
src/android/fg_structure_android.c
src/android/fg_window_android.c
src/android/fg_internal_android.h
)
ELSE()
LIST(APPEND FREEGLUT_SRCS

38
freeglut/freeglut/src/android/fg_cursor_android.c Normal file
View File

@ -0,0 +1,38 @@
/*
* fg_cursor_android.c
*
* The Windows-specific mouse cursor related stuff.
*
* Copyright (C) 2012 Sylvain Beucler
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <GL/freeglut.h>
#include "../fg_internal.h"
void fgPlatformSetCursor ( SFG_Window *window, int cursorID )
{
fprintf(stderr, "fgPlatformSetCursor: STUB\n");
}
void fgPlatformWarpPointer ( int x, int y )
{
fprintf(stderr, "fgPlatformWarpPointer: STUB\n");
}

48
freeglut/freeglut/src/android/fg_ext_android.c Normal file
View File

@ -0,0 +1,48 @@
/*
* fg_ext_android.c
*
* Functions related to OpenGL extensions.
*
* Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved.
* Written by Pawel W. Olszta, <olszta@sourceforge.net>
* Copied for Platform code by Evan Felix <karcaw at gmail.com>
* Copyright (C) 2012 Sylvain Beucler
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <GL/freeglut.h>
#include "../fg_internal.h"
GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
{
/* optimization: quick initial check */
if( strncmp( procName, "glut", 4 ) != 0 )
return NULL;
#define CHECK_NAME(x) if( strcmp( procName, #x ) == 0) return (GLUTproc)x;
CHECK_NAME(glutJoystickFunc);
CHECK_NAME(glutForceJoystickFunc);
CHECK_NAME(glutGameModeString);
CHECK_NAME(glutEnterGameMode);
CHECK_NAME(glutLeaveGameMode);
CHECK_NAME(glutGameModeGet);
#undef CHECK_NAME
return NULL;
}

2
freeglut/freeglut/src/fg_geometry.c
View File

@ -1148,7 +1148,6 @@ static void fghSphere( double radius, GLint slices, GLint stacks, GLboolean useW
free(normals);
}
#endif /* GL_ES_VERSION_2_0 */
/* -- INTERFACE FUNCTIONS ---------------------------------------------- */
@ -1174,6 +1173,7 @@ void FGAPIENTRY glutWireSphere(double radius, GLint slices, GLint stacks)
fghSphere( radius, slices, stacks, TRUE );
}
#endif /* GL_ES_VERSION_2_0 */
#ifndef EGL_VERSION_1_0
/*