Verified Commit 8ad45e9d authored by Bernd Paysan's avatar Bernd Paysan
Browse files

A number of MINOS2 fixes

parent 7bab2f40
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ Variable lsids


: $l, ( addr u -- )  dup , here swap dup allot move align ;
: $l, ( addr u -- )  dup , here swap dup allot move align ;
: new-lsid ( addr u -- lsid )
: new-lsid ( addr u -- lsid )
    here dup >r lsids append-list 0 , lsid# dup , 1+ to lsid# $l, r> ;
    align here dup >r lsids append-list 0 , lsid# dup , 1+ to lsid# $l, r> ;
: [new-lsid] ( addr u -- addr )
: [new-lsid] ( addr u -- addr )
    2>r next-section 2r> align new-lsid >r
    2>r next-section 2r> align new-lsid >r
    previous-section r> ;
    previous-section r> ;
+2 −2
Original line number Original line Diff line number Diff line
@@ -82,7 +82,7 @@ is anim-ins
\ helper for animation
\ helper for animation


: sin-t ( r0..1 -- r0..1 ) \ sinusoidal movement
: sin-t ( r0..1 -- r0..1 ) \ sinusoidal movement
    pi f* fcos f2/ 0.5e fswap f- ;
    pi f* fcos f2/ 1/2 fswap f- ;
: sin-at ( r0..r1 -- r0..1 ) \ accellerating
: sin-at ( r0..r1 -- r0..1 ) \ accellerating
    pi f2/ f* fcos 1e fswap f- ;
    pi f2/ f* fcos 1e fswap f- ;
: sin-dt ( r0..r1 -- r0..1 ) \ decellerating
: sin-dt ( r0..r1 -- r0..1 ) \ decellerating
@@ -91,4 +91,4 @@ is anim-ins
\ often used animation
\ often used animation


: fade ( r -- )
: fade ( r -- )
    0.999e fmin text-color 0.5e f- floor f+ 0.5e f+ to text-color ;
    0.999e fmin text-color 1/2 f- floor f+ 1/2 f+ to text-color ;
+3 −3
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@
    bounds ?DO
    bounds ?DO
	fdup I f@ i>off >v
	fdup I f@ i>off >v
	ysc f*  y0 f+ >xy  xsc f+
	ysc f*  y0 f+ >xy  xsc f+
	color i>c n> 0.5e fdup f# #>st v+> i-off @ i,
	color i>c n> 1/2 fdup f# #>st v+> i-off @ i,
	1 flush-lines? IF  0  ELSE  [ 1 floats ]L  THEN
	1 flush-lines? IF  0  ELSE  [ 1 floats ]L  THEN
    +LOOP  fdrop line-strip> ;
    +LOOP  fdrop line-strip> ;


@@ -67,7 +67,7 @@
	dup f@ xsc f* x0 f+ float+
	dup f@ xsc f* x0 f+ float+
	I   f@ ysc f* y0 f+
	I   f@ ysc f* y0 f+
	i>off >v >xy
	i>off >v >xy
	color i>c n> 0.5e fdup f# #>st v+>  i-off @ i,
	color i>c n> 1/2 fdup f# #>st v+>  i-off @ i,
	1 flush-lines? IF  0  ELSE  [ 1 floats ]L  THEN
	1 flush-lines? IF  0  ELSE  [ 1 floats ]L  THEN
    +LOOP  drop line-strip> ;
    +LOOP  drop line-strip> ;


@@ -81,7 +81,7 @@
	dup f@ xsc f*    f+ fswap float+
	dup f@ xsc f*    f+ fswap float+
	I   f@ ysc f* y0 f+
	I   f@ ysc f* y0 f+
	i>off >v >xy
	i>off >v >xy
	color i>c n> 0.5e fdup f# #>st v+>  i-off @ i,
	color i>c n> 1/2 fdup f# #>st v+>  i-off @ i,
	1 flush-lines? IF  0  ELSE  [ 1 floats ]L  THEN
	1 flush-lines? IF  0  ELSE  [ 1 floats ]L  THEN
    +LOOP  fdrop drop line-strip> ;
    +LOOP  fdrop drop line-strip> ;


+2 −2
Original line number Original line Diff line number Diff line
@@ -192,10 +192,10 @@ end-class slide-actor
	k-f4      of  saturate% sf@ 0.1e f- 0e fmax saturate% sf!
	k-f4      of  saturate% sf@ 0.1e f- 0e fmax saturate% sf!
	    Saturate 1 saturate% opengl:glUniform1fv  +sync endof
	    Saturate 1 saturate% opengl:glUniform1fv  +sync endof
	k-f5 of  color-theme 0<> IF  anim-end 0.25e o
	k-f5 of  color-theme 0<> IF  anim-end 0.25e o
		[: 1e fswap f- fdup f>s to color-theme 0.5e f+ ColorMode! +sync +vpsync ;]
		[: 1e fswap f- fdup f>s to color-theme 1/2 f+ ColorMode! +sync +vpsync ;]
		>animate  THEN   endof
		>animate  THEN   endof
	k-f6 of  color-theme 0=  IF  anim-end 0.25e o
	k-f6 of  color-theme 0=  IF  anim-end 0.25e o
		[:             fdup f>s to color-theme 0.5e f+ ColorMode! +sync +vpsync ;]
		[:             fdup f>s to color-theme 1/2 f+ ColorMode! +sync +vpsync ;]
		>animate  THEN   endof
		>animate  THEN   endof
	k-f1      of  top-widget ..widget  endof
	k-f1      of  top-widget ..widget  endof
	[ box-actor :: ekeyed ]  EXIT
	[ box-actor :: ekeyed ]  EXIT
+1 −1
Original line number Original line Diff line number Diff line
@@ -230,7 +230,7 @@ is reload-textures
    [:  [: o font-size# 15% f* fround >lowered ;] caller-w .parent-w .do-childs
    [:  [: o font-size# 15% f* fround >lowered ;] caller-w .parent-w .do-childs
	caller-w 0e >lowered
	caller-w 0e >lowered
	[: o /vflip drop ;] data @ .parent-w .do-childs
	[: o /vflip drop ;] data @ .parent-w .do-childs
	data @ /flop drop +resize +sync
	data @ /flop drop +lang +resize +sync
    ;] swap click[] ;
    ;] swap click[] ;


glue new Constant glue*wh
glue new Constant glue*wh
Loading