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

Merge branch 'master' of https://bitbucket.org/brycecovertoperations/advent

Browse Source
This commit is contained in:
Remington Covert
2015-02-23 19:18:26 -08:00
parent a4cecf66ee 587db43045
commit 80fe9e6b62
13 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
desktop/src-common/advent/screens/scene.clj
View File

@@ -67,6 +67,7 @@
(defn left-click [screen entities]
(let [[x y] (utils/unproject screen)]
(println "clicked " x y)
(let [interaction (first (filter #((:mouse-in? %) entities x y)
(get-in entities [:room :interactions])))
interacting-entity (first (sort-by (comp - :baseline) (filter #(and (:mouse-in? %)
@@ -577,7 +578,7 @@
:on-mouse-moved
(fn [{:keys [input-x input-y viewport] :as screen} [entities]]
(if (utils/contains? (.getScreenX viewport) (.getScreenY viewport)
(if (utils/contains-point? (.getScreenX viewport) (.getScreenY viewport)
(.getScreenWidth viewport) (.getScreenHeight viewport)
input-x input-y)
@@ -586,7 +587,7 @@
(assoc-in entities [:cursor :override] nil)))
:on-touch-up (fn [{:keys [input-x input-y viewport] :as screen} [entities]]
(when (utils/contains? (.getScreenX viewport) (.getScreenY viewport)
(when (utils/contains-point? (.getScreenX viewport) (.getScreenY viewport)
(.getScreenWidth viewport) (.getScreenHeight viewport)
input-x input-y)
(if (= (button-code :right)