processing.shapes: some cleanup.

[factor.git] / extra / processing / shapes / shapes.factor

diff --git a/extra/processing/shapes/shapes.factor b/extra/processing/shapes/shapes.factor
index a3bd5e72d6d20d25d89098e1dcc0602ec11a4cc0..e4e1dd44b824b049062180d453b2a0e5481837a4 100644 (file)
--- a/extra/processing/shapes/shapes.factor
+++ b/extra/processing/shapes/shapes.factor
@@ -3,78 +3,56 @@ kernel locals math math.vectors namespaces opengl opengl.gl
 opengl.glu sequences sequences.generalizations shuffle ;
 IN: processing.shapes
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 : do-state ( mode quot -- ) swap glBegin call glEnd ; inline
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 SYMBOL: fill-color
 SYMBOL: stroke-color
 
 COLOR: black stroke-color set-global
 COLOR: white fill-color set-global
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 : fill-mode ( -- )
-  GL_FRONT_AND_BACK GL_FILL glPolygonMode
-  fill-color get gl-color ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    GL_FRONT_AND_BACK GL_FILL glPolygonMode
+    fill-color get gl-color ;
 
 : stroke-mode ( -- )
-  GL_FRONT_AND_BACK GL_LINE glPolygonMode
-  stroke-color get gl-color ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    GL_FRONT_AND_BACK GL_LINE glPolygonMode
+    stroke-color get gl-color ;
 
 : gl-vertex-2d ( vertex -- ) first2 glVertex2d ;
 
 : gl-vertices-2d ( vertices -- ) [ gl-vertex-2d ] each ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: point* ( x y    -- ) stroke-mode GL_POINTS [ glVertex2d     ] do-state ;
-: point  ( point  -- ) stroke-mode GL_POINTS [ gl-vertex-2d   ] do-state ;
-: points ( points -- ) stroke-mode GL_POINTS [ gl-vertices-2d ] do-state ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: line** ( x y x y -- )
-  stroke-mode GL_LINES [ glVertex2d glVertex2d ] do-state ;
+: draw-point* ( x y    -- ) stroke-mode GL_POINTS [ glVertex2d     ] do-state ;
+: draw-point  ( point  -- ) stroke-mode GL_POINTS [ gl-vertex-2d   ] do-state ;
+: draw-points ( points -- ) stroke-mode GL_POINTS [ gl-vertices-2d ] do-state ;
 
-: line* ( a b -- ) stroke-mode GL_LINES [ [ gl-vertex-2d ] bi@ ] do-state ;
+: draw-line** ( x y x y -- )
+    stroke-mode GL_LINES [ glVertex2d glVertex2d ] do-state ;
 
-: lines ( seq -- ) stroke-mode GL_LINES [ gl-vertices-2d ] do-state ;
+: draw-line* ( a b -- ) stroke-mode GL_LINES [ [ gl-vertex-2d ] bi@ ] do-state ;
 
-: line ( seq -- ) lines ;
+: draw-lines ( seq -- ) stroke-mode GL_LINES [ gl-vertices-2d ] do-state ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+: draw-line ( seq -- ) draw-lines ;
 
 : line-strip ( seq -- ) stroke-mode GL_LINE_STRIP [ gl-vertices-2d ] do-state ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+: draw-triangles ( seq -- )
+    [ fill-mode   GL_TRIANGLES [ gl-vertices-2d ] do-state ]
+    [ stroke-mode GL_TRIANGLES [ gl-vertices-2d ] do-state ] bi ;
 
-: triangles ( seq -- )
-  [ fill-mode   GL_TRIANGLES [ gl-vertices-2d ] do-state ]
-  [ stroke-mode GL_TRIANGLES [ gl-vertices-2d ] do-state ] bi ;
+: draw-triangle ( seq -- ) draw-triangles ;
 
-: triangle ( seq -- ) triangles ;
+: draw-triangle* ( a b c -- ) 3array draw-triangles ;
 
-: triangle* ( a b c -- ) 3array triangles ;
+: draw-triangle** ( x y x y x y -- ) 6 narray 2 group draw-triangles ;
 
-: triangle** ( x y x y x y -- ) 6 narray 2 group triangles ;
+: draw-polygon ( seq -- )
+    [ fill-mode   GL_POLYGON [ gl-vertices-2d ] do-state ]
+    [ stroke-mode GL_POLYGON [ gl-vertices-2d ] do-state ] bi ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: polygon ( seq -- )
-  [ fill-mode   GL_POLYGON [ gl-vertices-2d ] do-state ]
-  [ stroke-mode GL_POLYGON [ gl-vertices-2d ] do-state ] bi ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-:: rectangle ( loc dim -- )
+:: draw-rectangle ( loc dim -- )
     loc first2 :> ( x y )
     dim first2 :> ( dx dy )
 
@@ -83,38 +61,28 @@ COLOR: white fill-color set-global
     x dx + y dy + 2array
     x y dy + 2array
     4array
-    polygon ;
-
-: rectangle* ( x y width height -- ) [ 2array ] 2bi@ rectangle ;
+    draw-polygon ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+: draw-rectangle* ( x y width height -- ) [ 2array ] 2bi@ draw-rectangle ;
 
 : gl-translate-2d ( pos -- ) first2 0 glTranslated ;
 
 : gl-scale-2d ( xy -- ) first2 1 glScaled ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 : gl-ellipse ( center dim -- )
-  glPushMatrix
+    glPushMatrix
     [ gl-translate-2d ] [ gl-scale-2d ] bi*
     gluNewQuadric
-      dup 0 0.5 20 1 gluDisk
+    dup 0 0.5 20 1 gluDisk
     gluDeleteQuadric
-  glPopMatrix ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    glPopMatrix ;
 
 : gl-get-line-width ( -- width )
-  GL_LINE_WIDTH 0 double <ref> tuck glGetDoublev double deref ;
-
-: ellipse ( center dim -- )
-  GL_FRONT_AND_BACK GL_FILL glPolygonMode
-  [ stroke-color get gl-color                                 gl-ellipse ]
-  [ fill-color get gl-color gl-get-line-width 2 * dup 2array v- gl-ellipse ] 2bi ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    GL_LINE_WIDTH 0 double <ref> tuck glGetDoublev double deref ;
 
-: circle ( center size -- ) dup 2array ellipse ;
+: draw-ellipse ( center dim -- )
+    GL_FRONT_AND_BACK GL_FILL glPolygonMode
+    [ stroke-color get gl-color                                 gl-ellipse ]
+    [ fill-color get gl-color gl-get-line-width 2 * dup 2array v- gl-ellipse ] 2bi ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+: draw-circle ( center size -- ) dup 2array draw-ellipse ;