فهرست منبع

[cpp] Fixed parsing of points in skin. See #1168.
[c] Fixed c unit tests.

badlogic 7 سال پیش
والد
کامیت
1d3d425028
2فایلهای تغییر یافته به همراه5 افزوده شده و 2 حذف شده
  1. 2 1
      spine-c/spine-c-unit-tests/CMakeLists.txt
  2. 3 1
      spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp

+ 2 - 1
spine-c/spine-c-unit-tests/CMakeLists.txt

@@ -3,7 +3,8 @@ project(spine_unit_test)
 
 set(CMAKE_INSTALL_PREFIX "./")
 set(CMAKE_VERBOSE_MAKEFILE ON)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKANJI_MEMTRACE -DUSE_CPP11_MUTEX")
+set (CMAKE_CXX_FLAGS "-Wall -Wextra -Wnon-virtual-dtor -pedantic -std=c++03 -fno-rtti -DKANJI_MEMTRACE -DUSE_CPP11_MUTEX")
+
 
 #########################################################
 # set includes

+ 3 - 1
spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp

@@ -463,7 +463,9 @@ SkeletonData *SkeletonJson::readSkeletonData(const char *json) {
 						type = AttachmentType_Path;
 					} else if (strcmp(typeString, "clipping") == 0) {
 						type = AttachmentType_Clipping;
-					} else {
+					} else if (strcmp(typeString, "point") == 0) {
+						type = AttachmentType_Point;
+					}else {
 						delete skeletonData;
 						setError(root, "Unknown attachment type: ", typeString);
 						return NULL;