UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[libgdx] Set array sizes up front rather than shrink afterward.

Browse Source 
No format or functional changes here.
This commit is contained in:
NathanSweet 2019-06-03 15:17:43 +02:00
parent f5cdfbdf76
commit ec5b721557
2 changed files with 60 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java
View File

@ -40,6 +40,7 @@ import com.badlogic.gdx.utils.DataInput;
import com.badlogic.gdx.utils.FloatArray; import com.badlogic.gdx.utils.FloatArray;
import com.badlogic.gdx.utils.IntArray; import com.badlogic.gdx.utils.IntArray;
import com.badlogic.gdx.utils.SerializationException; import com.badlogic.gdx.utils.SerializationException;
import com.esotericsoftware.spine.Animation.AttachmentTimeline; import com.esotericsoftware.spine.Animation.AttachmentTimeline;
import com.esotericsoftware.spine.Animation.ColorTimeline; import com.esotericsoftware.spine.Animation.ColorTimeline;
import com.esotericsoftware.spine.Animation.CurveTimeline; import com.esotericsoftware.spine.Animation.CurveTimeline;
@ -180,7 +181,6 @@ public class SkeletonBinary {
skeletonData.height = input.readFloat(); skeletonData.height = input.readFloat();
boolean nonessential = input.readBoolean(); boolean nonessential = input.readBoolean();
if (nonessential) { if (nonessential) {
skeletonData.fps = input.readFloat(); skeletonData.fps = input.readFloat();
@ -191,8 +191,12 @@ public class SkeletonBinary {
if (skeletonData.audioPath.isEmpty()) skeletonData.audioPath = null; if (skeletonData.audioPath.isEmpty()) skeletonData.audioPath = null;
} }
int n;
Object[] o;
// Bones. // Bones.
for (int i = 0, n = input.readInt(true); i < n; i++) { o = skeletonData.bones.setSize(n = input.readInt(true));
for (int i = 0; i < n; i++) {
String name = input.readString(); String name = input.readString();
BoneData parent = i == 0 ? null : skeletonData.bones.get(input.readInt(true)); BoneData parent = i == 0 ? null : skeletonData.bones.get(input.readInt(true));
BoneData data = new BoneData(i, name, parent); BoneData data = new BoneData(i, name, parent);
@ -207,11 +211,12 @@ public class SkeletonBinary {
data.transformMode = TransformMode.values[input.readInt(true)]; data.transformMode = TransformMode.values[input.readInt(true)];
data.skinRequired = input.readBoolean(); data.skinRequired = input.readBoolean();
if (nonessential) Color.rgba8888ToColor(data.color, input.readInt()); if (nonessential) Color.rgba8888ToColor(data.color, input.readInt());
skeletonData.bones.add(data); o[i] = data;
} }
// Slots. // Slots.
for (int i = 0, n = input.readInt(true); i < n; i++) { o = skeletonData.slots.setSize(n = input.readInt(true));
for (int i = 0; i < n; i++) {
String slotName = input.readString(); String slotName = input.readString();
BoneData boneData = skeletonData.bones.get(input.readInt(true)); BoneData boneData = skeletonData.bones.get(input.readInt(true));
SlotData data = new SlotData(i, slotName, boneData); SlotData data = new SlotData(i, slotName, boneData);
@ -222,32 +227,36 @@ public class SkeletonBinary {
data.attachmentName = input.readString(); data.attachmentName = input.readString();
data.blendMode = BlendMode.values[input.readInt(true)]; data.blendMode = BlendMode.values[input.readInt(true)];
skeletonData.slots.add(data); o[i] = data;
} }
// IK constraints. // IK constraints.
for (int i = 0, n = input.readInt(true); i < n; i++) { o = skeletonData.ikConstraints.setSize(n = input.readInt(true));
for (int i = 0, nn; i < n; i++) {
IkConstraintData data = new IkConstraintData(input.readString()); IkConstraintData data = new IkConstraintData(input.readString());
data.order = input.readInt(true); data.order = input.readInt(true);
data.skinRequired = input.readBoolean(); data.skinRequired = input.readBoolean();
for (int ii = 0, nn = input.readInt(true); ii < nn; ii++) Object[] bones = data.bones.setSize(nn = input.readInt(true));
data.bones.add(skeletonData.bones.get(input.readInt(true))); for (int ii = 0; ii < nn; ii++)
bones[ii] = skeletonData.bones.get(input.readInt(true));
data.target = skeletonData.bones.get(input.readInt(true)); data.target = skeletonData.bones.get(input.readInt(true));
data.mix = input.readFloat(); data.mix = input.readFloat();
data.bendDirection = input.readByte(); data.bendDirection = input.readByte();
data.compress = input.readBoolean(); data.compress = input.readBoolean();
data.stretch = input.readBoolean(); data.stretch = input.readBoolean();
data.uniform = input.readBoolean(); data.uniform = input.readBoolean();
skeletonData.ikConstraints.add(data); o[i] = data;
} }
// Transform constraints. // Transform constraints.
for (int i = 0, n = input.readInt(true); i < n; i++) { o = skeletonData.transformConstraints.setSize(n = input.readInt(true));
for (int i = 0, nn; i < n; i++) {
TransformConstraintData data = new TransformConstraintData(input.readString()); TransformConstraintData data = new TransformConstraintData(input.readString());
data.order = input.readInt(true); data.order = input.readInt(true);
data.skinRequired = input.readBoolean(); data.skinRequired = input.readBoolean();
for (int ii = 0, nn = input.readInt(true); ii < nn; ii++) Object[] bones = data.bones.setSize(nn = input.readInt(true));
data.bones.add(skeletonData.bones.get(input.readInt(true))); for (int ii = 0; ii < nn; ii++)
bones[ii] = skeletonData.bones.get(input.readInt(true));
data.target = skeletonData.bones.get(input.readInt(true)); data.target = skeletonData.bones.get(input.readInt(true));
data.local = input.readBoolean(); data.local = input.readBoolean();
data.relative = input.readBoolean(); data.relative = input.readBoolean();
@ -261,16 +270,18 @@ public class SkeletonBinary {
data.translateMix = input.readFloat(); data.translateMix = input.readFloat();
data.scaleMix = input.readFloat(); data.scaleMix = input.readFloat();
data.shearMix = input.readFloat(); data.shearMix = input.readFloat();
skeletonData.transformConstraints.add(data); o[i] = data;
} }
// Path constraints. // Path constraints.
for (int i = 0, n = input.readInt(true); i < n; i++) { o = skeletonData.pathConstraints.setSize(n = input.readInt(true));
for (int i = 0, nn; i < n; i++) {
PathConstraintData data = new PathConstraintData(input.readString()); PathConstraintData data = new PathConstraintData(input.readString());
data.order = input.readInt(true); data.order = input.readInt(true);
data.skinRequired = input.readBoolean(); data.skinRequired = input.readBoolean();
for (int ii = 0, nn = input.readInt(true); ii < nn; ii++) Object[] bones = data.bones.setSize(nn = input.readInt(true));
data.bones.add(skeletonData.bones.get(input.readInt(true))); for (int ii = 0; ii < nn; ii++)
bones[ii] = skeletonData.bones.get(input.readInt(true));
data.target = skeletonData.slots.get(input.readInt(true)); data.target = skeletonData.slots.get(input.readInt(true));
data.positionMode = PositionMode.values[input.readInt(true)]; data.positionMode = PositionMode.values[input.readInt(true)];
data.spacingMode = SpacingMode.values[input.readInt(true)]; data.spacingMode = SpacingMode.values[input.readInt(true)];
@ -282,7 +293,7 @@ public class SkeletonBinary {
if (data.spacingMode == SpacingMode.length || data.spacingMode == SpacingMode.fixed) data.spacing *= scale; if (data.spacingMode == SpacingMode.length || data.spacingMode == SpacingMode.fixed) data.spacing *= scale;
data.rotateMix = input.readFloat(); data.rotateMix = input.readFloat();
data.translateMix = input.readFloat(); data.translateMix = input.readFloat();
skeletonData.pathConstraints.add(data); o[i] = data;
} }
// Default skin. // Default skin.
@ -293,11 +304,16 @@ public class SkeletonBinary {
} }
// Skins. // Skins.
for (int i = 0, n = input.readInt(true); i < n; i++) {
skeletonData.skins.add(readSkin(input, skeletonData, false, nonessential)); int i = skeletonData.skins.size;
o = skeletonData.skins.setSize(n = i + input.readInt(true));
for (; i < n; i++)
o[i] = readSkin(input, skeletonData, false, nonessential);
}
// Linked meshes. // Linked meshes.
for (int i = 0, n = linkedMeshes.size; i < n; i++) { n = linkedMeshes.size;
for (int i = 0; i < n; i++) {
LinkedMesh linkedMesh = linkedMeshes.get(i); LinkedMesh linkedMesh = linkedMeshes.get(i);
Skin skin = linkedMesh.skin == null ? skeletonData.getDefaultSkin() : skeletonData.findSkin(linkedMesh.skin); Skin skin = linkedMesh.skin == null ? skeletonData.getDefaultSkin() : skeletonData.findSkin(linkedMesh.skin);
if (skin == null) throw new SerializationException("Skin not found: " + linkedMesh.skin); if (skin == null) throw new SerializationException("Skin not found: " + linkedMesh.skin);
@ -310,7 +326,8 @@ public class SkeletonBinary {
linkedMeshes.clear(); linkedMeshes.clear();
// Events. // Events.
for (int i = 0, n = input.readInt(true); i < n; i++) { o = skeletonData.events.setSize(n = input.readInt(true));
for (int i = 0; i < n; i++) {
EventData data = new EventData(input.readString()); EventData data = new EventData(input.readString());
data.intValue = input.readInt(false); data.intValue = input.readInt(false);
data.floatValue = input.readFloat(); data.floatValue = input.readFloat();
@ -320,12 +337,13 @@ public class SkeletonBinary {
data.volume = input.readFloat(); data.volume = input.readFloat();
data.balance = input.readFloat(); data.balance = input.readFloat();
} }
skeletonData.events.add(data); o[i] = data;
} }
// Animations. // Animations.
for (int i = 0, n = input.readInt(true); i < n; i++) o = skeletonData.animations.setSize(n = input.readInt(true));
readAnimation(input, input.readString(), skeletonData); for (int i = 0; i < n; i++)
o[i] = readAnimation(input, input.readString(), skeletonData);
} catch (IOException ex) { } catch (IOException ex) {
throw new SerializationException("Error reading skeleton file.", ex); throw new SerializationException("Error reading skeleton file.", ex);
@ -335,29 +353,28 @@ public class SkeletonBinary {
} catch (IOException ignored) { } catch (IOException ignored) {
} }
} }
skeletonData.bones.shrink();
skeletonData.slots.shrink();
skeletonData.skins.shrink();
skeletonData.events.shrink();
skeletonData.animations.shrink();
skeletonData.ikConstraints.shrink();
return skeletonData; return skeletonData;
} }
private Skin readSkin (DataInput input, SkeletonData skeletonData, boolean defaultSkin, boolean nonessential) private Skin readSkin (DataInput input, SkeletonData skeletonData, boolean defaultSkin, boolean nonessential)
throws IOException { throws IOException {
Skin skin = new Skin(defaultSkin ? "default" : input.readString()); Skin skin = new Skin(defaultSkin ? "default" : input.readString());
if (!defaultSkin) { if (!defaultSkin) {
for (int i = 0, n = input.readInt(true); i < n; i++) Object[] bones = skeletonData.bones.setSize(input.readInt(true));
skin.bones.add(skeletonData.bones.get(input.readInt(true))); for (int i = 0, n = skeletonData.bones.size; i < n; i++)
bones[i] = skeletonData.bones.get(input.readInt(true));
for (int i = 0, n = input.readInt(true); i < n; i++) for (int i = 0, n = input.readInt(true); i < n; i++)
skin.constraints.add(skeletonData.ikConstraints.get(input.readInt(true))); skin.constraints.add(skeletonData.ikConstraints.get(input.readInt(true)));
for (int i = 0, n = input.readInt(true); i < n; i++) for (int i = 0, n = input.readInt(true); i < n; i++)
skin.constraints.add(skeletonData.transformConstraints.get(input.readInt(true))); skin.constraints.add(skeletonData.transformConstraints.get(input.readInt(true)));
for (int i = 0, n = input.readInt(true); i < n; i++) for (int i = 0, n = input.readInt(true); i < n; i++)
skin.constraints.add(skeletonData.pathConstraints.get(input.readInt(true))); skin.constraints.add(skeletonData.pathConstraints.get(input.readInt(true)));
skin.constraints.shrink();
} }
for (int i = 0, n = input.readInt(true); i < n; i++) { for (int i = 0, n = input.readInt(true); i < n; i++) {
int slotIndex = input.readInt(true); int slotIndex = input.readInt(true);
for (int ii = 0, nn = input.readInt(true); ii < nn; ii++) { for (int ii = 0, nn = input.readInt(true); ii < nn; ii++) {
@ -574,8 +591,8 @@ public class SkeletonBinary {
return array; return array;
} }
private void readAnimation (DataInput input, String name, SkeletonData skeletonData) { private Animation readAnimation (DataInput input, String name, SkeletonData skeletonData) {
Array<Timeline> timelines = new Array(); Array<Timeline> timelines = new Array(32);
float scale = this.scale; float scale = this.scale;
float duration = 0; float duration = 0;
@ -852,8 +869,7 @@ public class SkeletonBinary {
} }
timelines.shrink(); timelines.shrink();
skeletonData.animations.add(new Animation(name, timelines, duration)); return new Animation(name, timelines, duration);
} }
private void readCurve (DataInput input, int frameIndex, CurveTimeline timeline) throws IOException { private void readCurve (DataInput input, int frameIndex, CurveTimeline timeline) throws IOException {

18
spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java
View File

@ -29,18 +29,9 @@
package com.esotericsoftware.spine; package com.esotericsoftware.spine;
import static com.badlogic.gdx.math.Interpolation.linear; import static com.badlogic.gdx.math.Interpolation.*;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.delay; import static com.badlogic.gdx.scenes.scene2d.actions.Actions.*;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeIn;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeOut;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.moveBy;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.parallel;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.removeActor;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.sequence;
import java.awt.FileDialog;
import java.awt.Frame;
import java.awt.Toolkit;
import java.io.File; import java.io.File;
import java.lang.Thread.UncaughtExceptionHandler; import java.lang.Thread.UncaughtExceptionHandler;
@ -88,11 +79,16 @@ import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.StringBuilder; import com.badlogic.gdx.utils.StringBuilder;
import com.badlogic.gdx.utils.viewport.ScreenViewport; import com.badlogic.gdx.utils.viewport.ScreenViewport;
import com.esotericsoftware.spine.Animation.MixBlend; import com.esotericsoftware.spine.Animation.MixBlend;
import com.esotericsoftware.spine.AnimationState.AnimationStateAdapter; import com.esotericsoftware.spine.AnimationState.AnimationStateAdapter;
import com.esotericsoftware.spine.AnimationState.TrackEntry; import com.esotericsoftware.spine.AnimationState.TrackEntry;
import com.esotericsoftware.spine.utils.TwoColorPolygonBatch; import com.esotericsoftware.spine.utils.TwoColorPolygonBatch;
import java.awt.FileDialog;
import java.awt.Frame;
import java.awt.Toolkit;
public class SkeletonViewer extends ApplicationAdapter { public class SkeletonViewer extends ApplicationAdapter {
static final float checkModifiedInterval = 0.250f; static final float checkModifiedInterval = 0.250f;
static final float reloadDelay = 1; static final float reloadDelay = 1;