CppJavaCoder
diff --git a/‎ParseTest/src/main.cpp‎
Lines changed: 1 addition & 1 deletion b/‎ParseTest/src/main.cpp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tmxlite/src/TileLayer.cpp‎
Lines changed: 70 additions & 16 deletions b/‎tmxlite/src/TileLayer.cpp‎
Lines changed: 70 additions & 16 deletions
@@ -36,7 +36,7 @@ int main()
 {
     tmx::Map map;
 
-    if (map.load("maps/platform.tmx"))
+    if (map.load("maps/csv-untitled.tmx"))
     {
         std::cout << "Loaded Map version: " << map.getVersion().upper << ", " << map.getVersion().lower << std::endl;
         if (map.isInfinite())
 
@@ -174,30 +174,84 @@ void TileLayer::parseBase64(const pugi::xml_node& node)
 
 void TileLayer::parseCSV(const pugi::xml_node& node)
 {
+    auto processDataString = [](const std::string dataString)->std::vector<std::uint32_t>
+    {
+        std::vector<std::uint32_t> IDs;
+
+        std::stringstream dataStream(dataString);
+        std::uint32_t i = 0;
+        while (dataStream >> i)
+        {
+            IDs.push_back(i);
+            //TODO this shouldn't assume the first character
+            //is a valid value, and it should ignore anything non-numeric.
+            if (dataStream.peek() == ',')
+            {
+                dataStream.ignore();
+            }
+        }
+
+        return IDs;
+    };
+
     std::string data = node.text().as_string();
     if (data.empty())
     {
-        Logger::log("Layer " + getName() + " has no layer data. Layer skipped.", Logger::Type::Error);
-        return;
-    }
+        //check for chunk nodes
+        auto dataCount = 0;
+        for (const auto& childNode : node.children())
+        {
+            std::string childName = childNode.name();
+            if (childName == "chunk")
+            {
+                std::string dataString = childNode.text().as_string();
+                if (!dataString.empty())
+                {
+                    Chunk chunk;
+                    chunk.position.x = childNode.attribute("x").as_int();
+                    chunk.position.y = childNode.attribute("y").as_int();
 
-    std::vector<std::uint32_t> IDs;
-    IDs.reserve(m_tileCount);
+                    chunk.size.x = childNode.attribute("width").as_int();
+                    chunk.size.y = childNode.attribute("height").as_int();
 
-    std::stringstream dataStream(data);
-    std::uint32_t i;
-    while (dataStream >> i)
-    {
-        IDs.push_back(i);
-        //TODO this shouldn't assume the first character
-        //is a valid value, and it should ignore anything non-numeric.
-        if (dataStream.peek() == ',')
+                    auto IDs = processDataString(dataString);
+
+                    if (!IDs.empty())
+                    {
+                        createTiles(IDs, chunk.tiles);
+                        m_chunks.push_back(chunk);
+                        dataCount++;
+                    }
+                }
+            }
+        }
+
+        if (dataCount == 0)
         {
-            dataStream.ignore();
+            Logger::log("Layer " + getName() + " has no layer data. Layer skipped.", Logger::Type::Error);
+            return;
         }
     }
-
-    createTiles(IDs, m_tiles);
+    else
+    {
+        //std::vector<std::uint32_t> IDs;
+        //IDs.reserve(m_tileCount);
+
+        //std::stringstream dataStream(data);
+        //std::uint32_t i;
+        //while (dataStream >> i)
+        //{
+        //    IDs.push_back(i);
+        //    //TODO this shouldn't assume the first character
+        //    //is a valid value, and it should ignore anything non-numeric.
+        //    if (dataStream.peek() == ',')
+        //    {
+        //        dataStream.ignore();
+        //    }
+        //}
+
+        createTiles(processDataString(data), m_tiles);
+    }
 }
 
 void TileLayer::parseUnencoded(const pugi::xml_node& node)
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ int main()`
`36`	`36`	`{`
`37`	`37`	`tmx::Map map;`
`38`	`38`
`39`		`- if (map.load("maps/platform.tmx"))`
	`39`	`+ if (map.load("maps/csv-untitled.tmx"))`
`40`	`40`	`{`
`41`	`41`	`std::cout << "Loaded Map version: " << map.getVersion().upper << ", " << map.getVersion().lower << std::endl;`
`42`	`42`	`if (map.isInfinite())`