diff --git a/spine-libgdx/.classpath b/spine-libgdx/.classpath index 962e3a64c..6cc66c9d2 100644 --- a/spine-libgdx/.classpath +++ b/spine-libgdx/.classpath @@ -2,7 +2,7 @@ - + diff --git a/spine-libgdx/src/com/esotericsoftware/spine/AttachmentLoader.java b/spine-libgdx/src/com/esotericsoftware/spine/AttachmentLoader.java index 674b0092c..e2fc9e106 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/AttachmentLoader.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/AttachmentLoader.java @@ -2,5 +2,6 @@ package com.esotericsoftware.spine; public interface AttachmentLoader { + /** @return May be null to not load any attachment. */ public Attachment newAttachment (AttachmentType type, String name); } diff --git a/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java b/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java index 301452181..bbb52076f 100644 --- a/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java +++ b/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java @@ -103,7 +103,7 @@ public class SkeletonJson { int slotIndex = skeletonData.findSlotIndex(slotEntry.key); for (Entry attachmentEntry : ((OrderedMap)slotEntry.value).entries()) { Attachment attachment = readAttachment(attachmentEntry.key, attachmentEntry.value); - skin.addAttachment(slotIndex, attachmentEntry.key, attachment); + if (attachment != null) skin.addAttachment(slotIndex, attachmentEntry.key, attachment); } } skeletonData.addSkin(skin); diff --git a/spine-libgdx/test/com/esotericsoftware/spine/MixTest.java b/spine-libgdx/test/com/esotericsoftware/spine/MixTest.java index 85e987e6f..c63be69cc 100644 --- a/spine-libgdx/test/com/esotericsoftware/spine/MixTest.java +++ b/spine-libgdx/test/com/esotericsoftware/spine/MixTest.java @@ -3,8 +3,8 @@ package com.esotericsoftware.spine; import com.badlogic.gdx.ApplicationAdapter; import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.backends.jglfw.JglfwApplication; -import com.badlogic.gdx.backends.jglfw.JglfwApplicationConfiguration; +import com.badlogic.gdx.backends.lwjgl.LwjglApplication; +import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.GL10; import com.badlogic.gdx.graphics.g2d.SpriteBatch; @@ -113,10 +113,6 @@ public class MixTest extends ApplicationAdapter { } public static void main (String[] args) throws Exception { - JglfwApplicationConfiguration config = new JglfwApplicationConfiguration(); - config.title = "Mix Test"; - config.width = 640; - config.height = 480; - new JglfwApplication(new MixTest(), config); + new LwjglApplication(new MixTest()); } } diff --git a/spine-libgdx/test/com/esotericsoftware/spine/SkeletonTest.java b/spine-libgdx/test/com/esotericsoftware/spine/SkeletonTest.java index 71cc84453..7ecf6621b 100644 --- a/spine-libgdx/test/com/esotericsoftware/spine/SkeletonTest.java +++ b/spine-libgdx/test/com/esotericsoftware/spine/SkeletonTest.java @@ -5,8 +5,8 @@ import com.badlogic.gdx.ApplicationAdapter; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.InputAdapter; -import com.badlogic.gdx.backends.jglfw.JglfwApplication; -import com.badlogic.gdx.backends.jglfw.JglfwApplicationConfiguration; +import com.badlogic.gdx.backends.lwjgl.LwjglApplication; +import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.GL10; @@ -114,10 +114,6 @@ public class SkeletonTest extends ApplicationAdapter { } public static void main (String[] args) throws Exception { - JglfwApplicationConfiguration config = new JglfwApplicationConfiguration(); - config.title = "Skeleton Test"; - config.width = 640; - config.height = 480; - new JglfwApplication(new SkeletonTest(), config); + new LwjglApplication(new SkeletonTest()); } }