diff --git a/extra/jamshred/game/game.factor b/extra/jamshred/game/game.factor index 1d5a9e461e..938605ce9f 100644 --- a/extra/jamshred/game/game.factor +++ b/extra/jamshred/game/game.factor @@ -29,10 +29,12 @@ TUPLE: jamshred sounds tunnel players running quit ; : mouse-moved ( x-radians y-radians jamshred -- ) jamshred-player -rot turn-player ; -: mouse-units-per-full-roll ( -- n ) 50 ; +: units-per-full-roll ( -- n ) 50 ; -: mouse-scroll-x ( jamshred x -- ) - [ jamshred-player ] dip 2 pi * * mouse-units-per-full-roll / roll-player ; +: jamshred-roll ( jamshred n -- ) + [ jamshred-player ] dip 2 pi * * units-per-full-roll / roll-player ; + +: mouse-scroll-x ( jamshred x -- ) jamshred-roll ; : mouse-scroll-y ( jamshred y -- ) neg swap jamshred-player change-player-speed ; diff --git a/extra/jamshred/jamshred.factor b/extra/jamshred/jamshred.factor index 13b5bea1c1..dd83efe824 100755 --- a/extra/jamshred/jamshred.factor +++ b/extra/jamshred/jamshred.factor @@ -79,6 +79,10 @@ jamshred-gadget H{ { T{ key-down f f "r" } [ jamshred-restart ] } { T{ key-down f f " " } [ jamshred>> toggle-running ] } { T{ key-down f f "f" } [ find-world toggle-fullscreen ] } + { T{ key-down f f "UP" } [ jamshred>> jamshred-player 1 swap change-player-speed ] } + { T{ key-down f f "DOWN" } [ jamshred>> jamshred-player -1 swap change-player-speed ] } + { T{ key-down f f "LEFT" } [ jamshred>> 1 jamshred-roll ] } + { T{ key-down f f "RIGHT" } [ jamshred>> -1 jamshred-roll ] } { T{ key-down f f "q" } [ quit ] } { T{ motion } [ handle-mouse-motion ] } { T{ mouse-scroll } [ handle-mouse-scroll ] }