UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Final MSVC touches.

Browse Source
This commit is contained in:
badlogic 2018-05-24 17:26:37 +02:00
parent 2bd8dc7326
commit 89f116ae82
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-c/spine-c/include/spine/extension.h
View File

@ -63,6 +63,11 @@
#include <spine/dll.h> #include <spine/dll.h>
// Required for sprintf and consorts on MSVC
#ifdef _MSC_VER
#pragma warning(disable:4996)
#endif
/* All allocation uses these. */ /* All allocation uses these. */
#define MALLOC(TYPE,COUNT) ((TYPE*)_spMalloc(sizeof(TYPE) * (COUNT), __FILE__, __LINE__)) #define MALLOC(TYPE,COUNT) ((TYPE*)_spMalloc(sizeof(TYPE) * (COUNT), __FILE__, __LINE__))
#define CALLOC(TYPE,COUNT) ((TYPE*)_spCalloc(COUNT, sizeof(TYPE), __FILE__, __LINE__)) #define CALLOC(TYPE,COUNT) ((TYPE*)_spCalloc(COUNT, sizeof(TYPE), __FILE__, __LINE__))

12
spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp
View File

@ -145,9 +145,9 @@ void SkeletonClipping::clipTriangles(Vector<float> &vertices, size_t verticesLen
clippedTriangles.setSize(s + 3 * (clipOutputCount - 2), 0); clippedTriangles.setSize(s + 3 * (clipOutputCount - 2), 0);
clipOutputCount--; clipOutputCount--;
for (size_t ii = 1; ii < clipOutputCount; ii++) { for (size_t ii = 1; ii < clipOutputCount; ii++) {
clippedTriangles[s] = index; clippedTriangles[s] = (unsigned short)(index);
clippedTriangles[s + 1] = index + ii; clippedTriangles[s + 1] = (unsigned short)(index + ii);
clippedTriangles[s + 2] = index + ii + 1; clippedTriangles[s + 2] = (unsigned short)(index + ii + 1);
s += 3; s += 3;
} }
index += clipOutputCount + 1; index += clipOutputCount + 1;
@ -170,9 +170,9 @@ void SkeletonClipping::clipTriangles(Vector<float> &vertices, size_t verticesLen
s = clippedTriangles.size(); s = clippedTriangles.size();
clippedTriangles.setSize(s + 3, 0); clippedTriangles.setSize(s + 3, 0);
clippedTriangles[s] = index; clippedTriangles[s] = (unsigned short)index;
clippedTriangles[s + 1] = index + 1; clippedTriangles[s + 1] = (unsigned short)(index + 1);
clippedTriangles[s + 2] = index + 2; clippedTriangles[s + 2] = (unsigned short)(index + 2);
index += 3; index += 3;
i += 3; i += 3;
goto continue_outer; goto continue_outer;