projects
/
freeglut
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6007df5
)
Make Android work again - adapt to recent changes and fix use of GL-nonES function
author
Sylvain Beucler
<beuc@beuc.net>
Sun, 19 May 2013 15:05:39 +0000
(15:05 +0000)
committer
Sylvain Beucler
<beuc@beuc.net>
Sun, 19 May 2013 15:05:39 +0000
(15:05 +0000)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1623
7f0cb862
-5218-0410-a997-
914c9d46530a
progs/test-shapes-gles1/AndroidManifest.xml
patch
|
blob
|
history
progs/test-shapes-gles1/test-shapes-gles1.c
patch
|
blob
|
history
src/android/fg_internal_android.h
patch
|
blob
|
history
src/android/fg_main_android.c
patch
|
blob
|
history
src/fg_geometry.c
patch
|
blob
|
history
src/gles_stubs.c
patch
|
blob
|
history
diff --git
a/progs/test-shapes-gles1/AndroidManifest.xml
b/progs/test-shapes-gles1/AndroidManifest.xml
index
3050ecb
..
7839f74
100644
(file)
--- a/
progs/test-shapes-gles1/AndroidManifest.xml
+++ b/
progs/test-shapes-gles1/AndroidManifest.xml
@@
-7,7
+7,7
@@
<!-- This is the platform API where NativeActivity was introduced. -->
<uses-sdk android:minSdkVersion="9" />
<!-- This is the platform API where NativeActivity was introduced. -->
<uses-sdk android:minSdkVersion="9" />
- <uses-feature android:glEsVersion="0x00020000"></uses-feature>
+ <uses-feature android:glEsVersion="0x00010001"></uses-feature>
<!-- This .apk has no Java code itself, so set hasCode to false. -->
<application android:label="@string/app_name" android:hasCode="true"
<!-- This .apk has no Java code itself, so set hasCode to false. -->
<application android:label="@string/app_name" android:hasCode="true"
diff --git
a/progs/test-shapes-gles1/test-shapes-gles1.c
b/progs/test-shapes-gles1/test-shapes-gles1.c
index
d55e0c6
..
e0bdd01
100644
(file)
--- a/
progs/test-shapes-gles1/test-shapes-gles1.c
+++ b/
progs/test-shapes-gles1/test-shapes-gles1.c
@@
-100,6
+100,10
@@
static void drawSolidCone(void) { glutSolidCone(orad,orad,slices,
static void drawWireCone(void) { glutWireCone(orad,orad,slices,stacks); } /* orad doubles as size input */
static void drawSolidCylinder(void) { glutSolidCylinder(orad,orad,slices,stacks); } /* orad doubles as size input */
static void drawWireCylinder(void) { glutWireCylinder(orad,orad,slices,stacks); } /* orad doubles as size input */
static void drawWireCone(void) { glutWireCone(orad,orad,slices,stacks); } /* orad doubles as size input */
static void drawSolidCylinder(void) { glutSolidCylinder(orad,orad,slices,stacks); } /* orad doubles as size input */
static void drawWireCylinder(void) { glutWireCylinder(orad,orad,slices,stacks); } /* orad doubles as size input */
+static void drawSolidTeapot(void)
+{ glFrontFace(GL_CW); glutSolidTeapot(orad); glFrontFace(GL_CCW); /* orad doubles as size input */}
+static void drawWireTeapot(void)
+{ glFrontFace(GL_CW); glutWireTeapot(orad); glFrontFace(GL_CCW); /* orad doubles as size input */}
/*
* This structure defines an entry in our function-table.
/*
* This structure defines an entry in our function-table.
@@
-121,7
+125,7
@@
static const entry table [] =
ENTRY (RhombicDodecahedron),
ENTRY (Icosahedron),
ENTRY (SierpinskiSponge),
ENTRY (RhombicDodecahedron),
ENTRY (Icosahedron),
ENTRY (SierpinskiSponge),
- /* ENTRY (Teapot), */
+ ENTRY (Teapot),
ENTRY (Torus),
ENTRY (Sphere),
ENTRY (Cone),
ENTRY (Torus),
ENTRY (Sphere),
ENTRY (Cone),
diff --git
a/src/android/fg_internal_android.h
b/src/android/fg_internal_android.h
index
445251f
..
1888b1b
100644
(file)
--- a/
src/android/fg_internal_android.h
+++ b/
src/android/fg_internal_android.h
@@
-109,4
+109,12
@@
struct tagSFG_PlatformWindowState
char unused;
};
char unused;
};
+/* Menu font and color definitions */
+#define FREEGLUT_MENU_FONT NULL
+
+#define FREEGLUT_MENU_PEN_FORE_COLORS {0.0f, 0.0f, 0.0f, 1.0f}
+#define FREEGLUT_MENU_PEN_BACK_COLORS {0.70f, 0.70f, 0.70f, 1.0f}
+#define FREEGLUT_MENU_PEN_HFORE_COLORS {0.0f, 0.0f, 0.0f, 1.0f}
+#define FREEGLUT_MENU_PEN_HBACK_COLORS {1.0f, 1.0f, 1.0f, 1.0f}
+
#endif /* FREEGLUT_INTERNAL_ANDROID_H */
#endif /* FREEGLUT_INTERNAL_ANDROID_H */
diff --git
a/src/android/fg_main_android.c
b/src/android/fg_main_android.c
index
acdba1f
..
41a1d3f
100644
(file)
--- a/
src/android/fg_main_android.c
+++ b/
src/android/fg_main_android.c
@@
-414,7
+414,7
@@
void fgPlatformProcessSingleEvent ( void )
if (window != NULL && window->Window.Handle != NULL) {
\r
int32_t width = ANativeWindow_getWidth(window->Window.Handle);
\r
int32_t height = ANativeWindow_getHeight(window->Window.Handle);
\r
if (window != NULL && window->Window.Handle != NULL) {
\r
int32_t width = ANativeWindow_getWidth(window->Window.Handle);
\r
int32_t height = ANativeWindow_getHeight(window->Window.Handle);
\r
- fghOnReshapeNotify(width,height);
\r
+ fghOnReshapeNotify(window,width,height,GL_FALSE);
\r
}
\r
\r
/* Read pending event. */
\r
}
\r
\r
/* Read pending event. */
\r
diff --git
a/src/fg_geometry.c
b/src/fg_geometry.c
index
96f171e
..
587501c
100644
(file)
--- a/
src/fg_geometry.c
+++ b/
src/fg_geometry.c
@@
-557,7
+557,7
@@
static void fghDrawNormalVisualization11()
/* Done, free memory, reset color */
free(verticesForNormalVisualization);
/* Done, free memory, reset color */
free(verticesForNormalVisualization);
- glColor4fv(currentColor);
+ glColor4f(currentColor[0],currentColor[1],currentColor[2],currentColor[3]);
}
#endif
}
#endif
diff --git
a/src/gles_stubs.c
b/src/gles_stubs.c
index
63693cc
..
669f44a
100644
(file)
--- a/
src/gles_stubs.c
+++ b/
src/gles_stubs.c
@@
-29,6
+29,7
@@
void glutChangeToSubMenu( int item, const char* label, int value ) {}
void glutRemoveMenuItem( int item ) {}
void glutAttachMenu( int button ) {}
void glutDetachMenu( int button ) {}
void glutRemoveMenuItem( int item ) {}
void glutAttachMenu( int button ) {}
void glutDetachMenu( int button ) {}
+void glutSetMenuFont( int menuID, void* font ) {}
void glutBitmapCharacter( void* font, int character ) {}
int glutBitmapWidth( void* font, int character ) { return 0; }
void glutBitmapCharacter( void* font, int character ) {}
int glutBitmapWidth( void* font, int character ) { return 0; }