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.38.tar.gz
[xscreensaver]
/
hacks
/
glx
/
cube21.c
diff --git
a/hacks/glx/cube21.c
b/hacks/glx/cube21.c
index 2ca13a127e88718a5d7ab080d5110cee1abc3805..a29b47dc7fa29d4dea3c2589a0042f28f590a32f 100644
(file)
--- a/
hacks/glx/cube21.c
+++ b/
hacks/glx/cube21.c
@@
-26,7
+26,7
@@
/* TODO:
* some simple "solve mode"
/* TODO:
* some simple "solve mode"
- * use rotator
and trackball
+ * use rotator
*/
/*-
*/
/*-
@@
-45,10
+45,12
@@
"*showFPS: False \n" \
"*wireframe: False \n"
"*showFPS: False \n" \
"*wireframe: False \n"
-# define
refresh
_cube21 0
-# define
cube21_handle_event
0
+# define
free
_cube21 0
+# define
release_cube21
0
#include "xlockmore.h"
#include "xlockmore.h"
+#include "gltrackball.h"
+
#ifdef USE_GL
#define DEF_SPIN "True"
#ifdef USE_GL
#define DEF_SPIN "True"
@@
-127,7
+129,7
@@
ENTRYPOINT ModeSpecOpt cube21_opts = {countof(opts), opts, countof(vars), vars,
#ifdef USE_MODULES
ModStruct cube21_description =
#ifdef USE_MODULES
ModStruct cube21_description =
-{ "cube21", "init_cube21", "draw_cube21",
"release_cube21"
,
+{ "cube21", "init_cube21", "draw_cube21",
NULL
,
"draw_cube21", "change_cube21", NULL, &cube21_opts,
25000, 1, 1, 1, 1.0, 4, "",
"Shows randomly shuffling Cube 21", 0, NULL
"draw_cube21", "change_cube21", NULL, &cube21_opts,
25000, 1, 1, 1, 1.0, 4, "",
"Shows randomly shuffling Cube 21", 0, NULL
@@
-178,6
+180,9
@@
typedef struct {
GLfloat texp, texq, posc[6];
GLfloat color_inner[4];
GLfloat texp, texq, posc[6];
GLfloat color_inner[4];
+ Bool button_down_p;
+ trackball_state *trackball;
+
} cube21_conf;
static cube21_conf *cube21 = NULL;
} cube21_conf;
static cube21_conf *cube21 = NULL;
@@
-510,8
+515,21
@@
static Bool draw_main(ModeInfo *mi, cube21_conf *cp)
else
glTranslatef(0, 0, zpos);
glScalef(size, size, size);
else
glTranslatef(0, 0, zpos);
glScalef(size, size, size);
+
+# ifdef HAVE_MOBILE /* Keep it the same relative size when rotated. */
+ {
+ GLfloat h = MI_HEIGHT(mi) / (GLfloat) MI_WIDTH(mi);
+ int o = (int) current_device_rotation();
+ if (o != 0 && o != 180 && o != -180)
+ glScalef (1/h, 1/h, 1/h);
+ }
+# endif
+
glRotatef(cp->xrot, 1.0, 0.0, 0.0);
glRotatef(cp->yrot, 0.0, 1.0, 0.0);
glRotatef(cp->xrot, 1.0, 0.0, 0.0);
glRotatef(cp->yrot, 0.0, 1.0, 0.0);
+
+ gltrackball_rotate (cp->trackball);
+
if(cp->wire) glColor3f(0.7, 0.7, 0.7);
switch(cp->state) {
case CUBE21_PAUSE1:
if(cp->wire) glColor3f(0.7, 0.7, 0.7);
switch(cp->state) {
case CUBE21_PAUSE1:
@@
-692,6
+710,11
@@
static void init_gl(ModeInfo *mi)
tex = False;
cp->cmat = False;
}
tex = False;
cp->cmat = False;
}
+
+# ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */
+ cp->wire = 0;
+# endif
+
if(cp->wire) {
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
return;
if(cp->wire) {
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
return;
@@
-702,7
+725,6
@@
static void init_gl(ModeInfo *mi)
cp->color_inner[0] = cp->color_inner[1] = cp->color_inner[2] = 1.0;
glClearDepth(1.0);
cp->color_inner[0] = cp->color_inner[1] = cp->color_inner[2] = 1.0;
glClearDepth(1.0);
- glClearColor(0.0, 0.0, 0.0, 1.0);
glDrawBuffer(GL_BACK);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glShadeModel(GL_FLAT);
glDrawBuffer(GL_BACK);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glShadeModel(GL_FLAT);
@@
-824,9
+846,18
@@
static void init_cp(cube21_conf *cp)
ENTRYPOINT void reshape_cube21(ModeInfo *mi, int width, int height)
{
cube21_conf *cp = &cube21[MI_SCREEN(mi)];
ENTRYPOINT void reshape_cube21(ModeInfo *mi, int width, int height)
{
cube21_conf *cp = &cube21[MI_SCREEN(mi)];
+ int y = 0;
if(!height) height = 1;
cp->ratio = (GLfloat)width/(GLfloat)height;
if(!height) height = 1;
cp->ratio = (GLfloat)width/(GLfloat)height;
- glViewport(0, 0, (GLint) width, (GLint) height);
+
+ if (width > height * 5) { /* tiny window: show middle */
+ height = width;
+ y = -height/2;
+ cp->ratio = width / (GLfloat) height;
+ cp->posarg = 0;
+ }
+
+ glViewport(0, y, (GLint) width, (GLint) height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
gluPerspective(30.0, cp->ratio, 1.0, 100.0);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
gluPerspective(30.0, cp->ratio, 1.0, 100.0);
@@
-834,36
+865,37
@@
ENTRYPOINT void reshape_cube21(ModeInfo *mi, int width, int height)
glClear(GL_COLOR_BUFFER_BIT);
}
glClear(GL_COLOR_BUFFER_BIT);
}
-ENTRYPOINT void release_cube21(ModeInfo *mi)
+ENTRYPOINT Bool
+cube21_handle_event (ModeInfo *mi, XEvent *event)
{
{
- if (cube21 != NULL) {
- int screen;
- for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
- cube21_conf *cp = &cube21[screen];
- if (cp->glx_context) {
- cp->glx_context = NULL;
- }
- }
- free((void *)cube21);
- cube21 = NULL;
- }
- FreeAllGL(mi);
+ cube21_conf *cp = &cube21[MI_SCREEN(mi)];
+
+ if (gltrackball_event_handler (event, cp->trackball,
+ MI_WIDTH (mi), MI_HEIGHT (mi),
+ &cp->button_down_p))
+ return True;
+
+ return False;
}
}
+
ENTRYPOINT void init_cube21(ModeInfo *mi)
{
cube21_conf *cp;
ENTRYPOINT void init_cube21(ModeInfo *mi)
{
cube21_conf *cp;
- if(!cube21) {
- cube21 = (cube21_conf *)calloc(MI_NUM_SCREENS(mi), sizeof(cube21_conf));
- if(!cube21) return;
- }
+ MI_INIT(mi, cube21);
cp = &cube21[MI_SCREEN(mi)];
cp = &cube21[MI_SCREEN(mi)];
+ cp->trackball = gltrackball_init (False);
+
if(!cp->texp) {
init_posc(cp);
make_texture(cp);
}
if(!cp->texp) {
init_posc(cp);
make_texture(cp);
}
+#ifdef HAVE_MOBILE
+ size *= 2;
+#endif
+
if ((cp->glx_context = init_GL(mi)) != NULL) {
init_gl(mi);
init_cp(cp);
if ((cp->glx_context = init_GL(mi)) != NULL) {
init_gl(mi);
init_cp(cp);
@@
-885,7
+917,7
@@
ENTRYPOINT void draw_cube21(ModeInfo * mi)
mi->polygon_count = 0;
glXMakeCurrent(display, window, *(cp->glx_context));
if (!draw_main(mi, cp)) {
mi->polygon_count = 0;
glXMakeCurrent(display, window, *(cp->glx_context));
if (!draw_main(mi, cp)) {
-
release_cube21
(mi);
+
MI_ABORT
(mi);
return;
}
if (MI_IS_FPS(mi)) do_fps (mi);
return;
}
if (MI_IS_FPS(mi)) do_fps (mi);