new accessors
parent
a58dc274db
commit
ccd5b8ced4
|
@ -1,5 +1,5 @@
|
|||
USING: arrays kernel math opengl opengl.gl opengl.glu ui
|
||||
ui.gadgets ui.render threads ;
|
||||
ui.gadgets ui.render threads accessors ;
|
||||
IN: nehe.4
|
||||
|
||||
TUPLE: nehe4-gadget < gadget rtri rquad thread quit? ;
|
||||
|
@ -10,8 +10,8 @@ TUPLE: nehe4-gadget < gadget rtri rquad thread quit? ;
|
|||
|
||||
: <nehe4-gadget> ( -- gadget )
|
||||
nehe4-gadget new-gadget
|
||||
0.0 over set-nehe4-gadget-rtri
|
||||
0.0 over set-nehe4-gadget-rquad ;
|
||||
0.0 >>rtri
|
||||
0.0 >>rquad ;
|
||||
|
||||
M: nehe4-gadget pref-dim* ( gadget -- dim )
|
||||
drop width height 2array ;
|
||||
|
@ -53,22 +53,22 @@ M: nehe4-gadget draw-gadget* ( gadget -- )
|
|||
1.0 -1.0 0.0 glVertex3f
|
||||
-1.0 -1.0 0.0 glVertex3f
|
||||
] do-state
|
||||
dup nehe4-gadget-rtri 0.2 + over set-nehe4-gadget-rtri
|
||||
dup nehe4-gadget-rquad 0.15 - swap set-nehe4-gadget-rquad ;
|
||||
[ 0.2 + ] change-rtri
|
||||
[ 0.15 - ] change-rquad drop ;
|
||||
|
||||
: nehe4-update-thread ( gadget -- )
|
||||
dup nehe4-gadget-quit? [ drop ] [
|
||||
dup quit?>> [ drop ] [
|
||||
redraw-interval sleep
|
||||
dup relayout-1
|
||||
nehe4-update-thread
|
||||
] if ;
|
||||
|
||||
M: nehe4-gadget graft* ( gadget -- )
|
||||
[ f swap set-nehe4-gadget-quit? ] keep
|
||||
f >>quit?
|
||||
[ nehe4-update-thread ] in-thread drop ;
|
||||
|
||||
M: nehe4-gadget ungraft* ( gadget -- )
|
||||
t swap set-nehe4-gadget-quit? ;
|
||||
t >>quit? drop ;
|
||||
|
||||
: run4 ( -- )
|
||||
<nehe4-gadget> "NeHe Tutorial 4" open-window ;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
USING: arrays kernel math opengl opengl.gl opengl.glu ui
|
||||
ui.gadgets ui.render threads ;
|
||||
ui.gadgets ui.render threads accessors ;
|
||||
IN: nehe.5
|
||||
|
||||
TUPLE: nehe5-gadget < gadget rtri rquad thread quit? ;
|
||||
|
@ -9,8 +9,8 @@ TUPLE: nehe5-gadget < gadget rtri rquad thread quit? ;
|
|||
|
||||
: <nehe5-gadget> ( -- gadget )
|
||||
nehe5-gadget new-gadget
|
||||
0.0 over set-nehe5-gadget-rtri
|
||||
0.0 over set-nehe5-gadget-rquad ;
|
||||
0.0 >>rtri
|
||||
0.0 >>rquad ;
|
||||
|
||||
M: nehe5-gadget pref-dim* ( gadget -- dim )
|
||||
drop width height 2array ;
|
||||
|
@ -103,11 +103,11 @@ M: nehe5-gadget draw-gadget* ( gadget -- )
|
|||
1.0 -1.0 1.0 glVertex3f
|
||||
1.0 -1.0 -1.0 glVertex3f
|
||||
] do-state
|
||||
dup nehe5-gadget-rtri 0.2 + over set-nehe5-gadget-rtri
|
||||
dup nehe5-gadget-rquad 0.15 - swap set-nehe5-gadget-rquad ;
|
||||
[ 0.2 + ] change-rtri
|
||||
[ 0.15 - ] change-rquad drop ;
|
||||
|
||||
: nehe5-update-thread ( gadget -- )
|
||||
dup nehe5-gadget-quit? [
|
||||
dup quit?>> [
|
||||
drop
|
||||
] [
|
||||
redraw-interval sleep
|
||||
|
@ -116,11 +116,11 @@ M: nehe5-gadget draw-gadget* ( gadget -- )
|
|||
] if ;
|
||||
|
||||
M: nehe5-gadget graft* ( gadget -- )
|
||||
[ f swap set-nehe5-gadget-quit? ] keep
|
||||
f >>quit?
|
||||
[ nehe5-update-thread ] in-thread drop ;
|
||||
|
||||
M: nehe5-gadget ungraft* ( gadget -- )
|
||||
t swap set-nehe5-gadget-quit? ;
|
||||
t >>quit? drop ;
|
||||
|
||||
|
||||
: run5 ( -- )
|
||||
|
|
Loading…
Reference in New Issue