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

Update to libGDX 1.5.0

Browse Source
This commit is contained in:
oakes
2014-12-15 13:22:20 -05:00
parent 5b874400d4
commit bfaa4c9cc1
18 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project.clj
View File

@@ -3,9 +3,9 @@
:url "https://github.com/oakes/play-clj" :url "https://github.com/oakes/play-clj"
:license {:name "Public Domain" :license {:name "Public Domain"
:url "http://unlicense.org/UNLICENSE"} :url "http://unlicense.org/UNLICENSE"}
:dependencies [[com.badlogicgames.gdx/gdx "1.4.1"] :dependencies [[com.badlogicgames.gdx/gdx "1.5.0"]
[com.badlogicgames.gdx/gdx-box2d "1.4.1"] [com.badlogicgames.gdx/gdx-box2d "1.5.0"]
[com.badlogicgames.gdx/gdx-bullet "1.4.1"] [com.badlogicgames.gdx/gdx-bullet "1.5.0"]
[org.clojure/clojure "1.6.0"]] [org.clojure/clojure "1.6.0"]]
:repositories [["sonatype" :repositories [["sonatype"
"https://oss.sonatype.org/content/repositories/releases/"]] "https://oss.sonatype.org/content/repositories/releases/"]]

4
src/play_clj/core_graphics.clj
View File

