made screen reloading middleware.

This commit is contained in:
Bryce Covert
2016-01-14 09:46:38 -08:00
parent 73d3bee5ca
commit 746082e120
7 changed files with 16 additions and 18 deletions

Binary file not shown.

View File

@@ -1 +1 @@
31 32

View File

@@ -24,6 +24,7 @@
:jvm-opts ["-Duse-repl=true" "-Dno-steam=true"] :jvm-opts ["-Duse-repl=true" "-Dno-steam=true"]
:dependencies [[com.badlogicgames.gdx/gdx-tools "1.5.3"] :dependencies [[com.badlogicgames.gdx/gdx-tools "1.5.3"]
[org.clojure/tools.nrepl "0.2.7"] [org.clojure/tools.nrepl "0.2.7"]
[play-clj-nrepl "0.1.0" :exclusions [play-clj]]
[slamhound "1.5.5"] [slamhound "1.5.5"]
[org.clojure/data.csv "0.1.3"]] [org.clojure/data.csv "0.1.3"]]
@@ -34,6 +35,7 @@
:jvm-opts ["-Duse-repl=true"] :jvm-opts ["-Duse-repl=true"]
:dependencies [[com.badlogicgames.gdx/gdx-tools "1.5.3"] :dependencies [[com.badlogicgames.gdx/gdx-tools "1.5.3"]
[org.clojure/tools.nrepl "0.2.7"] [org.clojure/tools.nrepl "0.2.7"]
[play-clj-nrepl "0.1.0" :exclusions [play-clj]]
[slamhound "1.5.5"] [slamhound "1.5.5"]
[org.clojure/data.csv "0.1.3"] [org.clojure/data.csv "0.1.3"]
[com.code-disaster.steamworks4j/steamworks4j "1.2.2"]] [com.code-disaster.steamworks4j/steamworks4j "1.2.2"]]

View File

@@ -20,14 +20,12 @@
(set-asset-manager! am) (set-asset-manager! am)
(defgame advent (defgame advent
:on-create :on-create
(fn [this] (fn [this]
(steam/init) (steam/init)
(set-screen! this title/title-screen))) (set-screen! this title/title-screen)))
(defn reload [] (defn reload []
(on-gl (set-screen! advent title/title-screen))) (on-gl (set-screen! advent title/title-screen)))

View File

@@ -342,7 +342,8 @@
(continue [this screen entities] (continue [this screen entities]
(if (= 185 (get-in entities [:room :entities :bloodclot :current-frame-index])) (if (= 185 (get-in entities [:room :entities :bloodclot :current-frame-index]))
(particle-effect! (get-in entities [:room :entities :grow-explode]) :start)) (do (particle-effect! (get-in entities [:room :entities :grow-explode]) :reset)
(particle-effect! (get-in entities [:room :entities :grow-explode]) :start)))
(let [move-speed (* 0.17 (let [move-speed (* 0.17
(/ (:delta-time screen) (/ (:delta-time screen)

View File

@@ -117,7 +117,7 @@
:finish (fn [entities] :finish (fn [entities]
(utils/stop-music (:music entities)) (utils/stop-music (:music entities))
(reset! utils/selected-save save) (reset! utils/selected-save save)
(set-screen! @(resolve 'advent.core/advent) scene/scene scene/demo scene/hud dialogue/talking-screen dialogue/choice-screen dialogue/toast-screen inventory/inventory-screen safe/safe-screen fade/fade-screen (set-screen! @(resolve 'advent.core/advent) scene/scene #_scene/demo scene/hud dialogue/talking-screen dialogue/choice-screen dialogue/toast-screen inventory/inventory-screen safe/safe-screen fade/fade-screen
) )
entities) entities)
:ease tween/ease-in-cubic)) :ease tween/ease-in-cubic))

View File

@@ -9,22 +9,19 @@
(def has-nrepl?
(try
(require '[play-clj-nrepl.core :as a])
(System/getProperty "use-repl")
(catch Exception e
(println e)
false)))
(defn -main (defn -main
[& [port]] [& [port]]
(when (System/getProperty "use-repl") (when has-nrepl?
(eval `(require 'clojure.tools.nrepl.server)) (play-clj-nrepl.core/start-nrepl advent.core/advent port))
(eval `(try
(when ~port (let [{port# :port} (clojure.tools.nrepl.server/start-server :port (Integer/parseInt ~port))]
(doseq [port-file# ["target/repl-port" ".nrepl-port"]]
(-> port-file#
java.io.File.
(doto .deleteOnExit)
(spit port#)))
(println "Started nREPL server on port" port#)))
(catch Exception e#))))
(let [cfg (LwjglApplicationConfiguration.)] (let [cfg (LwjglApplicationConfiguration.)]
#_(println (.exists (files! :classpath "icon/icon_128x128.png"))) #_(println (.exists (files! :classpath "icon/icon_128x128.png")))