notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better idle

Browse Source
This commit is contained in:
Bryce Covert
2015-03-03 06:59:38 -08:00
parent de27f437b9
commit 76db582221
3 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
desktop/src-common/advent/actions.clj
View File

@@ -86,6 +86,11 @@
~@forms
(change-script-state ~entities false)))))
(defn bound-to-camera [x length zoom]
(min (- length (* length 0.5 zoom ))
(max (* length 0.5 zoom )
x)))
(defn pan-to [screen entities x y scale-fn & [ease duration]]
(let [ease (or ease tween/ease-in-out-quadratic)
duration (or duration 3.0)
@@ -97,12 +102,8 @@
0.07)
current-zoom
target-zoom)
target-x (min (- 320 (* 160.0 target-zoom ))
(max (* 160.0 target-zoom )
x))
target-y (min (- 240 (* 120.0 target-zoom ))
(max (* 120.0 target-zoom )
y))]
target-x (bound-to-camera x 320 target-zoom)
target-y (bound-to-camera y 240 target-zoom)]
(if (or (not= target-x (get-in entities [:cam :x]))
(not= target-y (get-in entities [:cam :y]))
(not= target-zoom (get-in entities [:cam :zoom])))