[cells-cvs] CVS cells/gui-geometry

[ktilton]

Update of /project/cells/cvsroot/cells/gui-geometry
In directory clnet:/tmp/cvs-serv24993/gui-geometry

Modified Files:
	defpackage.lisp geo-data-structures.lisp 
Log Message:


--- /project/cells/cvsroot/cells/gui-geometry/defpackage.lisp	2006/06/09 17:21:35	1.3
+++ /project/cells/cvsroot/cells/gui-geometry/defpackage.lisp	2006/06/20 14:16:45	1.4
@@ -18,12 +18,12 @@
   (:nicknames #:geo)
   (:use #:common-lisp #:utils-kt #:cells)
   (:export #:geometer #:geo-zero-tl #:geo-inline #:a-stack #:a-row
-    #:px #:py #:ll #:lt #:lr #:lb
+    #:px #:py #:ll #:lt #:lr #:lb #:pl #:pt #:pr #:pb
     #:^px #:^py #:^ll #:^lt #:^lr #:^lb
     #:u96ths #:udots #:uinches #:uin #:upoints #:upts #:u8ths #:u16ths #:u32nds
     #:mkr #:v2-move #:l-height #:mkv2 #:^offset-within #:inset-lr #:v2-v #:v2-h
     #:r-bounds 
-    #:lb 
+    #:lb
     #:cs-target-res 
     #:nr-make 
     #:r-contains 
--- /project/cells/cvsroot/cells/gui-geometry/geo-data-structures.lisp	2006/06/04 13:19:59	1.1
+++ /project/cells/cvsroot/cells/gui-geometry/geo-data-structures.lisp	2006/06/20 14:16:45	1.2
@@ -216,7 +216,11 @@
        (setf min-h 0 min-v 0 max-h 0 max-v 0))
      (nr-make r min-h min-v max-h max-v))))
 
-
+(defun nr-union (r sr) ;; unlike other code, this is assuming opengl's up==plus, and proper rectangles
+  (nr-make r (min (r-left r) (r-left sr))
+    (max (r-top r) (r-top sr))
+    (max (r-right r) (r-right sr))
+    (min (r-bottom r) (r-bottom sr))))
 
 (defun nr-move-to (r h v)
    (setf (r-left r) h