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

start with correct scale.

Browse Source
This commit is contained in:
Remington Covert
2014-12-14 18:11:32 -08:00
parent 77e7d7f59c
commit 3ca729d2f7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@
entities)))) 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) (let [player-sheet (texture! (texture "player.png") :split 18 36)
talk-sheet (texture! (texture "ego/talk.png") :split 18 36) talk-sheet (texture! (texture "ego/talk.png") :split 18 36)
stand-sheet (texture! (texture "ego/stand.png") :split 18 36) stand-sheet (texture! (texture "ego/stand.png") :split 18 36)
@@ -163,6 +163,8 @@
:origin-y 0 :origin-y 0
:scaled true :scaled true
:step-sound (sound "ego/step.ogg") :step-sound (sound "ego/step.ogg")
:scale-x start-scale
:scale-y start-scale
:mouse-in? (fn [entities x y] :mouse-in? (fn [entities x y]
(let [{entity-x :x entity-y :y region :object scale :scale-x} (get-in entities [:room :entities :ego]) (let [{entity-x :x entity-y :y region :object scale :scale-x} (get-in entities [:room :entities :ego])
@@ -280,7 +282,7 @@
:override nil} :override nil}
:all-items (assoc items/items :object nil) :all-items (assoc items/items :object nil)
:room (as-> (get rooms (:last-room (get-state))) room :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 :inventory (assoc (texture "inventory.png") :x 278 :y 0 :baseline 9000
:mouse-in? (zone/box 278 0 320 42)) :mouse-in? (zone/box 278 0 320 42))
:fps (assoc (label "0" (color :white) ) :x 5 :baseline 0)}] :fps (assoc (label "0" (color :white) ) :x 5 :baseline 0)}]