Add map-object macros and improve map-layer macros

doclet/resources/classes.edn

@@ -35,6 +35,7 @@
                      "catmull-rom-spline!" :methods}
  "Circle" {"circle" :methods
            "circle!" :methods}
+ "CircleMapObject" {"map-object :circle" :methods}
  "Color" {"color" :static-fields
           "color!" :methods}
  "ColorAttribute" {"attribute :color" :constructors
@@ -67,6 +68,7 @@
               "edge-shape!" :methods}
  "Ellipse" {"ellipse" :methods
             "ellipse!" :methods}
+ "EllipseMapObject" {"map-object :ellipse" :methods}
  "Environment" {"environment" :methods
                 "environment!" :methods}
  "Files" {"files!" :methods}
@@ -118,6 +120,13 @@
           "joint!" :methods}
  "Label" {"label" :methods
           "label!" :methods}
+ "MapLayer" {"map-layer" :methods
+             "map-layer!" :methods}
+ "MapLayers" {"map-layers" :methods
+              "map-layers!" :methods}
+ "MapObject" {"map-object!" :methods}
+ "MapObjects" {"map-objects" :methods
+               "map-objects!" :methods}
  "Material" {"material" :methods
              "material!" :methods}
  "MathUtils" {"math!" :static-methods}
@@ -159,6 +168,8 @@
  "Plane.PlaneSide" {"plane-side" :static-fields}
  "Polygon" {"polygon" :methods
             "polygon!" :methods}
+ "PolygonMapObject" {"map-object :polygon" :methods}
+ "PolylineMapObject" {"map-object :polyline" :methods}
  "PolygonShape" {"polygon-shape" :methods
                  "polygon-shape!" :methods}
  "Polyline" {"polyline" :methods
@@ -170,6 +181,7 @@
                "quaternion!" :methods}
  "Rectangle" {"rectangle" :methods
               "rectangle!" :methods}
+ "RectangleMapObject" {"map-object :rectangle" :methods}
  "RevoluteJointDef" {"joint-def :revolute" :fields}
  "RopeJointDef" {"joint-def :rope" :fields}
  "Scaling" {"scaling" :static-fields}
@@ -213,6 +225,7 @@
  "TextField.TextFieldStyle" {"style :text-field" :constructors}
  "TextureLoader" {"loader :texture" :methods
                   "loader! :texture" :methods}
+ "TextureMapObject" {"map-object :texture" :methods}
  "TextureRegion" {"texture" :methods
                   "texture!" :methods}
  "TextureRegionDrawable" {"drawable :texture-region" :constructors}

src/play_clj/core.clj

@@ -13,7 +13,8 @@
            [com.badlogic.gdx.graphics.glutils ShapeRenderer]
            [com.badlogic.gdx.input GestureDetector
             GestureDetector$GestureListener]
