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 '3.6' into 3.7-beta

Browse Source
This commit is contained in:
NathanSweet 2017-08-02 00:55:27 +02:00
commit 4f73cfc959
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/VertexEffectTest.java
View File

@ -39,7 +39,6 @@ import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.PolygonSpriteBatch;
import com.badlogic.gdx.graphics.g2d.TextureAtlas;
import com.badlogic.gdx.math.Interpolation;
import com.esotericsoftware.spine.vertexeffects.JitterEffect;
import com.esotericsoftware.spine.vertexeffects.SwirlEffect;
public class VertexEffectTest extends ApplicationAdapter {

6
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skin.java
View File

@ -64,6 +64,12 @@ public class Skin {
attachments.put(key, attachment);
}
/** Adds all attachments from the specified skin to this skin. */
public void addAttachments (Skin skin) {
for (Entry<Key, Attachment> entry : skin.attachments.entries())
addAttachment(entry.key.slotIndex, entry.key.name, entry.value);
}
/** Returns the attachment for the specified slot index and name, or null. */
public Attachment getAttachment (int slotIndex, String name) {
if (slotIndex < 0) throw new IllegalArgumentException("slotIndex must be >= 0.");