From d4e99233858aeb9545355d3fb3b969db6b12467c Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Mon, 5 May 2014 15:07:40 +0200 Subject: [PATCH] Open .atlas.txt files. --- .../test/com/esotericsoftware/spine/SkeletonTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spine-libgdx/test/com/esotericsoftware/spine/SkeletonTest.java b/spine-libgdx/test/com/esotericsoftware/spine/SkeletonTest.java index b1c939440..c18faea66 100644 --- a/spine-libgdx/test/com/esotericsoftware/spine/SkeletonTest.java +++ b/spine-libgdx/test/com/esotericsoftware/spine/SkeletonTest.java @@ -106,7 +106,11 @@ public class SkeletonTest extends ApplicationAdapter { pixmap.fill(); final AtlasRegion fake = new AtlasRegion(new Texture(pixmap), 0, 0, 32, 32); pixmap.dispose(); - FileHandle atlasFile = skeletonFile.sibling(skeletonFile.nameWithoutExtension() + ".atlas"); + + String atlasFileName = skeletonFile.nameWithoutExtension(); + if (atlasFileName.endsWith(".json")) atlasFileName = new FileHandle(atlasFileName).nameWithoutExtension(); + FileHandle atlasFile = skeletonFile.sibling(atlasFileName + ".atlas"); + if (!atlasFile.exists()) atlasFile = skeletonFile.sibling(atlasFileName + ".atlas.txt"); TextureAtlasData data = !atlasFile.exists() ? null : new TextureAtlasData(atlasFile, atlasFile.parent(), false); TextureAtlas atlas = new TextureAtlas(data) { public AtlasRegion findRegion (String name) {