@@ -478,7 +478,7 @@ with the tiled map file at `path` and `unit` scale.
(defmethod draw! BatchTiledMapRenderer (defmethod draw! BatchTiledMapRenderer
[{:keys [^BatchTiledMapRenderer renderer] :as screen} entities] [{:keys [^BatchTiledMapRenderer renderer] :as screen} entities]
(let [^Batch batch (.getSpriteBatch renderer)] (let [^Batch batch (.getBatch renderer)]
(.begin batch) (.begin batch)
(doseq [entity entities] (doseq [entity entities]
(e/draw! entity screen batch)) (e/draw! entity screen batch))
@@ -608,7 +608,7 @@ to overlap correctly with the entities.
(when-not (get-in screen [:layers ln]) (when-not (get-in screen [:layers ln])
(update-fn! assoc-in [:layers ln] (split-layer screen ln)))) (update-fn! assoc-in [:layers ln] (split-layer screen ln))))
(when camera (.setView renderer camera)) (when camera (.setView renderer camera))
(let [^Batch batch (.getSpriteBatch renderer)] (let [^Batch batch (.getBatch renderer)]
(.begin batch) (.begin batch)
(doseq [entity (->> (map #(get-in screen [:layers %]) layer-names) (doseq [entity (->> (map #(get-in screen [:layers %]) layer-names)
(apply concat entities) (apply concat entities)

4
template/project.clj
View File

@@ -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" :description "A template for making play-clj projects"
:url "https://github.com/oakes/play-clj" :url "https://github.com/oakes/play-clj"
:license {:name "Public Domain" :license {:name "Public Domain"
:url "http://unlicense.org/UNLICENSE"} :url "http://unlicense.org/UNLICENSE"}
:dependencies [[lein-droid "0.3.0-beta3"]] :dependencies [[lein-droid "0.3.0-beta4"]]
:resource-paths ["resources"] :resource-paths ["resources"]
:eval-in-leiningen true) :eval-in-leiningen true)

BIN
template/resources/armeabi-v7a/libgdx-box2d.so
View File

Binary file not shown.

BIN
template/resources/armeabi-v7a/libgdx-bullet.so
View File

Binary file not shown.

BIN
template/resources/armeabi-v7a/libgdx.so
View File

Binary file not shown.

BIN
template/resources/armeabi/libgdx-box2d.so
View File

Binary file not shown.

BIN
template/resources/armeabi/libgdx-bullet.so
View File

Binary file not shown.

BIN
template/resources/armeabi/libgdx.so
View File

Binary file not shown.

BIN
template/resources/ios/libgdx-box2d.a
View File

Binary file not shown.

BIN
template/resources/ios/libgdx-bullet.a
View File

Binary file not shown.

BIN
template/resources/ios/libgdx.a
View File

Binary file not shown.

BIN
template/resources/x86/libgdx-box2d.so
View File

Binary file not shown.

BIN
template/resources/x86/libgdx-bullet.so
View File

Binary file not shown.

BIN
template/resources/x86/libgdx.so
View File

Binary file not shown.

10
template/src/leiningen/new/play_clj/android-project.clj
View File

@@ -1,13 +1,13 @@
(defproject {{app-name}} "0.0.1-SNAPSHOT" (defproject {{app-name}} "0.0.1-SNAPSHOT"
:description "FIXME: write description" :description "FIXME: write description"
:dependencies [[com.badlogicgames.gdx/gdx "1.4.1" :use-resources true] :dependencies [[com.badlogicgames.gdx/gdx "1.5.0" :use-resources true]
[com.badlogicgames.gdx/gdx-backend-android "1.4.1"] [com.badlogicgames.gdx/gdx-backend-android "1.5.0"]
[com.badlogicgames.gdx/gdx-box2d "1.4.1"] [com.badlogicgames.gdx/gdx-box2d "1.5.0"]
[com.badlogicgames.gdx/gdx-bullet "1.4.1"] [com.badlogicgames.gdx/gdx-bullet "1.5.0"]
[neko/neko "3.0.2"] [neko/neko "3.0.2"]
[org.clojure-android/clojure "1.6.0-RC1" :use-resources true] [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"] :profiles {:dev {:dependencies [[android/tools.nrepl "0.2.0-bigstack"]
[compliment "0.1.4"]] [compliment "0.1.4"]]
:android {:aot :all-with-unused}} :android {:aot :all-with-unused}}

16
template/src/leiningen/new/play_clj/desktop-project.clj
View File

@@ -1,18 +1,18 @@
(defproject {{app-name}} "0.0.1-SNAPSHOT" (defproject {{app-name}} "0.0.1-SNAPSHOT"
:description "FIXME: write description" :description "FIXME: write description"
:dependencies [[com.badlogicgames.gdx/gdx "1.4.1"] :dependencies [[com.badlogicgames.gdx/gdx "1.5.0"]
[com.badlogicgames.gdx/gdx-backend-lwjgl "1.4.1"] [com.badlogicgames.gdx/gdx-backend-lwjgl "1.5.0"]
[com.badlogicgames.gdx/gdx-box2d "1.4.1"] [com.badlogicgames.gdx/gdx-box2d "1.5.0"]
[com.badlogicgames.gdx/gdx-box2d-platform "1.4.1" [com.badlogicgames.gdx/gdx-box2d-platform "1.5.0"
:classifier "natives-desktop"] :classifier "natives-desktop"]
[com.badlogicgames.gdx/gdx-bullet "1.4.1"] [com.badlogicgames.gdx/gdx-bullet "1.5.0"]
[com.badlogicgames.gdx/gdx-bullet-platform "1.4.1" [com.badlogicgames.gdx/gdx-bullet-platform "1.5.0"
:classifier "natives-desktop"] :classifier "natives-desktop"]
[com.badlogicgames.gdx/gdx-platform "1.4.1" [com.badlogicgames.gdx/gdx-platform "1.5.0"
:classifier "natives-desktop"] :classifier "natives-desktop"]
[org.clojure/clojure "1.6.0"] [org.clojure/clojure "1.6.0"]
[play-clj "0.4.2"]] [play-clj "0.4.3-SNAPSHOT"]]
:source-paths ["src" "src-common"] :source-paths ["src" "src-common"]
:javac-options ["-target" "1.6" "-source" "1.6" "-Xlint:-options"] :javac-options ["-target" "1.6" "-source" "1.6" "-Xlint:-options"]

10
template/src/leiningen/new/play_clj/ios-project.clj
View File

@@ -1,11 +1,11 @@
(defproject {{app-name}} "0.0.1-SNAPSHOT" (defproject {{app-name}} "0.0.1-SNAPSHOT"
:description "FIXME: write description" :description "FIXME: write description"
:dependencies [[com.badlogicgames.gdx/gdx "1.4.1"] :dependencies [[com.badlogicgames.gdx/gdx "1.5.0"]
[com.badlogicgames.gdx/gdx-backend-robovm "1.4.1"] [com.badlogicgames.gdx/gdx-backend-robovm "1.5.0"]
[com.badlogicgames.gdx/gdx-box2d "1.4.1"] [com.badlogicgames.gdx/gdx-box2d "1.5.0"]
[com.badlogicgames.gdx/gdx-bullet "1.4.1"] [com.badlogicgames.gdx/gdx-bullet "1.5.0"]
[org.clojure/clojure "1.6.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"] :source-paths ["src/clojure" "../desktop/src-common"]
:java-source-paths ["src/java"] :java-source-paths ["src/java"]
:javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"] :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"]