X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fants.h;h=d0bef7e18e14535101f01e5602e953b333a97cd1;hb=7edd66e6bd3209013ee059819747b10b5835635b;hp=bc79e14744eb6b156481ed0da0a3b5f05c15124f;hpb=9c9d475ff889ed8be02e8ce8c17da28b93278fca;p=xscreensaver diff --git a/hacks/glx/ants.h b/hacks/glx/ants.h index bc79e147..d0bef7e1 100644 --- a/hacks/glx/ants.h +++ b/hacks/glx/ants.h @@ -15,22 +15,22 @@ * Copyright 2003 Blair Tennessy */ -/* static GLfloat MaterialRed[] = {0.6, 0.0, 0.0, 1.0}; */ -/*static GLfloat MaterialPurple[] = {0.6, 0.2, 0.5, 1.0};*/ -/*static GLfloat MaterialOrange[] = {1.0, 0.69, 0.00, 1.0};*/ -/*static GLfloat MaterialGreen[] = {0.1, 0.5, 0.2, 0.2};*/ -/*static GLfloat MaterialBlue[] = {0.4, 0.4, 0.8, 1.0};*/ -/*static GLfloat MaterialCyan[] = {0.2, 0.5, 0.7, 1.0};*/ -/*static GLfloat MaterialYellow[] = {0.7, 0.7, 0.0, 1.0};*/ -/* static GLfloat MaterialMagenta[] = {0.6, 0.2, 0.5, 1.0}; */ -/*static GLfloat MaterialWhite[] = {0.7, 0.7, 0.7, 1.0};*/ -static GLfloat MaterialGray[] = {0.2, 0.2, 0.2, 1.0}; -static GLfloat MaterialGrayB[] = {0.1, 0.1, 0.1, 0.5}; -/*static GLfloat MaterialGray35[] = {0.30, 0.30, 0.30, 1.0};*/ +/* static const GLfloat MaterialRed[] = {0.6, 0.0, 0.0, 1.0}; */ +/*static const GLfloat MaterialPurple[] = {0.6, 0.2, 0.5, 1.0};*/ +/*static const GLfloat MaterialOrange[] = {1.0, 0.69, 0.00, 1.0};*/ +/*static const GLfloat MaterialGreen[] = {0.1, 0.5, 0.2, 0.2};*/ +/*static const GLfloat MaterialBlue[] = {0.4, 0.4, 0.8, 1.0};*/ +/*static const GLfloat MaterialCyan[] = {0.2, 0.5, 0.7, 1.0};*/ +/*static const GLfloat MaterialYellow[] = {0.7, 0.7, 0.0, 1.0};*/ +/* static const GLfloat MaterialMagenta[] = {0.6, 0.2, 0.5, 1.0}; */ +/*static const GLfloat MaterialWhite[] = {0.7, 0.7, 0.7, 1.0};*/ +static const GLfloat MaterialGray[] = {0.2, 0.2, 0.2, 1.0}; +static const GLfloat MaterialGrayB[] = {0.1, 0.1, 0.1, 0.5}; +/*static const GLfloat MaterialGray35[] = {0.30, 0.30, 0.30, 1.0};*/ -static GLfloat MaterialGray5[] = {0.5, 0.5, 0.5, 1.0}; -static GLfloat MaterialGray6[] = {0.6, 0.6, 0.6, 1.0}; -/* static GLfloat MaterialGray8[] = {0.8, 0.8, 0.8, 1.0};*/ +static const GLfloat MaterialGray5[] = {0.5, 0.5, 0.5, 1.0}; +static const GLfloat MaterialGray6[] = {0.6, 0.6, 0.6, 1.0}; +/* static const GLfloat MaterialGray8[] = {0.8, 0.8, 0.8, 1.0};*/ typedef struct { @@ -40,6 +40,6 @@ typedef struct { double direction; double step; - GLfloat *material; + const GLfloat *material; } Ant;