Skip to content

Commit

Permalink
v0.47
Browse files Browse the repository at this point in the history
  • Loading branch information
@katahiromz
katahiromz committed Nov 8, 2013
1 parent acb4957 commit 8dbe93c
Show file tree
Hide file tree
Showing 13 changed files with 287 additions and 96 deletions.
1 change: 1 addition & 0 deletions non-wgl/ant.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ static const char sccsid[] = "@(#)ant.c 5.00 2000/11/01 xlockmore";
#define COUNT -3
#define CYCLES 40000
#define SIZE_ -12
#define NCOLORS 64
# define DEFAULTS "*delay: 20000 \n" \
"*count: -3 \n" \
"*cycles: 40000 \n" \
Expand Down
16 changes: 16 additions & 0 deletions non-wgl/ant.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,18 @@
RelativePath=".\ant.c"
>
</File>
<File
RelativePath="..\colors.c"
>
</File>
<File
RelativePath=".\erase.c"
>
</File>
<File
RelativePath="..\hsv.c"
>
</File>
<File
RelativePath=".\non-wgl.c"
>
Expand Down Expand Up @@ -216,10 +224,18 @@
RelativePath=".\automata.h"
>
</File>
<File
RelativePath="..\colors.h"
>
</File>
<File
RelativePath=".\erase.h"
>
</File>
<File
RelativePath="..\hsv.h"
>
</File>
<File
RelativePath="..\resource.h"
>
Expand Down
1 change: 1 addition & 0 deletions non-wgl/apollonian.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ static const char sccsid[] = "@(#)apollonian.c 5.02 2001/07/01 xlockmore";
#define DELAY 1000000
#define COUNT 64
#define CYCLES 20
#define NCOLORS 64
# define DEFAULTS "*delay: 1000000 \n" \
"*count: 64 \n" \
"*cycles: 20 \n" \
Expand Down
16 changes: 16 additions & 0 deletions non-wgl/apollonian.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,18 @@
RelativePath=".\apollonian.c"
>
</File>
<File
RelativePath="..\colors.c"
>
</File>
<File
RelativePath=".\erase.c"
>
</File>
<File
RelativePath="..\hsv.c"
>
</File>
<File
RelativePath=".\non-wgl.c"
>
Expand All @@ -208,10 +216,18 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\colors.h"
>
</File>
<File
RelativePath=".\erase.h"
>
</File>
<File
RelativePath="..\hsv.h"
>
</File>
<File
RelativePath="..\resource.h"
>
Expand Down
2 changes: 2 additions & 0 deletions non-wgl/bouboule.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,11 @@ static const char sccsid[] = "@(#)bouboule.c 4.00 97/01/01 xlockmore";
* star after a close one.
*/

#define NOARGS
#define DELAY 20000
#define COUNT 100
#define SIZE_ 15
#define NCOLORS 64
# define DEFAULTS "*count: 100 \n" \
"*size: 15 \n" \
"*delay: 20000 \n" \
Expand Down
16 changes: 16 additions & 0 deletions non-wgl/bouboule.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,14 @@
RelativePath=".\bouboule.c"
>
</File>
<File
RelativePath="..\colors.c"
>
</File>
<File
RelativePath="..\hsv.c"
>
</File>
<File
RelativePath=".\non-wgl.c"
>
Expand All @@ -204,6 +212,14 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\colors.h"
>
</File>
<File
RelativePath="..\hsv.h"
>
</File>
<File
RelativePath="..\resource.h"
>
Expand Down
1 change: 1 addition & 0 deletions non-wgl/braid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ static const char sccsid[] = "@(#)braid.c 5.00 2000/11/01 xlockmore";
#define COUNT 15
#define CYCLES 100
#define SIZE_ -7
#define NCOLORS 64
# define DEFAULTS "*delay: 1000 \n" \
"*count: 15 \n" \
"*cycles: 100 \n" \
Expand Down
16 changes: 16 additions & 0 deletions non-wgl/braid.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,18 @@
RelativePath=".\braid.c"
>
</File>
<File
RelativePath="..\colors.c"
>
</File>
<File
RelativePath=".\erase.c"
>
</File>
<File
RelativePath="..\hsv.c"
>
</File>
<File
RelativePath=".\non-wgl.c"
>
Expand All @@ -208,10 +216,18 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\colors.h"
>
</File>
<File
RelativePath=".\erase.h"
>
</File>
<File
RelativePath="..\hsv.h"
>
</File>
<File
RelativePath="..\resource.h"
>
Expand Down
19 changes: 7 additions & 12 deletions non-wgl/galaxy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ static const char sccsid[] = "@(#)galaxy.c 4.04 97/07/28 xlockmore";
#define DELAY 20000
#define COUNT -5
#define CYCLES 250
#define NCOLORS 64
# define DEFAULTS "*delay: 20000 \n" \
"*count: -5 \n" \
"*cycles: 250 \n" \
Expand Down Expand Up @@ -124,10 +125,11 @@ ENTRYPOINT ModeSpecOpt galaxy_opts =
#define GALAXYMINSIZE 0.15
#define QCONS 0.001

#define COLORBASE 16

#if 0
#define COLORBASE 16
/* colors per galaxy */
/* #define COLORSTEP (NUMCOLORS/COLORBASE) */
/*#define COLORSTEP (NUMCOLORS/COLORBASE)*/
# define COLORSTEP (MI_NCOLORS(mi)/COLORBASE)
#endif

Expand Down Expand Up @@ -213,15 +215,8 @@ startover(ModeInfo * mi)
Galaxy *gt = &gp->galaxies[i];
double sinw1, sinw2, cosw1, cosw2;

#if 1 // hacked by katahiromz
gt->galcol = 246 + NRAND(10);
{
XColor color;
color.pixel = gt->galcol;
XQueryColor(MI_DISPLAY(mi), DefaultColormap(dpy, DefaultScreenOfDisplay(dpy)), &color);
if (color.green > (color.red + color.blue) * 2 / 3)
gt->galcol++;
}
#if 1 // hacked by katahiromz
gt->galcol = NRAND(NCOLORS);
#else
gt->galcol = NRAND(COLORBASE - 2);
if (gt->galcol > 1)
Expand Down Expand Up @@ -446,7 +441,7 @@ draw_galaxy(ModeInfo * mi)
}
// hacked by katahiromz
//XSetForeground(display, gc, MI_PIXEL(mi, COLORSTEP * gt->galcol));
XSetForeground(display, gc, gt->galcol);
XSetForeground(display, gc, MI_PIXEL(mi, gt->galcol));
XDrawPoints(display, window, gc, gt->newpoints, gt->nstars,
CoordModeOrigin);

Expand Down
16 changes: 16 additions & 0 deletions non-wgl/galaxy.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,18 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\colors.c"
>
</File>
<File
RelativePath=".\galaxy.c"
>
</File>
<File
RelativePath="..\hsv.c"
>
</File>
<File
RelativePath=".\non-wgl.c"
>
Expand All @@ -204,6 +212,14 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\colors.h"
>
</File>
<File
RelativePath="..\hsv.h"
>
</File>
<File
RelativePath="..\resource.h"
>
Expand Down
Loading

0 comments on commit 8dbe93c

Please sign in to comment.