projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.35.tar.gz
[xscreensaver]
/
hacks
/
glx
/
tangram_shapes.c
diff --git
a/hacks/glx/tangram_shapes.c
b/hacks/glx/tangram_shapes.c
index 32b7014c51bee5485352daea84ebc01e938a04c0..267b1873b3e154103790cb31ee4488a793ddbbf4 100644
(file)
--- a/
hacks/glx/tangram_shapes.c
+++ b/
hacks/glx/tangram_shapes.c
@@
-13,10
+13,14
@@
# include "config.h"
#endif /* HAVE_CONFIG_H */
# include "config.h"
#endif /* HAVE_CONFIG_H */
-#ifndef HAVE_
COCOA
+#ifndef HAVE_
JWXYZ
# include <GL/gl.h>
#endif
# include <GL/gl.h>
#endif
+#ifdef HAVE_ANDROID
+#include <GLES/gl.h>
+#endif
+
#ifdef HAVE_JWZGLES
# include "jwzgles.h"
#endif /* HAVE_JWZGLES */
#ifdef HAVE_JWZGLES
# include "jwzgles.h"
#endif /* HAVE_JWZGLES */
@@
-29,7
+33,8
@@
#define alpha (0.05)
#define alpha (0.05)
-static void tri_45_90(int wire)
+static void
+tri_45_90(int wire)
{
GLfloat vertices[][3] = {
{0, alpha, 0},
{
GLfloat vertices[][3] = {
{0, alpha, 0},
@@
-87,8
+92,8
@@
static void tri_45_90(int wire)
glEnd();
}
glEnd();
}
-static
-
void
unit_cube(int wire)
+static
void
+unit_cube(int wire)
{
glBegin((wire) ? GL_LINE_LOOP : GL_QUADS);
{
glBegin((wire) ? GL_LINE_LOOP : GL_QUADS);
@@
-132,8
+137,8
@@
void unit_cube(int wire)
glEnd();
}
glEnd();
}
-static
-
void
unit_rhomboid(int wire)
+static
void
+unit_rhomboid(int wire)
{
glBegin((wire) ? GL_LINE_LOOP : GL_QUADS);
{
glBegin((wire) ? GL_LINE_LOOP : GL_QUADS);
@@
-179,7
+184,8
@@
void unit_rhomboid(int wire)
/* All of the pieces have the same thickness so all of the Y values are the same */
/* All of the pieces have the same thickness so all of the Y values are the same */
-GLuint get_sm_tri_dl(int wire)
+GLuint
+tangram_get_sm_tri_dl(int wire)
{
GLuint triangle = glGenLists(1);
glNewList(triangle, GL_COMPILE);
{
GLuint triangle = glGenLists(1);
glNewList(triangle, GL_COMPILE);
@@
-189,7
+195,8
@@
GLuint get_sm_tri_dl(int wire)
return triangle;
}
return triangle;
}
-GLuint get_lg_tri_dl(int wire)
+GLuint
+tangram_get_lg_tri_dl(int wire)
{
GLuint triangle = glGenLists(1);
glNewList(triangle, GL_COMPILE);
{
GLuint triangle = glGenLists(1);
glNewList(triangle, GL_COMPILE);
@@
-199,7
+206,8
@@
GLuint get_lg_tri_dl(int wire)
return triangle;
}
return triangle;
}
-GLuint get_md_tri_dl(int wire)
+GLuint
+tangram_get_md_tri_dl(int wire)
{
GLuint triangle = glGenLists(1);
glNewList(triangle, GL_COMPILE);
{
GLuint triangle = glGenLists(1);
glNewList(triangle, GL_COMPILE);
@@
-209,7
+217,8
@@
GLuint get_md_tri_dl(int wire)
return triangle;
}
return triangle;
}
-GLuint get_square_dl(int wire)
+GLuint
+tangram_get_square_dl(int wire)
{
GLuint square = glGenLists(1);
glNewList(square, GL_COMPILE);
{
GLuint square = glGenLists(1);
glNewList(square, GL_COMPILE);
@@
-219,7
+228,8
@@
GLuint get_square_dl(int wire)
return square;
}
return square;
}
-GLuint get_rhomboid_dl(int wire)
+GLuint
+tangram_get_rhomboid_dl(int wire)
{
GLuint rhomboid = glGenLists(1);
glNewList(rhomboid, GL_COMPILE);
{
GLuint rhomboid = glGenLists(1);
glNewList(rhomboid, GL_COMPILE);