UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 22:34:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
badlogic 2016-10-20 14:33:33 +02:00
commit 992d5178bc
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spine-lua/TextureAtlas.lua
View File

@ -74,10 +74,15 @@ function TextureAtlas:parse (atlasContent, imageLoader)
if not atlasContent then error("atlasContent cannot be nil.", 2) end
if not imageLoader then error("imageLoader cannot be nil.", 2) end
function lineIterator(s)
if s:sub(-1)~="\n" then s=s.."\n" end
return s:gmatch("(.-)\n")
end
local lines = {}
local index = 0
local numLines = 0
for line in atlasContent:gmatch("[^\r\n]+") do
for line in lineIterator(atlasContent) do
lines[numLines] = line
numLines = numLines + 1
end
@ -99,7 +104,9 @@ function TextureAtlas:parse (atlasContent, imageLoader)
local readTuple = function ()
local line = readLine()
local idx = line:find(":")
if not idx then error("Invalid line: " .. line, 2) end
if not idx then
error("Invalid line: " .. line, 2)
end
local i = 1
local lastMatch = idx + 1
local tuple = {}