X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fklein.c;h=63ea7599c94db12ff0009759cffbf8c28acda7a6;hp=5f2332af82bf1b1322db891aefc90f58fde3e51f;hb=d1ae2829ff0fd2a96c16a0c8c5420efaa47d7b30;hpb=7edd66e6bd3209013ee059819747b10b5835635b diff --git a/hacks/glx/klein.c b/hacks/glx/klein.c index 5f2332af..63ea7599 100644 --- a/hacks/glx/klein.c +++ b/hacks/glx/klein.c @@ -5,7 +5,7 @@ static const char sccsid[] = "@(#)klein.c 1.1 08/10/04 xlockmore"; #endif -/* Copyright (c) 2005-2013 Carsten Steger . */ +/* Copyright (c) 2005-2014 Carsten Steger . */ /* * Permission to use, copy, modify, and distribute this software and its @@ -24,6 +24,7 @@ static const char sccsid[] = "@(#)klein.c 1.1 08/10/04 xlockmore"; * C. Steger - 08/10/04: Initial version * C. Steger - 09/08/03: Changes to the parameter handling * C. Steger - 13/12/25: Added the squeezed torus Klein bottle + * C. Steger - 14/10/03: Moved the curlicue texture to curlicue.h */ /* @@ -77,6 +78,8 @@ static const char sccsid[] = "@(#)klein.c 1.1 08/10/04 xlockmore"; * Scientific American Library, 1990. */ +#include "curlicue.h" + #ifndef M_PI #define M_PI 3.14159265358979323846 #endif @@ -301,268 +304,6 @@ typedef struct { static kleinstruct *klein = (kleinstruct *) NULL; -/* A texture map containing a "curlicue" */ -#define TEX_DIMENSION 64 -static const unsigned char texture[TEX_DIMENSION*TEX_DIMENSION] = { - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 58, 43, 43, 43, 43, 45, 70, 70, 70, - 70, 70, 70, 70, 74, 98, 98, 98,100,194,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 18, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 30,186,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 18, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1,111,244,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 18, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 43,198,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 18, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 5,123,248,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 18, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 50,209,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,246, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 18, 0, 0, 0, 0, 0, 0, 0, 0, - 74,252,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,138, 4, - 66,229,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 18, 0, 0, 0, 0, 0, 0, 0, 0, - 1,170,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,153, 0, 0, - 0, 53,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 18, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 6,188,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,213, 7, 0, 0, - 0, 0,226,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 45, 0, 0, 0, 0, 0, 47, 0, 0, - 0, 0, 22,225,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,254, 54, 0, 0, 0, - 0, 81,254,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 45, 0, 0, 0, 0, 56,247, 82, 0, - 0, 0, 0, 59,253,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,152, 0, 0, 0, 0, - 52,243,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 45, 0, 0, 0, 8,215,255,250, 56, - 0, 0, 0, 0,142,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,241, 19, 0, 0, 0, 15, - 220,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 45, 0, 0, 0,129,255,255,255,230, - 23, 0, 0, 0, 12,230,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,131, 0, 0, 0, 0,157, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 45, 0, 0, 49,250,255,255,255,255, - 171, 0, 0, 0, 0,112,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,246, 19, 0, 0, 0, 54,253, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 45, 0, 5,208,255,255,255,255,255, - 255, 77, 0, 0, 0, 9,231,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,163, 0, 0, 0, 0,186,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 45, 0,121,255,255,255,255,255,255, - 255,211, 2, 0, 0, 0,134,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255, 69, 0, 0, 0, 50,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 45, 41,247,255,255,255,255,255,255, - 255,255, 73, 0, 0, 0, 38,254,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,237, 4, 0, 0, 0,145,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255, 52,201,255,255,255,255,255,255,255, - 255,255,169, 0, 0, 0, 0,216,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,181, 0, 0, 0, 0,229,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,186,255,255,255,255,255,255,255,255, - 255,255,247, 7, 0, 0, 0,150,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,130, 0, 0, 0, 42,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255, 67, 0, 0, 0, 91,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255, 79, 0, 0, 0, 95,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,120, 0, 0, 0, 56,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255, 55, 0, 0, 0,130,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,157, 0, 0, 0, 21,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255, 34, 0, 0, 0,161,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,179, 0, 0, 0, 2,250,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255, 27, 0, 0, 0,168,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,200, 0, 0, 0, 0,249,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255, 27, 0, 0, 0,168,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,200, 0, 0, 0, 0,249,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255, 27, 0, 0, 0,163,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,183, 0, 0, 0, 0,249,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255, 42, 0, 0, 0,135,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,161, 0, 0, 0, 17,254,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255, 76, 0, 0, 0,100,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,126, 0, 0, 0, 48,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,114, 0, 0, 0, 53,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255, 78, 0, 0, 0, 84,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,165, 0, 0, 0, 3,241,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,252, 16, 0, 0, 0,139,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,228, 0, 0, 0, 0,161,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,192, 0, 0, 0, 0,198,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255, 46, 0, 0, 0, 67,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255, 93, 0, 0, 0, 21,250,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,139, 0, 0, 0, 1,211,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,226, 7, 0, 0, 0,108,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,230, 6, 0, 0, 0, 79,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,106, 0, 0, 0, 1,206,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255, 97, 0, 0, 0, 0,183, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 202, 3, 0, 0, 0, 67,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,221, 8, 0, 0, 0, 27, - 235,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,243, - 40, 0, 0, 0, 0,198,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,126, 0, 0, 0, 0, - 71,252,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,253, 85, - 0, 0, 0, 0, 96,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,247, 44, 0, 0, 0, - 0, 91,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,116, 0, - 0, 0, 0, 25,233,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,216, 11, 0, 0, - 0, 0, 90,251,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,252,112, 0, 0, - 0, 0, 4,191,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,174, 4, 0, - 0, 0, 0, 72,235,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,242, 84, 0, 0, 0, - 0, 0,146,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,150, 1, - 0, 0, 0, 0, 27,181,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,194, 39, 0, 0, 0, 0, - 0,120,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,151, - 4, 0, 0, 0, 0, 0, 77,209,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,216, 92, 1, 0, 0, 0, 0, 0, - 125,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 175, 12, 0, 0, 0, 0, 0, 1, 70,164,241,255,255,255,255,255, - 255,255,255,255,255,242,171, 77, 2, 0, 0, 0, 0, 0, 4,150, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,214, 41, 0, 0, 0, 0, 0, 0, 0, 4, 48, 98,138,163,163, - 163,163,140,103, 55, 5, 0, 0, 0, 0, 0, 0, 0, 30,199,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,245,125, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,105,240,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,222,100, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 83,210,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,228,136, 45, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 37,125,220,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,225,166,112, 74, 43, 32, 12, - 8, 32, 40, 71,105,162,218,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -}; - - /* Add a rotation around the wx-plane to the matrix m. */ static void rotatewx(float m[4][4], float phi) {