Merge branch 'master' of git://factorcode.org/git/factor

2008-12-03 08:46:28 -06:00 · 2008-12-03 08:46:28 -06:00 · e92a30e906
parent e5ed7447ed e24cc8bd62
commit e92a30e906
17 changed files with 5 additions and 1 deletions
--- a/unmaintained/boids/authors.txt
+++ b/unmaintained/boids/authors.txt
--- a/unmaintained/boids/boids.factor
+++ b/unmaintained/boids/boids.factor
--- a/unmaintained/boids/summary.txt
+++ b/unmaintained/boids/summary.txt
--- a/unmaintained/bubble-chamber/bubble-chamber-docs.factor
+++ b/unmaintained/bubble-chamber/bubble-chamber-docs.factor
--- a/unmaintained/bubble-chamber/bubble-chamber.factor
+++ b/unmaintained/bubble-chamber/bubble-chamber.factor
--- a/unmaintained/bubble-chamber/common/common.factor
+++ b/unmaintained/bubble-chamber/common/common.factor
--- a/unmaintained/bubble-chamber/particle/axion/axion.factor
+++ b/unmaintained/bubble-chamber/particle/axion/axion.factor
--- a/unmaintained/bubble-chamber/particle/hadron/hadron.factor
+++ b/unmaintained/bubble-chamber/particle/hadron/hadron.factor
--- a/unmaintained/bubble-chamber/particle/muon/colors/colors.factor
+++ b/unmaintained/bubble-chamber/particle/muon/colors/colors.factor
--- a/unmaintained/bubble-chamber/particle/muon/muon.factor
+++ b/unmaintained/bubble-chamber/particle/muon/muon.factor
--- a/unmaintained/bubble-chamber/particle/particle.factor
+++ b/unmaintained/bubble-chamber/particle/particle.factor
--- a/unmaintained/bubble-chamber/particle/quark/quark.factor
+++ b/unmaintained/bubble-chamber/particle/quark/quark.factor
--- a/unmaintained/bubble-chamber/tags.txt
+++ b/unmaintained/bubble-chamber/tags.txt
--- a/unmaintained/processing/gadget/gadget.factor
+++ b/unmaintained/processing/gadget/gadget.factor
--- a/unmaintained/processing/gallery/trails/trails.factor
+++ b/unmaintained/processing/gallery/trails/trails.factor
--- a/unmaintained/processing/processing.factor
+++ b/unmaintained/processing/processing.factor
--- a/unmaintained/processing/shapes/shapes.factor
+++ b/unmaintained/processing/shapes/shapes.factor
@ -2,13 +2,17 @@
 USING: kernel namespaces arrays sequences grouping
       alien.c-types
       math math.vectors math.geometry.rect
-       opengl.gl opengl.glu opengl.demo-support opengl generalizations vars
+       opengl.gl opengl.glu opengl generalizations vars
       combinators.cleave colors ;

 IN: processing.shapes

 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

+: do-state ( mode quot -- ) swap glBegin call glEnd ; inline
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 VAR: fill-color
 VAR: stroke-color