diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 000000000..06b8b15cd --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,3 @@ +[3.6.x] +- [c] Modified kvec.h used by SkeletonBinary.c to use Spine's MALLOC/FREE macros. That way there's only one place + to inject custom allocators (extension.h) https://github.com/EsotericSoftware/spine-runtimes/commit/c2cfbc6cb8709daa082726222d558188d75a004f \ No newline at end of file diff --git a/spine-c/spine-c/src/spine/kvec.h b/spine-c/spine-c/src/spine/kvec.h index 99f49ccb1..f40e8bb95 100644 --- a/spine-c/spine-c/src/spine/kvec.h +++ b/spine-c/spine-c/src/spine/kvec.h @@ -1,92 +1,105 @@ -/* The MIT License - - Copyright (c) 2008, by Attractive Chaos - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*/ - -/* - An example: - -#include "kvec.h" -int main() { - kvec_t(int) array; - kv_init(array); - kv_push(int, array, 10); // append - kv_a(int, array, 20) = 5; // dynamic - kv_A(array, 20) = 4; // static - kv_destroy(array); - return 0; -} -*/ - -/* - 2008-09-22 (0.1.0): - - * The initial version. - -*/ - -#ifndef AC_KVEC_H -#define AC_KVEC_H - -#include - -#define kv_roundup32(x) (--(x), (x)|=(x)>>1, (x)|=(x)>>2, (x)|=(x)>>4, (x)|=(x)>>8, (x)|=(x)>>16, ++(x)) - -#define kvec_t(type) struct { size_t n, m; type *a; } -#define kv_init(v) ((v).n = (v).m = 0, (v).a = 0) -#define kv_destroy(v) free((v).a) -#define kv_A(v, i) ((v).a[(i)]) -#define kv_array(v) ((v).a) -#define kv_pop(v) ((v).a[--(v).n]) -#define kv_size(v) ((v).n) -#define kv_max(v) ((v).m) - -#define kv_resize(type, v, s) ((v).m = (s), (v).a = (type*)realloc((v).a, sizeof(type) * (v).m)) -#define kv_trim(type, v) (kv_resize(type, (v), kv_size(v))) - -#define kv_copy(type, v1, v0) do { \ - if ((v1).m < (v0).n) kv_resize(type, v1, (v0).n); \ - (v1).n = (v0).n; \ - memcpy((v1).a, (v0).a, sizeof(type) * (v0).n); \ - } while (0) \ - -#define kv_push(type, v, x) do { \ - if ((v).n == (v).m) { \ - (v).m = (v).m? (v).m<<1 : 2; \ - (v).a = (type*)realloc((v).a, sizeof(type) * (v).m); \ - } \ - (v).a[(v).n++] = (x); \ - } while (0) - -#define kv_pushp(type, v) (((v).n == (v).m)? \ - ((v).m = ((v).m? (v).m<<1 : 2), \ - (v).a = (type*)realloc((v).a, sizeof(type) * (v).m), 0) \ - : 0), ((v).a + ((v).n++)) - -#define kv_a(type, v, i) (((v).m <= (size_t)(i)? \ - ((v).m = (v).n = (i) + 1, kv_roundup32((v).m), \ - (v).a = (type*)realloc((v).a, sizeof(type) * (v).m), 0) \ - : (v).n <= (size_t)(i)? (v).n = (i) + 1 \ - : 0), (v).a[(i)]) - -#endif +/* The MIT License + + Copyright (c) 2008, by Attractive Chaos + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +/* + An example: + +#include "kvec.h" +int main() { + kvec_t(int) array; + kv_init(array); + kv_push(int, array, 10); // append + kv_a(int, array, 20) = 5; // dynamic + kv_A(array, 20) = 4; // static + kv_destroy(array); + return 0; +} +*/ + +/* + 2008-09-22 (0.1.0): + + * The initial version. + + 2017-19-18 (0.1.1): + + Spine Special Edition + * Made helper macros for alloc, free and memcpy, which can be overridden. + * Made these helpers point to the Spine C Runtime alloc and free functions by default + * Reimplemented kv_resize to use alloc and free instead of realloc + * Changed kv_push to use kv_resize instead of realloc + * Removed kv_pushp and kv_a macros because the weren't used + * Removed stdlib include +*/ + +#ifndef AC_KVEC_H +#define AC_KVEC_H + +#ifndef _kv_free +#define _kv_free(type, p) (FREE(p)) +#endif + +#ifndef _kv_alloc +#define _kv_alloc(type, s) ((type*)(MALLOC(type, (s)))) +#endif + +#ifndef _kv_copy +#define _kv_copy(type, d, s, n) memcpy((d), (s), sizeof(type) * (n)) +#endif + +#define kv_roundup32(x) (--(x), (x)|=(x)>>1, (x)|=(x)>>2, (x)|=(x)>>4, (x)|=(x)>>8, (x)|=(x)>>16, ++(x)) + +#define kvec_t(type) struct { size_t n, m; type *a; } +#define kv_init(v) ((v).n = (v).m = 0, (v).a = 0) +#define kv_destroy(v) _kv_free(type, (v).a) +#define kv_A(v, i) ((v).a[(i)]) +#define kv_array(v) ((v).a) +#define kv_pop(v) ((v).a[--(v).n]) +#define kv_size(v) ((v).n) +#define kv_max(v) ((v).m) + +#define kv_resize(type, v, s) do { \ + type* b = _kv_alloc(type, (s)); \ + if (((s) > 0) && ((v).m > 0)) \ + _kv_copy(type, b, (v).a, ((s) < (v).m)? (s) : (v).m); \ + _kv_free(type, (v).a); \ + (v).a = b; (v).m = (s); \ + } while (0) + +#define kv_trim(type, v) kv_resize(type, (v), kv_size(v)) + +#define kv_copy(type, v1, v0) do { \ + if ((v1).m < (v0).n) kv_resize(type, v1, (v0).n); \ + (v1).n = (v0).n; \ + _kv_copy(type, (v1).a, (v0).a, (v0).n); \ + } while (0) \ + +#define kv_push(type, v, x) do { \ + if ((v).n == (v).m) \ + kv_resize(type, (v), ((v).m? (v).m<<1 : 2)); \ + (v).a[(v).n++] = (x); \ + } while (0) + +#endif diff --git a/spine-unity/Assets/spine-unity/Mesh Generation/Arrays/ArraysSubmeshSetMeshGenerator.cs b/spine-unity/Assets/spine-unity/Mesh Generation/Arrays/ArraysSubmeshSetMeshGenerator.cs index 0e228a24f..9c0e6e11a 100644 --- a/spine-unity/Assets/spine-unity/Mesh Generation/Arrays/ArraysSubmeshSetMeshGenerator.cs +++ b/spine-unity/Assets/spine-unity/Mesh Generation/Arrays/ArraysSubmeshSetMeshGenerator.cs @@ -42,7 +42,14 @@ namespace Spine.Unity.MeshGeneration { readonly ExposedList submeshBuffers = new ExposedList(); Material[] sharedMaterials = new Material[0]; - public MeshAndMaterials GenerateMesh (ExposedList instructions, int startSubmesh, int endSubmesh) { + /// + /// Generates a mesh based on a subset of instructions. + /// + /// A UnityEngine.Mesh. + /// A list of SubmeshInstructions. + /// The index of the starting submesh. + /// The exclusive upper bound of the last submesh to be included. + public MeshAndMaterials GenerateMesh (ExposedList instructions, int startSubmesh, int endSubmesh, float scale = 1f) { // STEP 0: Prepare instructions. var paramItems = instructions.Items; currentInstructions.Clear(false); @@ -122,6 +129,15 @@ namespace Spine.Unity.MeshGeneration { this.sharedMaterials = currentInstructions.GetUpdatedMaterialArray(this.sharedMaterials); } + if (scale != 1f) { + for (int i = 0; i < vertexCount; i++) { + meshVertices[i].x *= scale; + meshVertices[i].y *= scale; + //meshVertices[i].z *= scale; + } + + } + // STEP 3: Assign the buffers into the Mesh. smartMesh.Set(this.meshVertices, this.meshUVs, this.meshColors32, workingAttachments, currentInstructions); mesh.bounds = ArraysMeshGenerator.ToBounds(meshBoundsMin, meshBoundsMax); diff --git a/spine-unity/Assets/spine-unity/Mesh Generation/Arrays/ArraysSubmeshedMeshGenerator.cs b/spine-unity/Assets/spine-unity/Mesh Generation/Arrays/ArraysSubmeshedMeshGenerator.cs index 85332491c..691d2e3be 100644 --- a/spine-unity/Assets/spine-unity/Mesh Generation/Arrays/ArraysSubmeshedMeshGenerator.cs +++ b/spine-unity/Assets/spine-unity/Mesh Generation/Arrays/ArraysSubmeshedMeshGenerator.cs @@ -41,6 +41,7 @@ namespace Spine.Unity.MeshGeneration { public List Separators { get { return this.separators; } } #region Settings + // ArraysMeshGenerator.PremultiplyAlpha public float ZSpacing { get; set; } #endregion diff --git a/spine-unity/Assets/spine-unity/Mesh Generation/ISubmeshedMeshGenerator.cs b/spine-unity/Assets/spine-unity/Mesh Generation/ISubmeshedMeshGenerator.cs index eb0c8e4d7..988dac63b 100644 --- a/spine-unity/Assets/spine-unity/Mesh Generation/ISubmeshedMeshGenerator.cs +++ b/spine-unity/Assets/spine-unity/Mesh Generation/ISubmeshedMeshGenerator.cs @@ -44,6 +44,7 @@ namespace Spine.Unity.MeshGeneration { List Separators { get; } float ZSpacing { get; set; } + bool PremultiplyVertexColors { get; set; } bool AddNormals { get; set; } bool AddTangents { get; set; } } @@ -55,7 +56,7 @@ namespace Spine.Unity.MeshGeneration { // Step 3: Call GenerateMesh. You'll get a Mesh and Materials. // Step 4: Put the Mesh in MeshFilter. Put the Materials in MeshRenderer.sharedMaterials. public interface ISubmeshSetMeshGenerator { - MeshAndMaterials GenerateMesh (ExposedList instructions, int startSubmesh, int endSubmesh); + MeshAndMaterials GenerateMesh (ExposedList instructions, int startSubmesh, int endSubmesh, float scale = 1f); float ZSpacing { get; set; } bool PremultiplyVertexColors { get; set; } diff --git a/spine-unity/Assets/spine-unity/SkeletonAnimation.cs b/spine-unity/Assets/spine-unity/SkeletonAnimation.cs index 121443c60..bdf5e072e 100644 --- a/spine-unity/Assets/spine-unity/SkeletonAnimation.cs +++ b/spine-unity/Assets/spine-unity/SkeletonAnimation.cs @@ -163,11 +163,11 @@ namespace Spine.Unity { #endif } - public virtual void Update () { + public void Update () { Update(Time.deltaTime); } - public virtual void Update (float deltaTime) { + public void Update (float deltaTime) { if (!valid) return; diff --git a/spine-unity/Assets/spine-unity/SkeletonAnimator.cs b/spine-unity/Assets/spine-unity/SkeletonAnimator.cs index f4d95eb02..05e6359d6 100644 --- a/spine-unity/Assets/spine-unity/SkeletonAnimator.cs +++ b/spine-unity/Assets/spine-unity/SkeletonAnimator.cs @@ -83,7 +83,7 @@ namespace Spine.Unity { animationTable.Add(a.Name.GetHashCode(), a); } - void Update () { + public void Update () { if (!valid) return; if (layerMixModes.Length < animator.layerCount)