Merge branch 'master' of git://factorcode.org/git/factor
commit
a3601f8ecc
|
@ -18,18 +18,16 @@ SYMBOL: grid-dim
|
||||||
grid-dim get spin set-axis ;
|
grid-dim get spin set-axis ;
|
||||||
|
|
||||||
: draw-grid-lines ( gaps orientation -- )
|
: draw-grid-lines ( gaps orientation -- )
|
||||||
grid get rot grid-positions grid get rect-dim suffix [
|
[ grid get swap grid-positions grid get rect-dim suffix ] dip
|
||||||
grid-line-from/to gl-line
|
[ [ v- ] curry map ] keep
|
||||||
] with each ;
|
[ swap grid-line-from/to gl-line ] curry each ;
|
||||||
|
|
||||||
M: grid-lines draw-boundary
|
M: grid-lines draw-boundary
|
||||||
color>> gl-color [
|
color>> gl-color [
|
||||||
dup grid set
|
dup grid set
|
||||||
dup rect-dim half-gap v- grid-dim set
|
dup rect-dim half-gap v- grid-dim set
|
||||||
compute-grid
|
compute-grid
|
||||||
[ { -0.5 -0.5 } gl-translate { 1 0 } draw-grid-lines ]
|
[ { 1 0 } draw-grid-lines ]
|
||||||
[
|
[ { 0 1 } draw-grid-lines ]
|
||||||
{ 0.5 -0.5 } gl-translate
|
bi*
|
||||||
{ 0 1 } draw-grid-lines
|
|
||||||
] bi*
|
|
||||||
] with-scope ;
|
] with-scope ;
|
||||||
|
|
|
@ -22,8 +22,12 @@ TUPLE: ui-render-test < pack { first-time? initial: t } ;
|
||||||
: message-window ( text -- )
|
: message-window ( text -- )
|
||||||
<label> "Message" open-window ;
|
<label> "Message" open-window ;
|
||||||
|
|
||||||
|
: twiddle ( bytes -- bytes )
|
||||||
|
#! On Windows, white is { 253 253 253 } ?
|
||||||
|
[ dup 253 = [ 2 + ] when ] map ;
|
||||||
|
|
||||||
: check-rendering ( gadget -- )
|
: check-rendering ( gadget -- )
|
||||||
gl-screenshot
|
gl-screenshot twiddle
|
||||||
"resource:extra/ui/render/test/reference.bmp" load-bitmap array>>
|
"resource:extra/ui/render/test/reference.bmp" load-bitmap array>>
|
||||||
= "perfect" "needs work" ? "Your UI rendering is " prepend
|
= "perfect" "needs work" ? "Your UI rendering is " prepend
|
||||||
message-window ;
|
message-window ;
|
||||||
|
|
Loading…
Reference in New Issue