From 9ded594f14344a5a64355522d22174cde3ce7b85 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 31 Jul 2008 16:11:03 -0500
Subject: [PATCH 1/4] springies.ui: Use color objects
---
extra/springies/ui/ui.factor | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/extra/springies/ui/ui.factor b/extra/springies/ui/ui.factor
index f2248ba6f2..75d3087fe5 100644
--- a/extra/springies/ui/ui.factor
+++ b/extra/springies/ui/ui.factor
@@ -23,7 +23,9 @@ IN: springies.ui
GL_MODELVIEW glMatrixMode
glLoadIdentity ;
-: display ( -- ) set-projection black gl-color draw-nodes draw-springs ;
+! : display ( -- ) set-projection black gl-color draw-nodes draw-springs ;
+
+: display ( -- ) set-projection black set-color draw-nodes draw-springs ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
From 1906efc1bd9238061692ed341d85ac214b8d5b5d Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 31 Jul 2008 16:11:21 -0500
Subject: [PATCH 2/4] ui.gadgets.slate: It slices! It dices! Order now and get
a free apron!
---
extra/ui/gadgets/slate/slate.factor | 87 ++++++++++++++++++++++++++++-
1 file changed, 86 insertions(+), 1 deletion(-)
diff --git a/extra/ui/gadgets/slate/slate.factor b/extra/ui/gadgets/slate/slate.factor
index 05b2de2e06..08e8b2765c 100644
--- a/extra/ui/gadgets/slate/slate.factor
+++ b/extra/ui/gadgets/slate/slate.factor
@@ -21,8 +21,93 @@ TUPLE: slate < gadget action pdim graft ungraft ;
M: slate pref-dim* ( slate -- dim ) pdim>> ;
-M: slate draw-gadget* ( slate -- ) origin get swap action>> with-translation ;
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+USING: combinators arrays sequences math math.geometry
+ opengl.gl ui.gadgets.worlds ;
+
+: screen-y* ( gadget -- loc )
+ {
+ [ find-world height ]
+ [ screen-loc second ]
+ [ height ]
+ }
+ cleave
+ + - ;
+
+: screen-loc* ( gadget -- loc )
+ {
+ [ screen-loc first ]
+ [ screen-y* ]
+ }
+ cleave
+ 2array ;
+
+: setup-viewport ( gadget -- gadget )
+ dup
+ {
+ [ screen-loc* ]
+ [ dim>> ]
+ }
+ cleave
+ gl-viewport ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: default-coordinate-system ( gadget -- gadget )
+ dup
+ {
+ [ drop 0 ]
+ [ width 1 - ]
+ [ height 1 - ]
+ [ drop 0 ]
+ }
+ cleave
+ -1 1
+ glOrtho ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
M: slate graft* ( slate -- ) graft>> call ;
M: slate ungraft* ( slate -- ) ungraft>> call ;
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+GENERIC: establish-coordinate-system ( gadget -- gadget )
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+M: slate establish-coordinate-system ( slate -- slate )
+ default-coordinate-system ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+GENERIC: draw-slate ( slate -- slate )
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+M: slate draw-slate ( slate -- slate ) dup action>> call ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+M: slate draw-gadget* ( slate -- )
+
+ GL_PROJECTION glMatrixMode glPushMatrix glLoadIdentity
+
+ establish-coordinate-system
+
+ GL_MODELVIEW glMatrixMode glLoadIdentity glPushMatrix
+
+ setup-viewport
+
+ draw-slate
+
+ GL_PROJECTION glMatrixMode glPopMatrix
+ GL_MODELVIEW glMatrixMode glPopMatrix
+
+ dup
+ find-world
+ default-coordinate-system
+ setup-viewport
+ drop
+ drop ;
\ No newline at end of file
From 22f2a0d856b5e680d74f20dad2d7646d4037bfad Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 31 Jul 2008 16:12:58 -0500
Subject: [PATCH 3/4] ui.gadgets.cartesian: Use the new slate
---
extra/ui/gadgets/cartesian/cartesian.factor | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/extra/ui/gadgets/cartesian/cartesian.factor b/extra/ui/gadgets/cartesian/cartesian.factor
index 027c1061a8..730b0f5b44 100644
--- a/extra/ui/gadgets/cartesian/cartesian.factor
+++ b/extra/ui/gadgets/cartesian/cartesian.factor
@@ -22,20 +22,15 @@ TUPLE: cartesian < slate x-min x-max y-min y-max z-min z-max perspective ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-M: cartesian draw-gadget* ( cartesian -- )
- GL_PROJECTION glMatrixMode
- glLoadIdentity
+M: cartesian establish-coordinate-system ( cartesian -- cartesian )
dup
- {
- [ x-min>> ] [ x-max>> ]
- [ y-min>> ] [ y-max>> ]
- [ z-min>> ] [ z-max>> ]
- }
- cleave
- glOrtho
- GL_MODELVIEW glMatrixMode
- glLoadIdentity
- call-next-method ;
+ {
+ [ x-min>> ] [ x-max>> ]
+ [ y-min>> ] [ y-max>> ]
+ [ z-min>> ] [ z-max>> ]
+ }
+ cleave
+ glOrtho ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
From 52085a4e49f983ec04e6efca4eea8c737c241d81 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Thu, 31 Jul 2008 16:13:27 -0500
Subject: [PATCH 4/4] ui.gadgets.plot: Use the new slate
---
extra/ui/gadgets/plot/plot.factor | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/extra/ui/gadgets/plot/plot.factor b/extra/ui/gadgets/plot/plot.factor
index 7eb79dd6fe..0a6f22f080 100644
--- a/extra/ui/gadgets/plot/plot.factor
+++ b/extra/ui/gadgets/plot/plot.factor
@@ -47,12 +47,14 @@ M: function plot-function ( plot function -- plot )
[ [ drop 0 ] [ y-min>> ] bi 2array ]
[ [ drop 0 ] [ y-max>> ] bi 2array ] bi line* ;
-M: plot draw-gadget* ( plot -- )
- dup call-next-method
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+USING: ui.gadgets.slate ;
+
+M: plot draw-slate ( plot -- plot )
2 glLineWidth
draw-axis
plot-functions
- drop
fill-mode
1 glLineWidth ;