From 25065c841dddbfe7c65218a5d27e1f1fd7c33839 Mon Sep 17 00:00:00 2001 From: = Date: Wed, 3 Sep 2014 08:05:06 -0700 Subject: [PATCH] added second walkbehind. --- desktop/resources/pathfind-test-big.png | Bin 8093 -> 6205 bytes desktop/src-common/advent/core.clj | 12 +++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/desktop/resources/pathfind-test-big.png b/desktop/resources/pathfind-test-big.png index a4d1f1a3fd37eb386540b28cd9e21499c50ff049..d502853d5596507269f7a54347fe2c5526afdfed 100644 GIT binary patch delta 5146 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 diff --git a/desktop/src-common/advent/core.clj b/desktop/src-common/advent/core.clj index b1dec841..67805f86 100644 --- a/desktop/src-common/advent/core.clj +++ b/desktop/src-common/advent/core.clj @@ -81,7 +81,8 @@ (let [ _ (input! :set-cursor-image (cursor "cursor.png" 0) 0 0) background (texture "bg5.png") - house (texture "house.png")] + house (texture "house.png") + overdirt (texture "overdirt.png")] {:cursor {:id "cursor" :cursor-index 0} :background (assoc background :id "background" :x 0 :y 0 @@ -90,12 +91,17 @@ :house (assoc house :x 0 :y 0 :baseline 122) - :ego (get-ego screen)})) + :overdirt (assoc overdirt + :x 0 :y 0 + :baseline 240) + :ego (get-ego screen) + :fps (assoc (label "0" (color :white) ) :x 5 :baseline 9000)})) :on-render (fn [screen [entities]] (clear!) - (let [entities (assoc entities :ego (update-ego screen entities (:ego entities)))] + (let [entities (assoc entities :ego (update-ego screen entities (:ego entities))) + _ (label! (:fps entities) :set-text (str (game :fps)))] (render! screen (sort-by :baseline (vals entities))) entities)) :on-resize (fn [screen entities]