Merge pull request #21 from dcronqvist/objlayer-visibility

Fix incorrect type for visibility in layers
dcronqvist · Aug 31, 2024 · 39d2838 · 39d2838
2 parents ac073d6 + 4695a4f
commit 39d2838
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/DotTiled/Serialization/Tmx/TmxReaderBase.ObjectLayer.cs b/src/DotTiled/Serialization/Tmx/TmxReaderBase.ObjectLayer.cs
@@ -19,7 +19,7 @@ internal ObjectLayer ReadObjectLayer()
     var width = _reader.GetOptionalAttributeParseable<uint>("width");
     var height = _reader.GetOptionalAttributeParseable<uint>("height");
     var opacity = _reader.GetOptionalAttributeParseable<float>("opacity") ?? 1.0f;
-    var visible = _reader.GetOptionalAttributeParseable<bool>("visible") ?? true;
+    var visible = (_reader.GetOptionalAttributeParseable<uint>("visible") ?? 1) == 1;
     var tintColor = _reader.GetOptionalAttributeClass<Color>("tintcolor");
     var offsetX = _reader.GetOptionalAttributeParseable<float>("offsetx") ?? 0.0f;
     var offsetY = _reader.GetOptionalAttributeParseable<float>("offsety") ?? 0.0f;

diff --git a/src/DotTiled/Serialization/Tmx/TmxReaderBase.TileLayer.cs b/src/DotTiled/Serialization/Tmx/TmxReaderBase.TileLayer.cs
@@ -15,7 +15,7 @@ internal TileLayer ReadTileLayer(bool dataUsesChunks)
     var width = _reader.GetRequiredAttributeParseable<uint>("width");
     var height = _reader.GetRequiredAttributeParseable<uint>("height");
     var opacity = _reader.GetOptionalAttributeParseable<float>("opacity") ?? 1.0f;
-    var visible = _reader.GetOptionalAttributeParseable<bool>("visible") ?? true;
+    var visible = (_reader.GetOptionalAttributeParseable<uint>("visible") ?? 1) == 1;
     var tintColor = _reader.GetOptionalAttributeClass<Color>("tintcolor");
     var offsetX = _reader.GetOptionalAttributeParseable<float>("offsetx") ?? 0.0f;
     var offsetY = _reader.GetOptionalAttributeParseable<float>("offsety") ?? 0.0f;
@@ -107,7 +107,7 @@ internal Group ReadGroup()
     var name = _reader.GetOptionalAttribute("name") ?? "";
     var @class = _reader.GetOptionalAttribute("class") ?? "";
     var opacity = _reader.GetOptionalAttributeParseable<float>("opacity") ?? 1.0f;
-    var visible = _reader.GetOptionalAttributeParseable<bool>("visible") ?? true;
+    var visible = (_reader.GetOptionalAttributeParseable<uint>("visible") ?? 1) == 1;
     var tintColor = _reader.GetOptionalAttributeClass<Color>("tintcolor");
     var offsetX = _reader.GetOptionalAttributeParseable<float>("offsetx") ?? 0.0f;
     var offsetY = _reader.GetOptionalAttributeParseable<float>("offsety") ?? 0.0f;