ui.gadgets.cartesian: cleanup

diff --git a/extra/ui/gadgets/cartesian/cartesian.factor b/extra/ui/gadgets/cartesian/cartesian.factor
index 730b0f5b4417266e6ced4de34a18089a583b6dd7..f14c96fd3223005de15591ff71af4cc7bd6699c2 100644 (file)
--- a/extra/ui/gadgets/cartesian/cartesian.factor
+++ b/extra/ui/gadgets/cartesian/cartesian.factor
@@ -1,42 +1,31 @@
 
-USING: kernel combinators sequences opengl.gl
-       ui.render ui.gadgets ui.gadgets.slate
-       accessors ;
+USING: accessors combinators kernel opengl.gl sequences
+ui.gadgets.slate ;
 
 IN: ui.gadgets.cartesian
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 TUPLE: cartesian < slate x-min x-max y-min y-max z-min z-max perspective ;
 
 : init-cartesian ( cartesian -- cartesian )
-  init-slate
-  -10 >>x-min
-   10 >>x-max
-  -10 >>y-min
-   10 >>y-max
-   -1 >>z-min
-    1 >>z-max ;
-
-: <cartesian> ( -- cartesian ) cartesian new init-cartesian ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-M: cartesian establish-coordinate-system ( cartesian -- cartesian )
-   dup
-   {
-     [ x-min>> ] [ x-max>> ]
-     [ y-min>> ] [ y-max>> ]
-     [ z-min>> ] [ z-max>> ]
-   }
-   cleave
-   glOrtho ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    init-slate
+    -10 >>x-min
+     10 >>x-max
+    -10 >>y-min
+     10 >>y-max
+     -1 >>z-min
+      1 >>z-max ;
+
+: <cartesian> ( -- cartesian )
+    cartesian new init-cartesian ;
+
+M: cartesian establish-coordinate-system
+    dup {
+        [ x-min>> ] [ x-max>> ]
+        [ y-min>> ] [ y-max>> ]
+        [ z-min>> ] [ z-max>> ]
+    } cleave glOrtho ;
 
 : x-range ( cartesian range -- cartesian ) first2 [ >>x-min ] [ >>x-max ] bi* ;
 : y-range ( cartesian range -- cartesian ) first2 [ >>y-min ] [ >>y-max ] bi* ;
 : z-range ( cartesian range -- cartesian ) first2 [ >>z-min ] [ >>z-max ] bi* ;
 
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-

diff --git a/extra/ui/gadgets/slate/slate.factor b/extra/ui/gadgets/slate/slate.factor
index 6dbb1357439a9c9688f0ae7f149997eeba277454..21dfcdfe440307c8b753d4b9757c83913a5763a1 100644 (file)
--- a/extra/ui/gadgets/slate/slate.factor
+++ b/extra/ui/gadgets/slate/slate.factor
@@ -9,10 +9,10 @@ IN: ui.gadgets.slate
 TUPLE: slate < gadget action pdim graft ungraft ;
 
 : init-slate ( slate -- slate )
-  [ ]         >>action
-  { 200 200 } >>pdim
-  [ ]         >>graft
-  [ ]         >>ungraft ;
+    [ ]         >>action
+    { 200 200 } >>pdim
+    [ ]         >>graft
+    [ ]         >>ungraft ;
 
 : <slate> ( action -- slate )
     slate new