use l5 map fn instead of custom re-map
This commit is contained in:
parent
f94269caa0
commit
580218dac4
2 changed files with 5 additions and 10 deletions
13
main.fnl
13
main.fnl
|
|
@ -9,20 +9,18 @@
|
||||||
:dark [64 56 48] ; #403830
|
:dark [64 56 48] ; #403830
|
||||||
})
|
})
|
||||||
|
|
||||||
(lambda remap [v in-min in-max out-min out-max]
|
|
||||||
(+ out-min (* (/ (- v in-min) (- in-max in-min)) (- out-max out-min))))
|
|
||||||
|
|
||||||
(local steps (* 24 60))
|
(local steps (* 24 60))
|
||||||
(var step 0)
|
(var step 0)
|
||||||
|
|
||||||
(lambda lpad [num] (if (< num 10) (.. "0" num) num))
|
(lambda lpad [num] (if (< num 10) (.. "0" num) num))
|
||||||
(lambda time [num]
|
(lambda time [num]
|
||||||
(let [hour (floor (remap num 0 steps 0 24))
|
(let [hour (floor (map num 0 steps 0 24))
|
||||||
min (- num (* hour 60))]
|
min (- num (* hour 60))]
|
||||||
(.. (lpad hour) ":" (lpad min))))
|
(.. (lpad hour) ":" (lpad min))))
|
||||||
|
|
||||||
(var pause false)
|
(var pause false)
|
||||||
(var won false)
|
(var won false)
|
||||||
|
|
||||||
(fn key-pressed []
|
(fn key-pressed []
|
||||||
(when (= key "space") (set pause (not pause))))
|
(when (= key "space") (set pause (not pause))))
|
||||||
|
|
||||||
|
|
@ -34,11 +32,8 @@
|
||||||
(let [
|
(let [
|
||||||
half (/ steps 2)
|
half (/ steps 2)
|
||||||
color-step (if (> step half) (- half (- step half)) step)
|
color-step (if (> step half) (- half (- step half)) step)
|
||||||
color-fn #(+ (. colors.dark $1) (* (/ (- (. colors.yellow $1) (. colors.dark $1)) half) color-step))
|
color-fn #(+ (. colors.dark $1) (* (/ (- (. colors.yellow $1) (. colors.dark $1)) half) color-step))]
|
||||||
r (color-fn 1)
|
(background (color-fn 1) (color-fn 2) (color-fn 3)))
|
||||||
g (color-fn 2)
|
|
||||||
b (color-fn 3)]
|
|
||||||
(background r g b))
|
|
||||||
(text (time step) 175 150)
|
(text (time step) 175 150)
|
||||||
(text (time goal-time) 175 250)
|
(text (time goal-time) 175 250)
|
||||||
(when (and pause (= goal-time step)) (set won true))
|
(when (and pause (= goal-time step)) (set won true))
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@
|
||||||
(def built-ins #{"fn" "local" "λ" "lambda" "require" "let" "+" "-" "/" "*" "<" ">" "<=" ">=" "not=" ".."
|
(def built-ins #{"fn" "local" "λ" "lambda" "require" "let" "+" "-" "/" "*" "<" ">" "<=" ">=" "not=" ".."
|
||||||
"var" "if" "when" "and" "or" "not" "do" "set" "each" "for" "while"
|
"var" "if" "when" "and" "or" "not" "do" "set" "each" "for" "while"
|
||||||
"true" "$1" "math.floor" "floor" "false" "nil" "size" "textSize" "background" "text" "random" "key"
|
"true" "$1" "math.floor" "floor" "false" "nil" "size" "textSize" "background" "text" "random" "key"
|
||||||
":setup" ":draw" ":key-pressed" ":L5"})
|
":setup" ":draw" ":key-pressed" ":L5" "map"})
|
||||||
|
|
||||||
(defn collect-bindings [tokens]
|
(defn collect-bindings [tokens]
|
||||||
(reduce (fn [acc token]
|
(reduce (fn [acc token]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue