diff --git a/project.clj b/project.clj index a27ec24..7f049f7 100644 --- a/project.clj +++ b/project.clj @@ -3,9 +3,9 @@ :url "https://github.com/oakes/play-clj" :license {:name "Public Domain" :url "http://unlicense.org/UNLICENSE"} - :dependencies [[com.badlogicgames.gdx/gdx "1.4.1"] - [com.badlogicgames.gdx/gdx-box2d "1.4.1"] - [com.badlogicgames.gdx/gdx-bullet "1.4.1"] + :dependencies [[com.badlogicgames.gdx/gdx "1.5.0"] + [com.badlogicgames.gdx/gdx-box2d "1.5.0"] + [com.badlogicgames.gdx/gdx-bullet "1.5.0"] [org.clojure/clojure "1.6.0"]] :repositories [["sonatype" "https://oss.sonatype.org/content/repositories/releases/"]] diff --git a/src/play_clj/core_graphics.clj b/src/play_clj/core_graphics.clj index e27f89c..74179e2 100644 --- a/src/play_clj/core_graphics.clj +++ b/src/play_clj/core_graphics.clj @@ -478,7 +478,7 @@ with the tiled map file at `path` and `unit` scale. (defmethod draw! BatchTiledMapRenderer [{:keys [^BatchTiledMapRenderer renderer] :as screen} entities] - (let [^Batch batch (.getSpriteBatch renderer)] + (let [^Batch batch (.getBatch renderer)] (.begin batch) (doseq [entity entities] (e/draw! entity screen batch)) @@ -608,7 +608,7 @@ to overlap correctly with the entities. (when-not (get-in screen [:layers ln]) (update-fn! assoc-in [:layers ln] (split-layer screen ln)))) (when camera (.setView renderer camera)) - (let [^Batch batch (.getSpriteBatch renderer)] + (let [^Batch batch (.getBatch renderer)] (.begin batch) (doseq [entity (->> (map #(get-in screen [:layers %]) layer-names) (apply concat entities) diff --git a/template/project.clj b/template/project.clj index 500bd98..07fe8fc 100644 --- a/template/project.clj +++ b/template/project.clj @@ -1,8 +1,8 @@ -(defproject play-clj/lein-template "0.4.2.1" +(defproject play-clj/lein-template "0.4.3-SNAPSHOT" :description "A template for making play-clj projects" :url "https://github.com/oakes/play-clj" :license {:name "Public Domain" :url "http://unlicense.org/UNLICENSE"} - :dependencies [[lein-droid "0.3.0-beta3"]] + :dependencies [[lein-droid "0.3.0-beta4"]] :resource-paths ["resources"] :eval-in-leiningen true) diff --git a/template/resources/armeabi-v7a/libgdx-box2d.so b/template/resources/armeabi-v7a/libgdx-box2d.so index 14575fc..923eff0 100644 Binary files a/template/resources/armeabi-v7a/libgdx-box2d.so and b/template/resources/armeabi-v7a/libgdx-box2d.so differ diff --git a/template/resources/armeabi-v7a/libgdx-bullet.so b/template/resources/armeabi-v7a/libgdx-bullet.so index b4ad643..9a5fce6 100644 Binary files a/template/resources/armeabi-v7a/libgdx-bullet.so and b/template/resources/armeabi-v7a/libgdx-bullet.so differ diff --git a/template/resources/armeabi-v7a/libgdx.so b/template/resources/armeabi-v7a/libgdx.so index 6bb9980..7022bbd 100644 Binary files a/template/resources/armeabi-v7a/libgdx.so and b/template/resources/armeabi-v7a/libgdx.so differ diff --git a/template/resources/armeabi/libgdx-box2d.so b/template/resources/armeabi/libgdx-box2d.so index 2a0ba51..521ac2d 100644 Binary files a/template/resources/armeabi/libgdx-box2d.so and b/template/resources/armeabi/libgdx-box2d.so differ diff --git a/template/resources/armeabi/libgdx-bullet.so b/template/resources/armeabi/libgdx-bullet.so index 994e6b9..ecd5047 100644 Binary files a/template/resources/armeabi/libgdx-bullet.so and b/template/resources/armeabi/libgdx-bullet.so differ diff --git a/template/resources/armeabi/libgdx.so b/template/resources/armeabi/libgdx.so index 9e4119b..cc8d11f 100644 Binary files a/template/resources/armeabi/libgdx.so and b/template/resources/armeabi/libgdx.so differ diff --git a/template/resources/ios/libgdx-box2d.a b/template/resources/ios/libgdx-box2d.a index 0e53e41..64a34ee 100644 Binary files a/template/resources/ios/libgdx-box2d.a and b/template/resources/ios/libgdx-box2d.a differ diff --git a/template/resources/ios/libgdx-bullet.a b/template/resources/ios/libgdx-bullet.a index e5d6c33..77582a6 100644 Binary files a/template/resources/ios/libgdx-bullet.a and b/template/resources/ios/libgdx-bullet.a differ diff --git a/template/resources/ios/libgdx.a b/template/resources/ios/libgdx.a index 549d913..fce9da8 100644 Binary files a/template/resources/ios/libgdx.a and b/template/resources/ios/libgdx.a differ diff --git a/template/resources/x86/libgdx-box2d.so b/template/resources/x86/libgdx-box2d.so index dd2b3ab..03d1913 100644 Binary files a/template/resources/x86/libgdx-box2d.so and b/template/resources/x86/libgdx-box2d.so differ diff --git a/template/resources/x86/libgdx-bullet.so b/template/resources/x86/libgdx-bullet.so index a55c068..efaf0a3 100644 Binary files a/template/resources/x86/libgdx-bullet.so and b/template/resources/x86/libgdx-bullet.so differ diff --git a/template/resources/x86/libgdx.so b/template/resources/x86/libgdx.so index 6afee9c..7083b4e 100644 Binary files a/template/resources/x86/libgdx.so and b/template/resources/x86/libgdx.so differ diff --git a/template/src/leiningen/new/play_clj/android-project.clj b/template/src/leiningen/new/play_clj/android-project.clj index 5b8ad71..a500e7f 100644 --- a/template/src/leiningen/new/play_clj/android-project.clj +++ b/template/src/leiningen/new/play_clj/android-project.clj @@ -1,13 +1,13 @@ (defproject {{app-name}} "0.0.1-SNAPSHOT" :description "FIXME: write description" - :dependencies [[com.badlogicgames.gdx/gdx "1.4.1" :use-resources true] - [com.badlogicgames.gdx/gdx-backend-android "1.4.1"] - [com.badlogicgames.gdx/gdx-box2d "1.4.1"] - [com.badlogicgames.gdx/gdx-bullet "1.4.1"] + :dependencies [[com.badlogicgames.gdx/gdx "1.5.0" :use-resources true] + [com.badlogicgames.gdx/gdx-backend-android "1.5.0"] + [com.badlogicgames.gdx/gdx-box2d "1.5.0"] + [com.badlogicgames.gdx/gdx-bullet "1.5.0"] [neko/neko "3.0.2"] [org.clojure-android/clojure "1.6.0-RC1" :use-resources true] - [play-clj "0.4.2"]] + [play-clj "0.4.3-SNAPSHOT"]] :profiles {:dev {:dependencies [[android/tools.nrepl "0.2.0-bigstack"] [compliment "0.1.4"]] :android {:aot :all-with-unused}} diff --git a/template/src/leiningen/new/play_clj/desktop-project.clj b/template/src/leiningen/new/play_clj/desktop-project.clj index 56790da..48bdc6f 100644 --- a/template/src/leiningen/new/play_clj/desktop-project.clj +++ b/template/src/leiningen/new/play_clj/desktop-project.clj @@ -1,18 +1,18 @@ (defproject {{app-name}} "0.0.1-SNAPSHOT" :description "FIXME: write description" - :dependencies [[com.badlogicgames.gdx/gdx "1.4.1"] - [com.badlogicgames.gdx/gdx-backend-lwjgl "1.4.1"] - [com.badlogicgames.gdx/gdx-box2d "1.4.1"] - [com.badlogicgames.gdx/gdx-box2d-platform "1.4.1" + :dependencies [[com.badlogicgames.gdx/gdx "1.5.0"] + [com.badlogicgames.gdx/gdx-backend-lwjgl "1.5.0"] + [com.badlogicgames.gdx/gdx-box2d "1.5.0"] + [com.badlogicgames.gdx/gdx-box2d-platform "1.5.0" :classifier "natives-desktop"] - [com.badlogicgames.gdx/gdx-bullet "1.4.1"] - [com.badlogicgames.gdx/gdx-bullet-platform "1.4.1" + [com.badlogicgames.gdx/gdx-bullet "1.5.0"] + [com.badlogicgames.gdx/gdx-bullet-platform "1.5.0" :classifier "natives-desktop"] - [com.badlogicgames.gdx/gdx-platform "1.4.1" + [com.badlogicgames.gdx/gdx-platform "1.5.0" :classifier "natives-desktop"] [org.clojure/clojure "1.6.0"] - [play-clj "0.4.2"]] + [play-clj "0.4.3-SNAPSHOT"]] :source-paths ["src" "src-common"] :javac-options ["-target" "1.6" "-source" "1.6" "-Xlint:-options"] diff --git a/template/src/leiningen/new/play_clj/ios-project.clj b/template/src/leiningen/new/play_clj/ios-project.clj index 8ac5430..7822d48 100644 --- a/template/src/leiningen/new/play_clj/ios-project.clj +++ b/template/src/leiningen/new/play_clj/ios-project.clj @@ -1,11 +1,11 @@ (defproject {{app-name}} "0.0.1-SNAPSHOT" :description "FIXME: write description" - :dependencies [[com.badlogicgames.gdx/gdx "1.4.1"] - [com.badlogicgames.gdx/gdx-backend-robovm "1.4.1"] - [com.badlogicgames.gdx/gdx-box2d "1.4.1"] - [com.badlogicgames.gdx/gdx-bullet "1.4.1"] + :dependencies [[com.badlogicgames.gdx/gdx "1.5.0"] + [com.badlogicgames.gdx/gdx-backend-robovm "1.5.0"] + [com.badlogicgames.gdx/gdx-box2d "1.5.0"] + [com.badlogicgames.gdx/gdx-bullet "1.5.0"] [org.clojure/clojure "1.6.0"] - [play-clj "0.4.2"]] + [play-clj "0.4.3-SNAPSHOT"]] :source-paths ["src/clojure" "../desktop/src-common"] :java-source-paths ["src/java"] :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"]