refinement.

This commit is contained in:
=
2014-09-04 12:09:28 -07:00
parent 4b897dacd8
commit a83c935fa7
5 changed files with 10 additions and 5 deletions

View File

@@ -12,7 +12,7 @@
[com.badlogicgames.gdx/gdx-platform "1.3.0"
:classifier "natives-desktop"]
[org.clojure/clojure "1.6.0"]
[play-clj "0.3.9"]
#_[play-clj "0.3.9"]
[org.clojure/data.priority-map "0.0.5"]]
:source-paths ["src" "src-common"]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

@@ -48,8 +48,8 @@
:anim (animation 0.075 (for [i (range 8)]
(texture (aget player-sheet 0 i))))
:baseline 95
:origin-x 0
:origin-y 0
:origin-x 9
:origin-y 0
:x 150 :y 95 :x-velocity 1
:id "ego"}]
(merge (animation->texture screen (:anim ego)) ego)))
@@ -81,7 +81,7 @@
(animation->texture screen (:anim ego))))))
(merge (dissoc ego :target-path) (texture (animation! (:anim ego) :get-key-frame 0.6))))))
(merge (dissoc ego :target-path) (texture (animation! (:anim ego) :get-key-frame 0.25))))))
(defn scaler-fn-with-baseline [baseline minimum-size & [maximum-size]]
(let [maximum-size (or maximum-size 1.0)]
@@ -104,6 +104,7 @@
(let [
_ (input! :set-cursor-image (cursor "cursor.png" 0) 0 0)
background (texture "bg5.png")
background-trees (texture "background-trees.png")
house (texture "house.png")
overdirt (texture "overdirt.png")
music (sound "outside-house.mp3")
@@ -128,8 +129,12 @@
:overdirt (assoc overdirt
:x 0 :y 0
:baseline 240)
:background-trees (assoc background-trees
:x 0 :y 0
:baseline 44)
:ego (get-ego screen)
:fps (assoc (label "0" (color :white) ) :x 5 :baseline 9000)}))
:fps (assoc (label "0" (color :white) ) :x 5 :baseline 9000)
}))
:on-render
(fn [screen [entities]]