From b668936d9fa63bbf12deb37a0b1e17999c60a979 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Fri, 11 Jul 2008 21:06:31 -0500
Subject: [PATCH] more rect updates

---
 extra/color-picker/color-picker.factor            | 2 +-
 extra/jamshred/jamshred.factor                    | 5 ++++-
 extra/maze/maze.factor                            | 2 +-
 extra/processing/processing.factor                | 2 +-
 extra/springies/springies.factor                  | 2 ++
 extra/tetris/tetris.factor                        | 3 ++-
 extra/ui/gadgets/frame-buffer/frame-buffer.factor | 2 +-
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/extra/color-picker/color-picker.factor b/extra/color-picker/color-picker.factor
index 99968ca3c3..6fcf3c21cd 100755
--- a/extra/color-picker/color-picker.factor
+++ b/extra/color-picker/color-picker.factor
@@ -3,7 +3,7 @@
 USING: kernel math math.functions math.parser models
 models.filter models.range models.compose sequences ui
 ui.gadgets ui.gadgets.frames ui.gadgets.labels ui.gadgets.packs
-ui.gadgets.sliders ui.render ;
+ui.gadgets.sliders ui.render math.geometry.rect ;
 IN: color-picker
 
 ! Simple example demonstrating the use of models.
diff --git a/extra/jamshred/jamshred.factor b/extra/jamshred/jamshred.factor
index b7764894d1..d9a0f84b53 100755
--- a/extra/jamshred/jamshred.factor
+++ b/extra/jamshred/jamshred.factor
@@ -1,6 +1,9 @@
 ! Copyright (C) 2007, 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alarms arrays calendar jamshred.game jamshred.gl jamshred.player jamshred.log kernel math math.constants namespaces sequences threads ui ui.backend ui.gadgets ui.gadgets.worlds ui.gestures ui.render math.vectors ;
+USING: accessors alarms arrays calendar jamshred.game jamshred.gl
+jamshred.player jamshred.log kernel math math.constants namespaces
+sequences threads ui ui.backend ui.gadgets ui.gadgets.worlds
+ui.gestures ui.render math.vectors math.geometry.rect ;
 IN: jamshred
 
 TUPLE: jamshred-gadget jamshred last-hand-loc alarm ;
diff --git a/extra/maze/maze.factor b/extra/maze/maze.factor
index dbf983be62..389dabc0f6 100644
--- a/extra/maze/maze.factor
+++ b/extra/maze/maze.factor
@@ -1,7 +1,7 @@
 ! From http://www.ffconsultancy.com/ocaml/maze/index.html
 USING: sequences namespaces math math.vectors opengl opengl.gl
 arrays kernel random ui ui.gadgets ui.gadgets.canvas ui.render
-math.order ;
+math.order math.geometry.rect ;
 IN: maze
 
 : line-width 8 ;
diff --git a/extra/processing/processing.factor b/extra/processing/processing.factor
index fb9f321f47..4c9dd787e5 100755
--- a/extra/processing/processing.factor
+++ b/extra/processing/processing.factor
@@ -10,7 +10,7 @@ USING: kernel namespaces threads combinators sequences arrays
        combinators.cleave
        rewrite-closures fry accessors newfx
        processing.color
-       processing.gadget ;
+       processing.gadget math.geometry.rect ;
        
 IN: processing
 
diff --git a/extra/springies/springies.factor b/extra/springies/springies.factor
index 2640423eb4..fb69783975 100755
--- a/extra/springies/springies.factor
+++ b/extra/springies/springies.factor
@@ -38,6 +38,8 @@ C: <node> node
 
 ! : >>vel ( node vel -- node ) over set-node-vel ;
 
+: node-vel ( node -- vel ) vel>> ;
+
 : set-node-vel ( vel node -- ) swap >>vel drop ;
 
 : pos-x ( node -- x ) pos>> first ;
diff --git a/extra/tetris/tetris.factor b/extra/tetris/tetris.factor
index c2f874598c..d01cec3790 100644
--- a/extra/tetris/tetris.factor
+++ b/extra/tetris/tetris.factor
@@ -2,7 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alarms arrays calendar kernel ui.gadgets ui.gadgets.labels
 ui.gadgets.worlds ui.gadgets.status-bar ui.gestures ui.render ui
-tetris.game tetris.gl sequences system math math.parser namespaces ;
+tetris.game tetris.gl sequences system math math.parser namespaces
+math.geometry.rect ;
 IN: tetris
 
 TUPLE: tetris-gadget tetris alarm ;
diff --git a/extra/ui/gadgets/frame-buffer/frame-buffer.factor b/extra/ui/gadgets/frame-buffer/frame-buffer.factor
index a288f74f64..7d77db24cc 100644
--- a/extra/ui/gadgets/frame-buffer/frame-buffer.factor
+++ b/extra/ui/gadgets/frame-buffer/frame-buffer.factor
@@ -1,7 +1,7 @@
 
 USING: kernel alien.c-types combinators sequences splitting grouping
        opengl.gl ui.gadgets ui.render
-       math math.vectors accessors ;
+       math math.vectors accessors math.geometry.rect ;
 
 IN: ui.gadgets.frame-buffer