Merge pull request #46 from benjamin-kirkbride/development

Merge Development for v1.5.4

Author: Cleptomania

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [1.5.4] - 2021-10-12
+
+Previously if only one parallax value(x or y) on a layer had been set, it would fail because pytiled-parser was assuming that if one was set then the other would be. This is not actually the case in the Tiled map file.
+
+The value for them now defaults to 1.0 if it is not specified in the map file(This is the Tiled default value).
+
 ## [1.5.3] - 2021-08-28
 
 Just a small bugfix in this release. Previously if a layer's offset was (0, 0), the values for it would not appear in the JSON file, so the `offset` value in the

pytiled_parser/layer.py

@@ -356,10 +356,15 @@ def _get_common_attributes(raw_layer: RawLayer) -> Layer:
     if raw_layer.get("properties") is not None:
         common_attributes.properties = properties_.cast(raw_layer["properties"])
 
+    parallax = [1.0, 1.0]
+
     if raw_layer.get("parallaxx") is not None:
-        common_attributes.parallax_factor = OrderedPair(
-            raw_layer["parallaxx"], raw_layer["parallaxy"]
-        )
+        parallax[0] = raw_layer["parallaxx"]
+
+    if raw_layer.get("parallaxy") is not None:
+        parallax[1] = raw_layer["parallaxy"]
+
+    common_attributes.parallax_factor = OrderedPair(parallax[0], parallax[1])
 
     if raw_layer.get("tintcolor") is not None:
         common_attributes.tint_color = parse_color(raw_layer["tintcolor"])

pytiled_parser/version.py

@@ -1,3 +1,3 @@
 """pytiled_parser version"""
 
-__version__ = "1.5.3"
+__version__ = "1.5.4"

tests/test_data/layer_tests/all_layer_types/expected.py

@@ -83,7 +83,7 @@
         opacity=1,
         visible=True,
         id=4,
-        parallax_factor=common_types.OrderedPair(2.3, 1.2),
+        parallax_factor=common_types.OrderedPair(1.4, 1.0),
         tint_color=common_types.Color(0, 0, 255, 255),
         layers=[
             layer.ObjectLayer(
@@ -122,7 +122,7 @@
         opacity=1,
         visible=True,
         id=5,
-        parallax_factor=common_types.OrderedPair(1.5, 1.2),
+        parallax_factor=common_types.OrderedPair(1.0, 1.4),
         image=Path("../../images/tile_04.png"),
     ),
 ]

tests/test_data/layer_tests/all_layer_types/map.json

@@ -52,8 +52,7 @@
                 }],
          "name":"Group 1",
          "opacity":1,
-         "parallaxx":2.3,
-         "parallaxy":1.2,
+         "parallaxx":1.4,
          "tintcolor":"#0000ff",
          "type":"group",
          "visible":true,
@@ -79,8 +78,7 @@
          "image":"..\/..\/images\/tile_04.png",
          "name":"Image Layer 2",
          "opacity":1,
-         "parallaxx":1.5,
-         "parallaxy":1.2,
+         "parallaxy":1.4,
          "type":"imagelayer",
          "visible":true,
          "x":0,