From 3ca729d2f75b30b5c0e9e8cca67697fe976df0f0 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Sun, 14 Dec 2014 18:11:32 -0800 Subject: [PATCH] start with correct scale. --- desktop/src-common/advent/screens/scene.clj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 19f05c6b..c2460ca0 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -86,7 +86,7 @@ entities)))) -(defn get-ego [screen start-pos] +(defn get-ego [screen start-pos start-scale] (let [player-sheet (texture! (texture "player.png") :split 18 36) talk-sheet (texture! (texture "ego/talk.png") :split 18 36) stand-sheet (texture! (texture "ego/stand.png") :split 18 36) @@ -163,6 +163,8 @@ :origin-y 0 :scaled true :step-sound (sound "ego/step.ogg") + :scale-x start-scale + :scale-y start-scale :mouse-in? (fn [entities x y] (let [{entity-x :x entity-y :y region :object scale :scale-x} (get-in entities [:room :entities :ego]) @@ -280,7 +282,7 @@ :override nil} :all-items (assoc items/items :object nil) :room (as-> (get rooms (:last-room (get-state))) room - (assoc-in room [:entities :ego] (get-ego screen (:start-pos room)))) + (assoc-in room [:entities :ego] (get-ego screen (:start-pos room) ((:scale-fn room) (:start-pos room))))) :inventory (assoc (texture "inventory.png") :x 278 :y 0 :baseline 9000 :mouse-in? (zone/box 278 0 320 42)) :fps (assoc (label "0" (color :white) ) :x 5 :baseline 0)}]