diff --git a/SpineRuntimes/SpineRuntime36/src/Animation.cs b/SpineRuntimes/SpineRuntime36/Animation.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Animation.cs rename to SpineRuntimes/SpineRuntime36/Animation.cs diff --git a/SpineRuntimes/SpineRuntime36/src/AnimationState.cs b/SpineRuntimes/SpineRuntime36/AnimationState.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/AnimationState.cs rename to SpineRuntimes/SpineRuntime36/AnimationState.cs diff --git a/SpineRuntimes/SpineRuntime36/src/AnimationStateData.cs b/SpineRuntimes/SpineRuntime36/AnimationStateData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/AnimationStateData.cs rename to SpineRuntimes/SpineRuntime36/AnimationStateData.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Atlas.cs b/SpineRuntimes/SpineRuntime36/Atlas.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Atlas.cs rename to SpineRuntimes/SpineRuntime36/Atlas.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Attachments/AtlasAttachmentLoader.cs b/SpineRuntimes/SpineRuntime36/Attachments/AtlasAttachmentLoader.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Attachments/AtlasAttachmentLoader.cs rename to SpineRuntimes/SpineRuntime36/Attachments/AtlasAttachmentLoader.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Attachments/Attachment.cs b/SpineRuntimes/SpineRuntime36/Attachments/Attachment.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Attachments/Attachment.cs rename to SpineRuntimes/SpineRuntime36/Attachments/Attachment.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Attachments/AttachmentLoader.cs b/SpineRuntimes/SpineRuntime36/Attachments/AttachmentLoader.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Attachments/AttachmentLoader.cs rename to SpineRuntimes/SpineRuntime36/Attachments/AttachmentLoader.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Attachments/AttachmentType.cs b/SpineRuntimes/SpineRuntime36/Attachments/AttachmentType.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Attachments/AttachmentType.cs rename to SpineRuntimes/SpineRuntime36/Attachments/AttachmentType.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Attachments/BoundingBoxAttachment.cs b/SpineRuntimes/SpineRuntime36/Attachments/BoundingBoxAttachment.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Attachments/BoundingBoxAttachment.cs rename to SpineRuntimes/SpineRuntime36/Attachments/BoundingBoxAttachment.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Attachments/ClippingAttachment.cs b/SpineRuntimes/SpineRuntime36/Attachments/ClippingAttachment.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Attachments/ClippingAttachment.cs rename to SpineRuntimes/SpineRuntime36/Attachments/ClippingAttachment.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Attachments/MeshAttachment.cs b/SpineRuntimes/SpineRuntime36/Attachments/MeshAttachment.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Attachments/MeshAttachment.cs rename to SpineRuntimes/SpineRuntime36/Attachments/MeshAttachment.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Attachments/PathAttachment.cs b/SpineRuntimes/SpineRuntime36/Attachments/PathAttachment.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Attachments/PathAttachment.cs rename to SpineRuntimes/SpineRuntime36/Attachments/PathAttachment.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Attachments/PointAttachment.cs b/SpineRuntimes/SpineRuntime36/Attachments/PointAttachment.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Attachments/PointAttachment.cs rename to SpineRuntimes/SpineRuntime36/Attachments/PointAttachment.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Attachments/RegionAttachment.cs b/SpineRuntimes/SpineRuntime36/Attachments/RegionAttachment.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Attachments/RegionAttachment.cs rename to SpineRuntimes/SpineRuntime36/Attachments/RegionAttachment.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Attachments/VertexAttachment.cs b/SpineRuntimes/SpineRuntime36/Attachments/VertexAttachment.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Attachments/VertexAttachment.cs rename to SpineRuntimes/SpineRuntime36/Attachments/VertexAttachment.cs diff --git a/SpineRuntimes/SpineRuntime36/src/BlendMode.cs b/SpineRuntimes/SpineRuntime36/BlendMode.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/BlendMode.cs rename to SpineRuntimes/SpineRuntime36/BlendMode.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Bone.cs b/SpineRuntimes/SpineRuntime36/Bone.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Bone.cs rename to SpineRuntimes/SpineRuntime36/Bone.cs diff --git a/SpineRuntimes/SpineRuntime36/src/BoneData.cs b/SpineRuntimes/SpineRuntime36/BoneData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/BoneData.cs rename to SpineRuntimes/SpineRuntime36/BoneData.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Event.cs b/SpineRuntimes/SpineRuntime36/Event.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Event.cs rename to SpineRuntimes/SpineRuntime36/Event.cs diff --git a/SpineRuntimes/SpineRuntime36/src/EventData.cs b/SpineRuntimes/SpineRuntime36/EventData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/EventData.cs rename to SpineRuntimes/SpineRuntime36/EventData.cs diff --git a/SpineRuntimes/SpineRuntime36/src/ExposedList.cs b/SpineRuntimes/SpineRuntime36/ExposedList.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/ExposedList.cs rename to SpineRuntimes/SpineRuntime36/ExposedList.cs diff --git a/SpineRuntimes/SpineRuntime36/src/IConstraint.cs b/SpineRuntimes/SpineRuntime36/IConstraint.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/IConstraint.cs rename to SpineRuntimes/SpineRuntime36/IConstraint.cs diff --git a/SpineRuntimes/SpineRuntime36/src/IUpdatable.cs b/SpineRuntimes/SpineRuntime36/IUpdatable.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/IUpdatable.cs rename to SpineRuntimes/SpineRuntime36/IUpdatable.cs diff --git a/SpineRuntimes/SpineRuntime36/src/IkConstraint.cs b/SpineRuntimes/SpineRuntime36/IkConstraint.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/IkConstraint.cs rename to SpineRuntimes/SpineRuntime36/IkConstraint.cs diff --git a/SpineRuntimes/SpineRuntime36/src/IkConstraintData.cs b/SpineRuntimes/SpineRuntime36/IkConstraintData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/IkConstraintData.cs rename to SpineRuntimes/SpineRuntime36/IkConstraintData.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Json.cs b/SpineRuntimes/SpineRuntime36/Json.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Json.cs rename to SpineRuntimes/SpineRuntime36/Json.cs diff --git a/SpineRuntimes/SpineRuntime36/src/MathUtils.cs b/SpineRuntimes/SpineRuntime36/MathUtils.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/MathUtils.cs rename to SpineRuntimes/SpineRuntime36/MathUtils.cs diff --git a/SpineRuntimes/SpineRuntime36/src/PathConstraint.cs b/SpineRuntimes/SpineRuntime36/PathConstraint.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/PathConstraint.cs rename to SpineRuntimes/SpineRuntime36/PathConstraint.cs diff --git a/SpineRuntimes/SpineRuntime36/src/PathConstraintData.cs b/SpineRuntimes/SpineRuntime36/PathConstraintData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/PathConstraintData.cs rename to SpineRuntimes/SpineRuntime36/PathConstraintData.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Skeleton.cs b/SpineRuntimes/SpineRuntime36/Skeleton.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Skeleton.cs rename to SpineRuntimes/SpineRuntime36/Skeleton.cs diff --git a/SpineRuntimes/SpineRuntime36/src/SkeletonBinary.cs b/SpineRuntimes/SpineRuntime36/SkeletonBinary.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/SkeletonBinary.cs rename to SpineRuntimes/SpineRuntime36/SkeletonBinary.cs diff --git a/SpineRuntimes/SpineRuntime36/src/SkeletonBounds.cs b/SpineRuntimes/SpineRuntime36/SkeletonBounds.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/SkeletonBounds.cs rename to SpineRuntimes/SpineRuntime36/SkeletonBounds.cs diff --git a/SpineRuntimes/SpineRuntime36/src/SkeletonClipping.cs b/SpineRuntimes/SpineRuntime36/SkeletonClipping.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/SkeletonClipping.cs rename to SpineRuntimes/SpineRuntime36/SkeletonClipping.cs diff --git a/SpineRuntimes/SpineRuntime36/src/SkeletonData.cs b/SpineRuntimes/SpineRuntime36/SkeletonData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/SkeletonData.cs rename to SpineRuntimes/SpineRuntime36/SkeletonData.cs diff --git a/SpineRuntimes/SpineRuntime36/src/SkeletonJson.cs b/SpineRuntimes/SpineRuntime36/SkeletonJson.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/SkeletonJson.cs rename to SpineRuntimes/SpineRuntime36/SkeletonJson.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Skin.cs b/SpineRuntimes/SpineRuntime36/Skin.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Skin.cs rename to SpineRuntimes/SpineRuntime36/Skin.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Slot.cs b/SpineRuntimes/SpineRuntime36/Slot.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Slot.cs rename to SpineRuntimes/SpineRuntime36/Slot.cs diff --git a/SpineRuntimes/SpineRuntime36/src/SlotData.cs b/SpineRuntimes/SpineRuntime36/SlotData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/SlotData.cs rename to SpineRuntimes/SpineRuntime36/SlotData.cs diff --git a/SpineRuntimes/SpineRuntime36/src/TransformConstraint.cs b/SpineRuntimes/SpineRuntime36/TransformConstraint.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/TransformConstraint.cs rename to SpineRuntimes/SpineRuntime36/TransformConstraint.cs diff --git a/SpineRuntimes/SpineRuntime36/src/TransformConstraintData.cs b/SpineRuntimes/SpineRuntime36/TransformConstraintData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/TransformConstraintData.cs rename to SpineRuntimes/SpineRuntime36/TransformConstraintData.cs diff --git a/SpineRuntimes/SpineRuntime36/src/Triangulator.cs b/SpineRuntimes/SpineRuntime36/Triangulator.cs similarity index 100% rename from SpineRuntimes/SpineRuntime36/src/Triangulator.cs rename to SpineRuntimes/SpineRuntime36/Triangulator.cs diff --git a/SpineRuntimes/SpineRuntime38/src/Animation.cs b/SpineRuntimes/SpineRuntime38/Animation.cs similarity index 99% rename from SpineRuntimes/SpineRuntime38/src/Animation.cs rename to SpineRuntimes/SpineRuntime38/Animation.cs index b4d75e0..293bd40 100644 --- a/SpineRuntimes/SpineRuntime38/src/Animation.cs +++ b/SpineRuntimes/SpineRuntime38/Animation.cs @@ -27,6 +27,7 @@ * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ +using SpineRuntime38.Attachments; using System; using System.Collections.Generic; diff --git a/SpineRuntimes/SpineRuntime38/src/AnimationState.cs b/SpineRuntimes/SpineRuntime38/AnimationState.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/AnimationState.cs rename to SpineRuntimes/SpineRuntime38/AnimationState.cs diff --git a/SpineRuntimes/SpineRuntime38/src/AnimationStateData.cs b/SpineRuntimes/SpineRuntime38/AnimationStateData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/AnimationStateData.cs rename to SpineRuntimes/SpineRuntime38/AnimationStateData.cs diff --git a/SpineRuntimes/SpineRuntime38/src/Atlas.cs b/SpineRuntimes/SpineRuntime38/Atlas.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/Atlas.cs rename to SpineRuntimes/SpineRuntime38/Atlas.cs diff --git a/SpineRuntimes/SpineRuntime38/src/Attachments/AtlasAttachmentLoader.cs b/SpineRuntimes/SpineRuntime38/Attachments/AtlasAttachmentLoader.cs similarity index 99% rename from SpineRuntimes/SpineRuntime38/src/Attachments/AtlasAttachmentLoader.cs rename to SpineRuntimes/SpineRuntime38/Attachments/AtlasAttachmentLoader.cs index 91d3050..4d71390 100644 --- a/SpineRuntimes/SpineRuntime38/src/Attachments/AtlasAttachmentLoader.cs +++ b/SpineRuntimes/SpineRuntime38/Attachments/AtlasAttachmentLoader.cs @@ -29,7 +29,7 @@ using System; -namespace SpineRuntime38 { +namespace SpineRuntime38.Attachments { /// /// An AttachmentLoader that configures attachments using texture regions from an Atlas. diff --git a/SpineRuntimes/SpineRuntime38/src/Attachments/Attachment.cs b/SpineRuntimes/SpineRuntime38/Attachments/Attachment.cs similarity index 98% rename from SpineRuntimes/SpineRuntime38/src/Attachments/Attachment.cs rename to SpineRuntimes/SpineRuntime38/Attachments/Attachment.cs index 50896d8..a46cea0 100644 --- a/SpineRuntimes/SpineRuntime38/src/Attachments/Attachment.cs +++ b/SpineRuntimes/SpineRuntime38/Attachments/Attachment.cs @@ -29,7 +29,7 @@ using System; -namespace SpineRuntime38 { +namespace SpineRuntime38.Attachments { abstract public class Attachment { public string Name { get; private set; } diff --git a/SpineRuntimes/SpineRuntime38/src/Attachments/AttachmentLoader.cs b/SpineRuntimes/SpineRuntime38/Attachments/AttachmentLoader.cs similarity index 98% rename from SpineRuntimes/SpineRuntime38/src/Attachments/AttachmentLoader.cs rename to SpineRuntimes/SpineRuntime38/Attachments/AttachmentLoader.cs index 94f40d0..3cad2e8 100644 --- a/SpineRuntimes/SpineRuntime38/src/Attachments/AttachmentLoader.cs +++ b/SpineRuntimes/SpineRuntime38/Attachments/AttachmentLoader.cs @@ -27,7 +27,7 @@ * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -namespace SpineRuntime38 { +namespace SpineRuntime38.Attachments { public interface AttachmentLoader { /// May be null to not load any attachment. RegionAttachment NewRegionAttachment (Skin skin, string name, string path); diff --git a/SpineRuntimes/SpineRuntime38/src/Attachments/AttachmentType.cs b/SpineRuntimes/SpineRuntime38/Attachments/AttachmentType.cs similarity index 97% rename from SpineRuntimes/SpineRuntime38/src/Attachments/AttachmentType.cs rename to SpineRuntimes/SpineRuntime38/Attachments/AttachmentType.cs index 218b5df..ddc254a 100644 --- a/SpineRuntimes/SpineRuntime38/src/Attachments/AttachmentType.cs +++ b/SpineRuntimes/SpineRuntime38/Attachments/AttachmentType.cs @@ -27,7 +27,7 @@ * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -namespace SpineRuntime38 { +namespace SpineRuntime38.Attachments { public enum AttachmentType { Region, Boundingbox, Mesh, Linkedmesh, Path, Point, Clipping } diff --git a/SpineRuntimes/SpineRuntime38/src/Attachments/BoundingBoxAttachment.cs b/SpineRuntimes/SpineRuntime38/Attachments/BoundingBoxAttachment.cs similarity index 95% rename from SpineRuntimes/SpineRuntime38/src/Attachments/BoundingBoxAttachment.cs rename to SpineRuntimes/SpineRuntime38/Attachments/BoundingBoxAttachment.cs index d26d015..1f1d9a3 100644 --- a/SpineRuntimes/SpineRuntime38/src/Attachments/BoundingBoxAttachment.cs +++ b/SpineRuntimes/SpineRuntime38/Attachments/BoundingBoxAttachment.cs @@ -29,7 +29,7 @@ using System; -namespace SpineRuntime38 { +namespace SpineRuntime38.Attachments { /// Attachment that has a polygon for bounds checking. public class BoundingBoxAttachment : VertexAttachment { public BoundingBoxAttachment (string name) @@ -37,7 +37,7 @@ namespace SpineRuntime38 { } public override Attachment Copy () { - BoundingBoxAttachment copy = new BoundingBoxAttachment(this.Name); + BoundingBoxAttachment copy = new BoundingBoxAttachment(Name); CopyTo(copy); return copy; } diff --git a/SpineRuntimes/SpineRuntime38/src/Attachments/ClippingAttachment.cs b/SpineRuntimes/SpineRuntime38/Attachments/ClippingAttachment.cs similarity index 95% rename from SpineRuntimes/SpineRuntime38/src/Attachments/ClippingAttachment.cs rename to SpineRuntimes/SpineRuntime38/Attachments/ClippingAttachment.cs index 983f0a6..d9e28c9 100644 --- a/SpineRuntimes/SpineRuntime38/src/Attachments/ClippingAttachment.cs +++ b/SpineRuntimes/SpineRuntime38/Attachments/ClippingAttachment.cs @@ -29,7 +29,7 @@ using System; -namespace SpineRuntime38 { +namespace SpineRuntime38.Attachments { public class ClippingAttachment : VertexAttachment { internal SlotData endSlot; @@ -39,7 +39,7 @@ namespace SpineRuntime38 { } public override Attachment Copy () { - ClippingAttachment copy = new ClippingAttachment(this.Name); + ClippingAttachment copy = new ClippingAttachment(Name); CopyTo(copy); copy.endSlot = endSlot; return copy; diff --git a/SpineRuntimes/SpineRuntime38/src/Attachments/MeshAttachment.cs b/SpineRuntimes/SpineRuntime38/Attachments/MeshAttachment.cs similarity index 90% rename from SpineRuntimes/SpineRuntime38/src/Attachments/MeshAttachment.cs rename to SpineRuntimes/SpineRuntime38/Attachments/MeshAttachment.cs index 0dad3e7..bb28d8e 100644 --- a/SpineRuntimes/SpineRuntime38/src/Attachments/MeshAttachment.cs +++ b/SpineRuntimes/SpineRuntime38/Attachments/MeshAttachment.cs @@ -29,7 +29,7 @@ using System; -namespace SpineRuntime38 { +namespace SpineRuntime38.Attachments { /// Attachment that displays a texture region using a mesh. public class MeshAttachment : VertexAttachment, IHasRendererObject { internal float regionOffsetX, regionOffsetY, regionWidth, regionHeight, regionOriginalWidth, regionOriginalHeight; @@ -41,8 +41,8 @@ namespace SpineRuntime38 { public int HullLength { get { return hulllength; } set { hulllength = value; } } public float[] RegionUVs { get { return regionUVs; } set { regionUVs = value; } } - /// The UV pair for each vertex, normalized within the entire texture. - public float[] UVs { get { return uvs; } set { uvs = value; } } + /// The UV pair for each vertex, normalized within the entire texture. + public float[] UVs { get { return uvs; } set { uvs = value; } } public int[] Triangles { get { return triangles; } set { triangles = value; } } public float R { get { return r; } set { r = value; } } @@ -99,8 +99,8 @@ namespace SpineRuntime38 { float u = RegionU, v = RegionV, width = 0, height = 0; if (RegionDegrees == 90) { - float textureHeight = this.regionWidth / (RegionV2 - RegionV); - float textureWidth = this.regionHeight / (RegionU2 - RegionU); + float textureHeight = regionWidth / (RegionV2 - RegionV); + float textureWidth = regionHeight / (RegionU2 - RegionU); u -= (RegionOriginalHeight - RegionOffsetY - RegionHeight) / textureWidth; v -= (RegionOriginalWidth - RegionOffsetX - RegionWidth) / textureHeight; width = RegionOriginalHeight / textureWidth; @@ -111,8 +111,8 @@ namespace SpineRuntime38 { uvs[i + 1] = v + (1 - regionUVs[i]) * height; } } else if (RegionDegrees == 180) { - float textureWidth = this.regionWidth / (RegionU2 - RegionU); - float textureHeight = this.regionHeight / (RegionV2 - RegionV); + float textureWidth = regionWidth / (RegionU2 - RegionU); + float textureHeight = regionHeight / (RegionV2 - RegionV); u -= (RegionOriginalWidth - RegionOffsetX - RegionWidth) / textureWidth; v -= RegionOffsetY / textureHeight; width = RegionOriginalWidth / textureWidth; @@ -123,8 +123,8 @@ namespace SpineRuntime38 { uvs[i + 1] = v + (1 - regionUVs[i + 1]) * height; } } else if (RegionDegrees == 270) { - float textureWidth = this.regionWidth / (RegionU2 - RegionU); - float textureHeight = this.regionHeight / (RegionV2 - RegionV); + float textureWidth = regionWidth / (RegionU2 - RegionU); + float textureHeight = regionHeight / (RegionV2 - RegionV); u -= RegionOffsetY / textureWidth; v -= RegionOffsetX / textureHeight; width = RegionOriginalHeight / textureWidth; @@ -135,8 +135,8 @@ namespace SpineRuntime38 { uvs[i + 1] = v + regionUVs[i] * height; } } else { - float textureWidth = this.regionWidth / (RegionU2 - RegionU); - float textureHeight = this.regionHeight / (RegionV2 - RegionV); + float textureWidth = regionWidth / (RegionU2 - RegionU); + float textureHeight = regionHeight / (RegionV2 - RegionV); u -= RegionOffsetX / textureWidth; v -= (RegionOriginalHeight - RegionOffsetY - RegionHeight) / textureHeight; width = RegionOriginalWidth / textureWidth; @@ -152,7 +152,7 @@ namespace SpineRuntime38 { public override Attachment Copy () { if (parentMesh != null) return NewLinkedMesh(); - MeshAttachment copy = new MeshAttachment(this.Name); + MeshAttachment copy = new MeshAttachment(Name); copy.RendererObject = RendererObject; copy.regionOffsetX = regionOffsetX; copy.regionOffsetY = regionOffsetY; diff --git a/SpineRuntimes/SpineRuntime38/src/Attachments/PathAttachment.cs b/SpineRuntimes/SpineRuntime38/Attachments/PathAttachment.cs similarity index 95% rename from SpineRuntimes/SpineRuntime38/src/Attachments/PathAttachment.cs rename to SpineRuntimes/SpineRuntime38/Attachments/PathAttachment.cs index 7f5b00b..0103f01 100644 --- a/SpineRuntimes/SpineRuntime38/src/Attachments/PathAttachment.cs +++ b/SpineRuntimes/SpineRuntime38/Attachments/PathAttachment.cs @@ -30,7 +30,7 @@ using System; using System.Collections.Generic; -namespace SpineRuntime38 { +namespace SpineRuntime38.Attachments { public class PathAttachment : VertexAttachment { internal float[] lengths; internal bool closed, constantSpeed; @@ -40,12 +40,12 @@ namespace SpineRuntime38 { public bool Closed { get { return closed; } set { closed = value; } } public bool ConstantSpeed { get { return constantSpeed; } set { constantSpeed = value; } } - public PathAttachment (String name) + public PathAttachment (string name) : base(name) { } public override Attachment Copy () { - PathAttachment copy = new PathAttachment(this.Name); + PathAttachment copy = new PathAttachment(Name); CopyTo(copy); copy.lengths = new float[lengths.Length]; Array.Copy(lengths, 0, copy.lengths, 0, lengths.Length); diff --git a/SpineRuntimes/SpineRuntime38/src/Attachments/PointAttachment.cs b/SpineRuntimes/SpineRuntime38/Attachments/PointAttachment.cs similarity index 95% rename from SpineRuntimes/SpineRuntime38/src/Attachments/PointAttachment.cs rename to SpineRuntimes/SpineRuntime38/Attachments/PointAttachment.cs index 4524823..d1beb42 100644 --- a/SpineRuntimes/SpineRuntime38/src/Attachments/PointAttachment.cs +++ b/SpineRuntimes/SpineRuntime38/Attachments/PointAttachment.cs @@ -27,7 +27,7 @@ * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -namespace SpineRuntime38 { +namespace SpineRuntime38.Attachments { /// /// An attachment which is a single point and a rotation. This can be used to spawn projectiles, particles, etc. A bone can be /// used in similar ways, but a PointAttachment is slightly less expensive to compute and can be hidden, shown, and placed in a @@ -46,7 +46,7 @@ namespace SpineRuntime38 { } public void ComputeWorldPosition (Bone bone, out float ox, out float oy) { - bone.LocalToWorld(this.x, this.y, out ox, out oy); + bone.LocalToWorld(x, y, out ox, out oy); } public float ComputeWorldRotation (Bone bone) { @@ -57,7 +57,7 @@ namespace SpineRuntime38 { } public override Attachment Copy () { - PointAttachment copy = new PointAttachment(this.Name); + PointAttachment copy = new PointAttachment(Name); copy.x = x; copy.y = y; copy.rotation = rotation; diff --git a/SpineRuntimes/SpineRuntime38/src/Attachments/RegionAttachment.cs b/SpineRuntimes/SpineRuntime38/Attachments/RegionAttachment.cs similarity index 98% rename from SpineRuntimes/SpineRuntime38/src/Attachments/RegionAttachment.cs rename to SpineRuntimes/SpineRuntime38/Attachments/RegionAttachment.cs index 67b8285..a80f604 100644 --- a/SpineRuntimes/SpineRuntime38/src/Attachments/RegionAttachment.cs +++ b/SpineRuntimes/SpineRuntime38/Attachments/RegionAttachment.cs @@ -29,7 +29,7 @@ using System; -namespace SpineRuntime38 { +namespace SpineRuntime38.Attachments { /// Attachment that displays a texture region. public class RegionAttachment : Attachment, IHasRendererObject { public const int BLX = 0; @@ -180,7 +180,7 @@ namespace SpineRuntime38 { } public override Attachment Copy () { - RegionAttachment copy = new RegionAttachment(this.Name); + RegionAttachment copy = new RegionAttachment(Name); copy.RendererObject = RendererObject; copy.regionOffsetX = regionOffsetX; copy.regionOffsetY = regionOffsetY; diff --git a/SpineRuntimes/SpineRuntime38/src/Attachments/VertexAttachment.cs b/SpineRuntimes/SpineRuntime38/Attachments/VertexAttachment.cs similarity index 97% rename from SpineRuntimes/SpineRuntime38/src/Attachments/VertexAttachment.cs rename to SpineRuntimes/SpineRuntime38/Attachments/VertexAttachment.cs index e5d053e..46279ed 100644 --- a/SpineRuntimes/SpineRuntime38/src/Attachments/VertexAttachment.cs +++ b/SpineRuntimes/SpineRuntime38/Attachments/VertexAttachment.cs @@ -29,12 +29,12 @@ using System; -namespace SpineRuntime38 { +namespace SpineRuntime38.Attachments { /// >An attachment with vertices that are transformed by one or more bones and can be deformed by a slot's /// . public abstract class VertexAttachment : Attachment { static int nextID = 0; - static readonly Object nextIdLock = new Object(); + static readonly object nextIdLock = new object(); internal readonly int id; internal int[] bones; @@ -55,8 +55,8 @@ namespace SpineRuntime38 { : base(name) { deformAttachment = this; - lock (VertexAttachment.nextIdLock) { - id = (VertexAttachment.nextID++ & 65535) << 11; + lock (nextIdLock) { + id = (nextID++ & 65535) << 11; } } diff --git a/SpineRuntimes/SpineRuntime38/src/BlendMode.cs b/SpineRuntimes/SpineRuntime38/BlendMode.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/BlendMode.cs rename to SpineRuntimes/SpineRuntime38/BlendMode.cs diff --git a/SpineRuntimes/SpineRuntime38/src/Bone.cs b/SpineRuntimes/SpineRuntime38/Bone.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/Bone.cs rename to SpineRuntimes/SpineRuntime38/Bone.cs diff --git a/SpineRuntimes/SpineRuntime38/src/BoneData.cs b/SpineRuntimes/SpineRuntime38/BoneData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/BoneData.cs rename to SpineRuntimes/SpineRuntime38/BoneData.cs diff --git a/SpineRuntimes/SpineRuntime38/src/Collections/OrderedDictionary.cs b/SpineRuntimes/SpineRuntime38/Collections/OrderedDictionary.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/Collections/OrderedDictionary.cs rename to SpineRuntimes/SpineRuntime38/Collections/OrderedDictionary.cs diff --git a/SpineRuntimes/SpineRuntime38/src/ConstraintData.cs b/SpineRuntimes/SpineRuntime38/ConstraintData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/ConstraintData.cs rename to SpineRuntimes/SpineRuntime38/ConstraintData.cs diff --git a/SpineRuntimes/SpineRuntime38/src/Event.cs b/SpineRuntimes/SpineRuntime38/Event.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/Event.cs rename to SpineRuntimes/SpineRuntime38/Event.cs diff --git a/SpineRuntimes/SpineRuntime38/src/EventData.cs b/SpineRuntimes/SpineRuntime38/EventData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/EventData.cs rename to SpineRuntimes/SpineRuntime38/EventData.cs diff --git a/SpineRuntimes/SpineRuntime38/src/ExposedList.cs b/SpineRuntimes/SpineRuntime38/ExposedList.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/ExposedList.cs rename to SpineRuntimes/SpineRuntime38/ExposedList.cs diff --git a/SpineRuntimes/SpineRuntime38/src/IUpdatable.cs b/SpineRuntimes/SpineRuntime38/IUpdatable.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/IUpdatable.cs rename to SpineRuntimes/SpineRuntime38/IUpdatable.cs diff --git a/SpineRuntimes/SpineRuntime38/src/IkConstraint.cs b/SpineRuntimes/SpineRuntime38/IkConstraint.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/IkConstraint.cs rename to SpineRuntimes/SpineRuntime38/IkConstraint.cs diff --git a/SpineRuntimes/SpineRuntime38/src/IkConstraintData.cs b/SpineRuntimes/SpineRuntime38/IkConstraintData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/IkConstraintData.cs rename to SpineRuntimes/SpineRuntime38/IkConstraintData.cs diff --git a/SpineRuntimes/SpineRuntime38/src/Json.cs b/SpineRuntimes/SpineRuntime38/Json.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/Json.cs rename to SpineRuntimes/SpineRuntime38/Json.cs diff --git a/SpineRuntimes/SpineRuntime38/src/MathUtils.cs b/SpineRuntimes/SpineRuntime38/MathUtils.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/MathUtils.cs rename to SpineRuntimes/SpineRuntime38/MathUtils.cs diff --git a/SpineRuntimes/SpineRuntime38/src/PathConstraint.cs b/SpineRuntimes/SpineRuntime38/PathConstraint.cs similarity index 99% rename from SpineRuntimes/SpineRuntime38/src/PathConstraint.cs rename to SpineRuntimes/SpineRuntime38/PathConstraint.cs index 21ec55a..1c7141f 100644 --- a/SpineRuntimes/SpineRuntime38/src/PathConstraint.cs +++ b/SpineRuntimes/SpineRuntime38/PathConstraint.cs @@ -27,6 +27,7 @@ * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ +using SpineRuntime38.Attachments; using System; namespace SpineRuntime38 { diff --git a/SpineRuntimes/SpineRuntime38/src/PathConstraintData.cs b/SpineRuntimes/SpineRuntime38/PathConstraintData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/PathConstraintData.cs rename to SpineRuntimes/SpineRuntime38/PathConstraintData.cs diff --git a/SpineRuntimes/SpineRuntime38/src/Skeleton.cs b/SpineRuntimes/SpineRuntime38/Skeleton.cs similarity index 99% rename from SpineRuntimes/SpineRuntime38/src/Skeleton.cs rename to SpineRuntimes/SpineRuntime38/Skeleton.cs index 9f381ef..4b47340 100644 --- a/SpineRuntimes/SpineRuntime38/src/Skeleton.cs +++ b/SpineRuntimes/SpineRuntime38/Skeleton.cs @@ -27,6 +27,7 @@ * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ +using SpineRuntime38.Attachments; using System; using System.Collections.Generic; diff --git a/SpineRuntimes/SpineRuntime38/src/SkeletonBinary.cs b/SpineRuntimes/SpineRuntime38/SkeletonBinary.cs similarity index 99% rename from SpineRuntimes/SpineRuntime38/src/SkeletonBinary.cs rename to SpineRuntimes/SpineRuntime38/SkeletonBinary.cs index 633e008..46471e8 100644 --- a/SpineRuntimes/SpineRuntime38/src/SkeletonBinary.cs +++ b/SpineRuntimes/SpineRuntime38/SkeletonBinary.cs @@ -34,6 +34,7 @@ using System; using System.IO; using System.Collections.Generic; +using SpineRuntime38.Attachments; #if WINDOWS_STOREAPP using System.Threading.Tasks; diff --git a/SpineRuntimes/SpineRuntime38/src/SkeletonBounds.cs b/SpineRuntimes/SpineRuntime38/SkeletonBounds.cs similarity index 99% rename from SpineRuntimes/SpineRuntime38/src/SkeletonBounds.cs rename to SpineRuntimes/SpineRuntime38/SkeletonBounds.cs index 7db316b..e6aa15f 100644 --- a/SpineRuntimes/SpineRuntime38/src/SkeletonBounds.cs +++ b/SpineRuntimes/SpineRuntime38/SkeletonBounds.cs @@ -27,6 +27,7 @@ * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ +using SpineRuntime38.Attachments; using System; namespace SpineRuntime38 { diff --git a/SpineRuntimes/SpineRuntime38/src/SkeletonClipping.cs b/SpineRuntimes/SpineRuntime38/SkeletonClipping.cs similarity index 99% rename from SpineRuntimes/SpineRuntime38/src/SkeletonClipping.cs rename to SpineRuntimes/SpineRuntime38/SkeletonClipping.cs index 12e27ca..9abca4b 100644 --- a/SpineRuntimes/SpineRuntime38/src/SkeletonClipping.cs +++ b/SpineRuntimes/SpineRuntime38/SkeletonClipping.cs @@ -27,6 +27,7 @@ * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ +using SpineRuntime38.Attachments; using System; namespace SpineRuntime38 { diff --git a/SpineRuntimes/SpineRuntime38/src/SkeletonData.cs b/SpineRuntimes/SpineRuntime38/SkeletonData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/SkeletonData.cs rename to SpineRuntimes/SpineRuntime38/SkeletonData.cs diff --git a/SpineRuntimes/SpineRuntime38/src/SkeletonJson.cs b/SpineRuntimes/SpineRuntime38/SkeletonJson.cs similarity index 99% rename from SpineRuntimes/SpineRuntime38/src/SkeletonJson.cs rename to SpineRuntimes/SpineRuntime38/SkeletonJson.cs index cf0c26c..dba5f7d 100644 --- a/SpineRuntimes/SpineRuntime38/src/SkeletonJson.cs +++ b/SpineRuntimes/SpineRuntime38/SkeletonJson.cs @@ -34,6 +34,7 @@ using System; using System.IO; using System.Collections.Generic; +using SpineRuntime38.Attachments; #if WINDOWS_STOREAPP using System.Threading.Tasks; diff --git a/SpineRuntimes/SpineRuntime38/src/Skin.cs b/SpineRuntimes/SpineRuntime38/Skin.cs similarity index 99% rename from SpineRuntimes/SpineRuntime38/src/Skin.cs rename to SpineRuntimes/SpineRuntime38/Skin.cs index 269811e..e53e722 100644 --- a/SpineRuntimes/SpineRuntime38/src/Skin.cs +++ b/SpineRuntimes/SpineRuntime38/Skin.cs @@ -27,6 +27,7 @@ * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ +using SpineRuntime38.Attachments; using System; using System.Collections; using System.Collections.Generic; diff --git a/SpineRuntimes/SpineRuntime38/src/Slot.cs b/SpineRuntimes/SpineRuntime38/Slot.cs similarity index 99% rename from SpineRuntimes/SpineRuntime38/src/Slot.cs rename to SpineRuntimes/SpineRuntime38/Slot.cs index fe4b6c4..d63d07c 100644 --- a/SpineRuntimes/SpineRuntime38/src/Slot.cs +++ b/SpineRuntimes/SpineRuntime38/Slot.cs @@ -27,6 +27,7 @@ * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ +using SpineRuntime38.Attachments; using System; namespace SpineRuntime38 { diff --git a/SpineRuntimes/SpineRuntime38/src/SlotData.cs b/SpineRuntimes/SpineRuntime38/SlotData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/SlotData.cs rename to SpineRuntimes/SpineRuntime38/SlotData.cs diff --git a/SpineRuntimes/SpineRuntime38/src/TransformConstraint.cs b/SpineRuntimes/SpineRuntime38/TransformConstraint.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/TransformConstraint.cs rename to SpineRuntimes/SpineRuntime38/TransformConstraint.cs diff --git a/SpineRuntimes/SpineRuntime38/src/TransformConstraintData.cs b/SpineRuntimes/SpineRuntime38/TransformConstraintData.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/TransformConstraintData.cs rename to SpineRuntimes/SpineRuntime38/TransformConstraintData.cs diff --git a/SpineRuntimes/SpineRuntime38/src/Triangulator.cs b/SpineRuntimes/SpineRuntime38/Triangulator.cs similarity index 100% rename from SpineRuntimes/SpineRuntime38/src/Triangulator.cs rename to SpineRuntimes/SpineRuntime38/Triangulator.cs diff --git a/SpineViewer/src/BatchOpenSpineDialog.Designer.cs b/SpineViewer/BatchOpenSpineDialog.Designer.cs similarity index 100% rename from SpineViewer/src/BatchOpenSpineDialog.Designer.cs rename to SpineViewer/BatchOpenSpineDialog.Designer.cs diff --git a/SpineViewer/src/BatchOpenSpineDialog.cs b/SpineViewer/BatchOpenSpineDialog.cs similarity index 100% rename from SpineViewer/src/BatchOpenSpineDialog.cs rename to SpineViewer/BatchOpenSpineDialog.cs diff --git a/SpineViewer/src/BatchOpenSpineDialog.resx b/SpineViewer/BatchOpenSpineDialog.resx similarity index 100% rename from SpineViewer/src/BatchOpenSpineDialog.resx rename to SpineViewer/BatchOpenSpineDialog.resx diff --git a/SpineViewer/src/MainForm.Designer.cs b/SpineViewer/MainForm.Designer.cs similarity index 100% rename from SpineViewer/src/MainForm.Designer.cs rename to SpineViewer/MainForm.Designer.cs diff --git a/SpineViewer/src/MainForm.cs b/SpineViewer/MainForm.cs similarity index 79% rename from SpineViewer/src/MainForm.cs rename to SpineViewer/MainForm.cs index b1fc9d2..525e81f 100644 --- a/SpineViewer/src/MainForm.cs +++ b/SpineViewer/MainForm.cs @@ -41,6 +41,11 @@ namespace SpineViewer LogManager.ReconfigExistingLoggers(); } + private void ExportPng_Work(object? sender, DoWorkEventArgs e) + { + + } + private void MainForm_Load(object sender, EventArgs e) { spinePreviewer.StartPreview(); @@ -63,11 +68,23 @@ namespace SpineViewer private void toolStripMenuItem_Export_Click(object sender, EventArgs e) { - Program.Logger.Debug("Debug Test"); - Program.Logger.Info("Info Test"); - Program.Logger.Warn("Warn Test"); - Program.Logger.Error("Error Test"); - Program.Logger.Fatal("Fatal Test"); + lock (spineListView.Spines) + { + if (spineListView.Spines.Count <= 0) + { + MessageBox.Show("请至少打开一个骨骼文件", "提示信息", MessageBoxButtons.OK, MessageBoxIcon.Information); + return; + } + } + + //var openDialog = new BatchOpenSpineDialog(); + //if (openDialog.ShowDialog() != DialogResult.OK) + // return; + + //var progressDialog = new ProgressDialog(); + //progressDialog.DoWork += ExportPng_Work; + //progressDialog.RunWorkerAsync(new { openDialog.SkelPaths, openDialog.Version }); + //progressDialog.ShowDialog(); } private void toolStripMenuItem_Exit_Click(object sender, EventArgs e) diff --git a/SpineViewer/src/MainForm.resx b/SpineViewer/MainForm.resx similarity index 100% rename from SpineViewer/src/MainForm.resx rename to SpineViewer/MainForm.resx diff --git a/SpineViewer/src/OpenSpineDialog.Designer.cs b/SpineViewer/OpenSpineDialog.Designer.cs similarity index 100% rename from SpineViewer/src/OpenSpineDialog.Designer.cs rename to SpineViewer/OpenSpineDialog.Designer.cs diff --git a/SpineViewer/src/OpenSpineDialog.cs b/SpineViewer/OpenSpineDialog.cs similarity index 100% rename from SpineViewer/src/OpenSpineDialog.cs rename to SpineViewer/OpenSpineDialog.cs diff --git a/SpineViewer/src/OpenSpineDialog.resx b/SpineViewer/OpenSpineDialog.resx similarity index 100% rename from SpineViewer/src/OpenSpineDialog.resx rename to SpineViewer/OpenSpineDialog.resx diff --git a/SpineViewer/src/Program.cs b/SpineViewer/Program.cs similarity index 100% rename from SpineViewer/src/Program.cs rename to SpineViewer/Program.cs diff --git a/SpineViewer/src/ProgressDialog.Designer.cs b/SpineViewer/ProgressDialog.Designer.cs similarity index 100% rename from SpineViewer/src/ProgressDialog.Designer.cs rename to SpineViewer/ProgressDialog.Designer.cs diff --git a/SpineViewer/src/ProgressDialog.cs b/SpineViewer/ProgressDialog.cs similarity index 100% rename from SpineViewer/src/ProgressDialog.cs rename to SpineViewer/ProgressDialog.cs diff --git a/SpineViewer/src/ProgressDialog.resx b/SpineViewer/ProgressDialog.resx similarity index 100% rename from SpineViewer/src/ProgressDialog.resx rename to SpineViewer/ProgressDialog.resx diff --git a/SpineViewer/src/Spine/BlendMode.cs b/SpineViewer/Spine/BlendMode.cs similarity index 100% rename from SpineViewer/src/Spine/BlendMode.cs rename to SpineViewer/Spine/BlendMode.cs diff --git a/SpineViewer/src/Spine/Implementations/Spine36.cs b/SpineViewer/Spine/Implementations/Spine36.cs similarity index 100% rename from SpineViewer/src/Spine/Implementations/Spine36.cs rename to SpineViewer/Spine/Implementations/Spine36.cs diff --git a/SpineViewer/src/Spine/Implementations/Spine38.cs b/SpineViewer/Spine/Implementations/Spine38.cs similarity index 99% rename from SpineViewer/src/Spine/Implementations/Spine38.cs rename to SpineViewer/Spine/Implementations/Spine38.cs index d0f3abf..6a595ab 100644 --- a/SpineViewer/src/Spine/Implementations/Spine38.cs +++ b/SpineViewer/Spine/Implementations/Spine38.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using SpineRuntime38; +using SpineRuntime38.Attachments; using SpineViewer.Spine; namespace SpineViewer.Spine.Implementations diff --git a/SpineViewer/src/Spine/Spine.cs b/SpineViewer/Spine/Spine.cs similarity index 100% rename from SpineViewer/src/Spine/Spine.cs rename to SpineViewer/Spine/Spine.cs diff --git a/SpineViewer/src/Spine/TypeConverter.cs b/SpineViewer/Spine/TypeConverter.cs similarity index 100% rename from SpineViewer/src/Spine/TypeConverter.cs rename to SpineViewer/Spine/TypeConverter.cs diff --git a/SpineViewer/src/Spine/Version.cs b/SpineViewer/Spine/Version.cs similarity index 100% rename from SpineViewer/src/Spine/Version.cs rename to SpineViewer/Spine/Version.cs diff --git a/SpineViewer/src/SpineListView.Designer.cs b/SpineViewer/SpineListView.Designer.cs similarity index 100% rename from SpineViewer/src/SpineListView.Designer.cs rename to SpineViewer/SpineListView.Designer.cs diff --git a/SpineViewer/src/SpineListView.cs b/SpineViewer/SpineListView.cs similarity index 100% rename from SpineViewer/src/SpineListView.cs rename to SpineViewer/SpineListView.cs diff --git a/SpineViewer/src/SpineListView.resx b/SpineViewer/SpineListView.resx similarity index 100% rename from SpineViewer/src/SpineListView.resx rename to SpineViewer/SpineListView.resx diff --git a/SpineViewer/src/SpinePreviewer.Designer.cs b/SpineViewer/SpinePreviewer.Designer.cs similarity index 100% rename from SpineViewer/src/SpinePreviewer.Designer.cs rename to SpineViewer/SpinePreviewer.Designer.cs diff --git a/SpineViewer/src/SpinePreviewer.cs b/SpineViewer/SpinePreviewer.cs similarity index 100% rename from SpineViewer/src/SpinePreviewer.cs rename to SpineViewer/SpinePreviewer.cs diff --git a/SpineViewer/src/SpinePreviewer.resx b/SpineViewer/SpinePreviewer.resx similarity index 100% rename from SpineViewer/src/SpinePreviewer.resx rename to SpineViewer/SpinePreviewer.resx diff --git a/SpineViewer/src/TypeConverter.cs b/SpineViewer/TypeConverter.cs similarity index 100% rename from SpineViewer/src/TypeConverter.cs rename to SpineViewer/TypeConverter.cs