-           [com.badlogic.gdx.maps MapLayer MapLayers MapProperties]
+           [com.badlogic.gdx.maps MapLayer MapLayers MapObject MapObjects
+            MapProperties]
            [com.badlogic.gdx.maps.tiled TiledMap TiledMapTileLayer
             TiledMapTileLayer$Cell TmxMapLoader]
            [com.badlogic.gdx.maps.tiled.renderers

src/play_clj/core_graphics.clj

@@ -84,29 +84,20 @@ Normally, you don't need to use this directly."
 
     (tiled-map! screen :get-layers)"
   [screen k & options]
-  `(let [^BatchTiledMapRenderer object# (u/get-obj ~screen :renderer)]
+  `(let [^BatchTiledMapRenderer renderer# (u/get-obj ~screen :renderer)]
-     (u/call! ^TiledMap (.getMap object#) ~k ~@options)))
+     (u/call! ^TiledMap (.getMap renderer#) ~k ~@options)))
-
-(defn tiled-map-layers
-  "Returns a list with [MapLayer](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/maps/MapLayer.html)
-objects cooresponding to each layer in the tiled map in `screen`.
-
-    (tiled-map-layers screen)"
-  [screen]
-  (let [^BatchTiledMapRenderer renderer (u/get-obj screen :renderer)
-        ^MapLayers layers (-> renderer .getMap .getLayers)]
-    (for [^long i (range (.getCount layers))]
-      (.get layers i))))
 
 (defn tiled-map-layer*
   ([width height tile-width tile-height]
     (TiledMapTileLayer. width height tile-width tile-height))
   ([screen layer]
     (if (isa? (type layer) MapLayer)
-      layer
+        layer
-      (->> (tiled-map-layers screen)
+        (let [^BatchTiledMapRenderer renderer (u/get-obj screen :renderer)
-           (drop-while #(not= layer (.getName ^MapLayer %)))
+              ^TiledMap m (.getMap renderer)]
-           first))))
+          (->> (.getLayers m)
+               (drop-while #(not= layer (.getName ^MapLayer %)))
+               first)))))
 
 (defmacro tiled-map-layer
   "Returns a [TiledMapTileLayer](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/maps/tiled/TiledMapTileLayer.html)
@@ -129,8 +120,10 @@ from the tiled map in `screen` that matches `layer`.
   "Returns a list with strings cooresponding to the name of each layer in the
 tiled map in `screen`."
   [screen]
-  (for [^MapLayer layer (tiled-map-layers screen)]
+  (let [^BatchTiledMapRenderer renderer (u/get-obj screen :renderer)
-    (.getName layer)))
+        ^TiledMap m (.getMap renderer)]
+    (for [^MapLayer layer (.getLayers m)]
+      (.getName layer))))
 
 (defn tiled-map-cell*
   ([]
@@ -155,6 +148,27 @@ from the tiled map in `screen` from the given `layer` and position `x` and `y`.
   [object k & options]
   `(u/call! ^TiledMapTileLayer$Cell ~object ~k ~@options))
 
+(defn map-layers*
+  []
+  (MapLayers.))
+
+(defmacro map-layers
+  "Returns the [MapLayers](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/maps/MapLayers.html)
+in the tiled map in `screen`.
+
+    (map-layers screen)"
+  [screen & options]
+  `(let [^BatchTiledMapRenderer renderer# (u/get-obj ~screen :renderer)
+         ^MapLayers layers# (-> renderer# .getMap .getLayers)]
+     (u/calls! layers# ~@options)))
+
+(defmacro map-layers!
+  "Calls a single method on a `map-layers`.
+
+    (map-layers! screen :remove (map-layer screen \"objects\"))"
+  [object k & options]
+  `(u/call! ^MapLayers ~object ~k ~@options))
+
 (defn map-layer*
   ([]
     (MapLayer.))
@@ -179,6 +193,49 @@ non-tile layers, like object and image layers.
   [object k & options]
   `(u/call! ^MapLayer ~object ~k ~@options))
 
+(defn map-objects*
+  []
+  (MapObjects.))
+
+(defmacro map-objects
+  "Returns the [MapObjects](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/maps/MapObjects.html)
+in the `layer`.
+
+    (map-objects layer)"
+  [^MapLayer layer & options]
+  `(let [^MapObjects objects# (.getObjects ~layer)]
+     (u/calls! objects# ~@options)))
+
+(defmacro map-objects!
+  "Calls a single method on a `map-objects`.
+
+    (map-objects! (map-objects layer) :remove (map-object layer 0))"
+  [object k & options]
+  `(u/call! ^MapObjects ~object ~k ~@options))
+
+(defn ^:private map-object-init
+  [k]
+  (u/gdx :maps :object (str (u/key->pascal k) "MapObject.")))
+
+(defn map-object*
+  []
+  (MapObject.))
+
+(defmacro map-object
+  "Returns a subclass of [MapObject](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/maps/MapObject.html).
+
+    (map-object :circle)"
+  [k & options]
+  `(let [^MapObject object# (~(map-object-init k))]
+     (u/calls! object# ~@options)))
+
+(defmacro map-object!
+  "Calls a single method on a `map-object`.
+
+    (map-object! (map-object :rectangle) :get-rectangle)"
+  [object k & options]
+  `(u/call! ^MapObject ~object ~k ~@options))
+
 (defn ^:private tiled-map-prop
   [screen]
   (let [^BatchTiledMapRenderer renderer (u/get-obj screen :renderer)