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

offsets fixed

Browse Source
This commit is contained in:
Bryce Covert
2017-05-30 20:44:06 -07:00
parent de78c56d44
commit 6580bbb52b
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
desktop/src-common/advent/screens/rooms.clj
View File

@@ -13,19 +13,24 @@
:mouse-in? (fn [entities x y] :mouse-in? (fn [entities x y]
(let [e (utils/get-entity entities id)] (let [e (utils/get-entity entities id)]
(if-let [[bx1 by1 bx2 by2] (:box e)] (if-let [[bx1 by1 bx2 by2] (:box e)]
(zone/within bx1 by1 bx2 by2 x y) (do (println "checking 1" id)
(zone/within bx1 by1 bx2 by2 x y))
(let [{^float entity-x :x ^float entity-y :y width :width scale-x :scale-x scale-y :scale-y origin-x :origin-x origin-y :origin-y height :height region :object} (-> entities :room :entities id) (let [{^float entity-x :x ^float entity-y :y width :width scale-x :scale-x scale-y :scale-y origin-x :origin-x origin-y :origin-y height :height region :object} (-> entities :room :entities id)
width (or width (if (instance? TextureRegion region ) (.getRegionWidth ^TextureRegion region) 0)) width (or width (if (instance? TextureRegion region ) (.getRegionWidth ^TextureRegion region) 0))
height (or height (if (instance? TextureRegion region ) (.getRegionHeight ^TextureRegion region) 0)) height (or height (if (instance? TextureRegion region ) (.getRegionHeight ^TextureRegion region) 0))
entity-x (double (unchecked-add (float entity-x) (unchecked-multiply (float (or origin-x 0)) entity-x (double (unchecked-add (float entity-x) (unchecked-multiply (float -1.0)
(float (or scale-x 1))))) (unchecked-multiply (float (or origin-x 0))
entity-y (double (unchecked-add (float entity-y) (unchecked-multiply (float (or origin-y 0)) (float (or scale-x 1))))))
(float (or scale-y 1)))))] entity-y (double (unchecked-add (float entity-y) (unchecked-multiply
(float -1.0)
(unchecked-multiply (float (or origin-y 0))
(float (or scale-y 1))))))]
(zone/within entity-x entity-y (zone/within entity-x entity-y
(unchecked-add (float entity-x) (unchecked-multiply (float width) (float (or scale-x 1)))) (unchecked-add (float entity-x) (unchecked-multiply (float width) (float (or scale-x 1))))
(unchecked-add (float entity-y) (unchecked-multiply (float height) (float (or scale-y 1)))) x y)))))} (unchecked-add (float entity-y) (unchecked-multiply (float height) (float (or scale-y 1))))
x y)))))}
(when (or script scripts only-script) (when (or script scripts only-script)
{:get-script (fn [cursor [x y]] {:get-script (fn [cursor [x y]]
(cond only-script (cond only-script