more mobile tweaks.

This commit is contained in:
Bryce Covert
2017-05-02 19:46:46 -07:00
parent 1216617b01
commit 8695a8e408
3 changed files with 12 additions and 5 deletions

View File

@@ -182,6 +182,10 @@
(do (screen! hud :on-return-item {})
entities)
(and (get-in entities [:cam :pinching])
(not (input! :is-touched)))
(update-in entities [:cam] dissoc :start-zoom :pinching)
(and (get-in entities [:state :active?])
(or (not (get-in entities [:state :hud-active?]))
(get-in entities [:fg-actions :script-running?]))
@@ -1229,8 +1233,7 @@
(fn [screen entities options]
(when (get-in entities [:state :active?])
(-> entities
(remove-cam-tweens)
(update-in [:cam] dissoc :start-zoom :pinching) )))
(remove-cam-tweens))))
:on-pinch
(fn [screen entities {:keys [initial-pointer-1 initial-pointer-2 pointer-1 pointer-2]}]
@@ -1414,6 +1417,9 @@
(assoc-in [:cursor :down-target] (or (:id interacting-entity ) (:id interaction) nil)))))))
:on-touch-up (fn [screen entities options]
(println (input! :is-touched))
(println "touch up")
(log/info "touch up")
(handle-touch-up screen entities options))
:on-tap (fn [screen entities options]