From cc2cb0e0a3ccf427d5a99cbfdd3c4aada93962b2 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Sat, 7 Mar 2015 09:19:03 -0800 Subject: [PATCH] mouse overrides. --- desktop/resources/cursor.png | Bin 25870 -> 10777 bytes desktop/settings.edn | 2 +- desktop/src-common/advent/screens/rooms.clj | 11 ++++++++--- desktop/src-common/advent/screens/title.clj | 1 + desktop/src-common/advent/utils.clj | 15 ++++++++++----- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index b54c620486b7e5889de58e2e34755a6d2e429374..76aec5b73791473e95b7d1fb1c3a915f12c02e3f 100644 GIT binary patch literal 10777 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 SoB#jw6L&{Pz3{e8(EkAWTLhQ@ literal 25870 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 HJmh}>HT&^V diff --git a/desktop/settings.edn b/desktop/settings.edn index 75134168..d6118f6b 100644 --- a/desktop/settings.edn +++ b/desktop/settings.edn @@ -1 +1 @@ -{:sound-volume 45.0, :music-volume 53.0} \ No newline at end of file +{:sound-volume 60.0, :music-volume 57.0} \ No newline at end of file diff --git a/desktop/src-common/advent/screens/rooms.clj b/desktop/src-common/advent/screens/rooms.clj index efd90aa0..4a8ad47f 100644 --- a/desktop/src-common/advent/screens/rooms.clj +++ b/desktop/src-common/advent/screens/rooms.clj @@ -1,12 +1,17 @@ (ns advent.screens.rooms - (:require [advent.zone :as zone])) + (:require [advent.zone :as zone]) + (:import [com.badlogic.gdx.graphics Pixmap Pixmap$Filter Texture Texture$TextureFilter] + [com.badlogic.gdx.graphics.g2d TextureRegion] + [com.badlogic.gdx.utils.viewport FitViewport] + [com.badlogic.gdx.scenes.scene2d Actor Stage] + [java.lang Object])) (defn make-entity [id entity] (merge entity {:mouse-in? (fn [entities x y] (let [{entity-x :x entity-y :y width :width scale-x :scale-x scale-y :scale-y height :height region :object} (get-in entities [:room :entities id]) - width (or width (.getRegionWidth region)) - height (or height (.getRegionHeight region))] + width (or width (if (isa? TextureRegion region) (.getRegionWidth region) 0)) + height (or height (if (isa? TextureRegion region) (.getRegionHeight region) 0))] ((zone/box entity-x entity-y (+ entity-x (* width (or 1 scale-x))) (+ entity-y (* height (or scale-y 1)))) x y)))} (when (or (:scripts entity) (:script entity)) {:get-script (fn [cursor [x y]] diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 7f9c05e7..3d03e50f 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -91,6 +91,7 @@ entities)) :on-ui-changed (fn [screen [entities]] + (println "HER") (swap! utils/settings assoc :music-volume (slider! (:music-volume-slider entities) :get-value) diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 1b369641..acb3d4ac 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -17,7 +17,7 @@ (let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})] (println (:input-x screen) (:input-y screen) "->" x y))) -(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :kiss :sword :hourglass :mandrake :ball-n-chain :key :rope :crowbar :note-1 :ash :sack-lunch :flies :spear :monocle :feather :spell-component :money :watch :broken-clock :slingshot :camera :walkie-talkies :alarm-clock :walkie-talkie :flask-water :flask-water-stuff :flask-water-stuff-2 :note-2 :magic-slingshot]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :kiss :sword :hourglass :mandrake :ball-n-chain :key :rope :crowbar :note-1 :ash :sack-lunch :flies :spear :monocle :feather :spell-component :money :watch :broken-clock :slingshot :camera :walkie-talkies :alarm-clock :walkie-talkie :flask-water :flask-water-stuff :flask-water-stuff-2 :note-2 :magic-slingshot :active-main]) (def settings (atom {:music-volume 50.0 :sound-volume 75.0})) @@ -125,9 +125,14 @@ (assoc entity :x (vector-2! v :x) :y (vector-2! v :y))))))) (defn find-override [entities [x y]] - (first (filter #(and ((:mouse-in? %) entities x y) - (:cursor %)) - (get-in entities [:room :interactions])))) + (first (concat (filter #(and ((:mouse-in? %) entities x y) + (:override %)) + (get-in entities [:room :interactions])) + (filter #(and (:mouse-in? %) + ((:mouse-in? %) entities x y)) + (vals (get-in entities [:room :entities]))) + (filter #(and ((:mouse-in? %) entities x y)) + (get-in entities [:room :interactions]))))) @@ -198,6 +203,6 @@ (let [last-pos (unproject screen (get-in entities [:cursor :last-pos]))] (if (get-in entities [:state :active?]) (if-let [mouse-override (find-override entities last-pos)] - (assoc-in entities [:cursor :override] (:cursor mouse-override)) + (assoc-in entities [:cursor :override] (or (:cursor mouse-override) :active-main)) (assoc-in entities [:cursor :override] nil)) entities)))