瀏覽代碼

[cpp] Simplify directory structure, add DebugPrinter program

- spine-cpp/spine-cpp was moved into spine-cpp directory, so spine-cpp/spine-cpp/src -> spine-cpp/src, spine-cpp/spine-cpp/include -> spine-cpp/include
- Added scaffold for DebugPrinter to be used by runtime comparison tests
- Added build.sh
Mario Zechner 2 月之前
父節點
當前提交
cc4f11fded
共有 100 個文件被更改,包括 27 次插入5 次删除
  1. 9 4
      spine-cpp/CMakeLists.txt
  2. 16 0
      spine-cpp/build.sh
  3. 0 0
      spine-cpp/include/spine/Animation.h
  4. 0 0
      spine-cpp/include/spine/AnimationState.h
  5. 0 0
      spine-cpp/include/spine/AnimationStateData.h
  6. 0 0
      spine-cpp/include/spine/Array.h
  7. 0 0
      spine-cpp/include/spine/ArrayUtils.h
  8. 0 0
      spine-cpp/include/spine/Atlas.h
  9. 0 0
      spine-cpp/include/spine/AtlasAttachmentLoader.h
  10. 0 0
      spine-cpp/include/spine/Attachment.h
  11. 0 0
      spine-cpp/include/spine/AttachmentLoader.h
  12. 0 0
      spine-cpp/include/spine/AttachmentTimeline.h
  13. 0 0
      spine-cpp/include/spine/AttachmentType.h
  14. 0 0
      spine-cpp/include/spine/BlendMode.h
  15. 0 0
      spine-cpp/include/spine/BlockAllocator.h
  16. 0 0
      spine-cpp/include/spine/Bone.h
  17. 0 0
      spine-cpp/include/spine/BoneData.h
  18. 0 0
      spine-cpp/include/spine/BoneLocal.h
  19. 0 0
      spine-cpp/include/spine/BonePose.h
  20. 0 0
      spine-cpp/include/spine/BoneTimeline.h
  21. 0 0
      spine-cpp/include/spine/BoundingBoxAttachment.h
  22. 0 0
      spine-cpp/include/spine/ClippingAttachment.h
  23. 0 0
      spine-cpp/include/spine/Color.h
  24. 0 0
      spine-cpp/include/spine/ColorTimeline.h
  25. 0 0
      spine-cpp/include/spine/Constraint.h
  26. 0 0
      spine-cpp/include/spine/ConstraintData.h
  27. 0 0
      spine-cpp/include/spine/ConstraintTimeline.h
  28. 0 0
      spine-cpp/include/spine/ConstraintTimeline1.h
  29. 0 0
      spine-cpp/include/spine/CurveTimeline.h
  30. 0 0
      spine-cpp/include/spine/Debug.h
  31. 0 0
      spine-cpp/include/spine/DeformTimeline.h
  32. 0 0
      spine-cpp/include/spine/DrawOrderTimeline.h
  33. 0 0
      spine-cpp/include/spine/Event.h
  34. 0 0
      spine-cpp/include/spine/EventData.h
  35. 0 0
      spine-cpp/include/spine/EventTimeline.h
  36. 0 0
      spine-cpp/include/spine/Extension.h
  37. 0 0
      spine-cpp/include/spine/HasRendererObject.h
  38. 0 0
      spine-cpp/include/spine/HashMap.h
  39. 0 0
      spine-cpp/include/spine/IkConstraint.h
  40. 0 0
      spine-cpp/include/spine/IkConstraintData.h
  41. 0 0
      spine-cpp/include/spine/IkConstraintPose.h
  42. 0 0
      spine-cpp/include/spine/IkConstraintTimeline.h
  43. 0 0
      spine-cpp/include/spine/Inherit.h
  44. 0 0
      spine-cpp/include/spine/InheritTimeline.h
  45. 0 0
      spine-cpp/include/spine/Json.h
  46. 0 0
      spine-cpp/include/spine/LinkedMesh.h
  47. 0 0
      spine-cpp/include/spine/MathUtil.h
  48. 0 0
      spine-cpp/include/spine/MeshAttachment.h
  49. 0 0
      spine-cpp/include/spine/MixBlend.h
  50. 0 0
      spine-cpp/include/spine/MixDirection.h
  51. 0 0
      spine-cpp/include/spine/PathAttachment.h
  52. 0 0
      spine-cpp/include/spine/PathConstraint.h
  53. 0 0
      spine-cpp/include/spine/PathConstraintData.h
  54. 0 0
      spine-cpp/include/spine/PathConstraintMixTimeline.h
  55. 0 0
      spine-cpp/include/spine/PathConstraintPose.h
  56. 0 0
      spine-cpp/include/spine/PathConstraintPositionTimeline.h
  57. 0 0
      spine-cpp/include/spine/PathConstraintSpacingTimeline.h
  58. 0 0
      spine-cpp/include/spine/Physics.h
  59. 0 0
      spine-cpp/include/spine/PhysicsConstraint.h
  60. 0 0
      spine-cpp/include/spine/PhysicsConstraintData.h
  61. 0 0
      spine-cpp/include/spine/PhysicsConstraintPose.h
  62. 0 0
      spine-cpp/include/spine/PhysicsConstraintTimeline.h
  63. 0 0
      spine-cpp/include/spine/PointAttachment.h
  64. 0 0
      spine-cpp/include/spine/Pool.h
  65. 0 0
      spine-cpp/include/spine/Pose.h
  66. 0 0
      spine-cpp/include/spine/Posed.h
  67. 0 0
      spine-cpp/include/spine/PosedActive.h
  68. 0 0
      spine-cpp/include/spine/PosedData.h
  69. 0 0
      spine-cpp/include/spine/PositionMode.h
  70. 0 0
      spine-cpp/include/spine/Property.h
  71. 0 0
      spine-cpp/include/spine/RTTI.h
  72. 0 0
      spine-cpp/include/spine/RegionAttachment.h
  73. 0 0
      spine-cpp/include/spine/RotateMode.h
  74. 0 0
      spine-cpp/include/spine/RotateTimeline.h
  75. 0 0
      spine-cpp/include/spine/ScaleTimeline.h
  76. 2 1
      spine-cpp/include/spine/Sequence.h
  77. 0 0
      spine-cpp/include/spine/SequenceTimeline.h
  78. 0 0
      spine-cpp/include/spine/ShearTimeline.h
  79. 0 0
      spine-cpp/include/spine/Skeleton.h
  80. 0 0
      spine-cpp/include/spine/SkeletonBinary.h
  81. 0 0
      spine-cpp/include/spine/SkeletonBounds.h
  82. 0 0
      spine-cpp/include/spine/SkeletonClipping.h
  83. 0 0
      spine-cpp/include/spine/SkeletonData.h
  84. 0 0
      spine-cpp/include/spine/SkeletonJson.h
  85. 0 0
      spine-cpp/include/spine/SkeletonRenderer.h
  86. 0 0
      spine-cpp/include/spine/Skin.h
  87. 0 0
      spine-cpp/include/spine/Slider.h
  88. 0 0
      spine-cpp/include/spine/SliderData.h
  89. 0 0
      spine-cpp/include/spine/SliderMixTimeline.h
  90. 0 0
      spine-cpp/include/spine/SliderPose.h
  91. 0 0
      spine-cpp/include/spine/SliderTimeline.h
  92. 0 0
      spine-cpp/include/spine/Slot.h
  93. 0 0
      spine-cpp/include/spine/SlotCurveTimeline.h
  94. 0 0
      spine-cpp/include/spine/SlotData.h
  95. 0 0
      spine-cpp/include/spine/SlotPose.h
  96. 0 0
      spine-cpp/include/spine/SlotTimeline.h
  97. 0 0
      spine-cpp/include/spine/SpacingMode.h
  98. 0 0
      spine-cpp/include/spine/SpineObject.h
  99. 0 0
      spine-cpp/include/spine/SpineString.h
  100. 0 0
      spine-cpp/include/spine/TextureLoader.h

+ 9 - 4
spine-cpp/CMakeLists.txt

@@ -4,11 +4,11 @@ project(spine-cpp)
 include(${CMAKE_CURRENT_LIST_DIR}/../flags.cmake)
 
 include_directories(include)
-file(GLOB INCLUDES "spine-cpp/include/**/*.h")
-file(GLOB SOURCES "spine-cpp/src/**/*.cpp")
+file(GLOB INCLUDES "include/**/*.h")
+file(GLOB SOURCES "src/**/*.cpp")
 
 add_library(spine-cpp STATIC ${SOURCES} ${INCLUDES})
-target_include_directories(spine-cpp PUBLIC spine-cpp/include)
+target_include_directories(spine-cpp PUBLIC include)
 
 # Install target
 install(TARGETS spine-cpp EXPORT spine-cpp_TARGETS DESTINATION dist/lib)
@@ -18,4 +18,9 @@ install(FILES ${INCLUDES} DESTINATION dist/include)
 export(
 	EXPORT spine-cpp_TARGETS
 	FILE ${CMAKE_CURRENT_BINARY_DIR}/spine-cppTargets.cmake
-	NAMESPACE "Spine::")
+	NAMESPACE "Spine::")
+
+# Optional tests
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+	add_subdirectory(tests)
+endif()

+ 16 - 0
spine-cpp/build.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+
+cd "$(dirname "$0")"
+
+for arg in "${@:-clean build}"; do
+    case $arg in
+        clean) rm -rf build ;;
+        build) 
+            mkdir -p build && cd build
+            [ -f CMakeCache.txt ] || cmake .. -DCMAKE_BUILD_TYPE=Debug
+            make -j$(sysctl -n hw.ncpu 2>/dev/null || nproc 2>/dev/null || echo 4)
+            cd ..
+            ;;
+    esac
+done

+ 0 - 0
spine-cpp/spine-cpp/include/spine/Animation.h → spine-cpp/include/spine/Animation.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/AnimationState.h → spine-cpp/include/spine/AnimationState.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/AnimationStateData.h → spine-cpp/include/spine/AnimationStateData.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Array.h → spine-cpp/include/spine/Array.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/ArrayUtils.h → spine-cpp/include/spine/ArrayUtils.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Atlas.h → spine-cpp/include/spine/Atlas.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h → spine-cpp/include/spine/AtlasAttachmentLoader.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Attachment.h → spine-cpp/include/spine/Attachment.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/AttachmentLoader.h → spine-cpp/include/spine/AttachmentLoader.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h → spine-cpp/include/spine/AttachmentTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/AttachmentType.h → spine-cpp/include/spine/AttachmentType.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/BlendMode.h → spine-cpp/include/spine/BlendMode.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/BlockAllocator.h → spine-cpp/include/spine/BlockAllocator.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Bone.h → spine-cpp/include/spine/Bone.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/BoneData.h → spine-cpp/include/spine/BoneData.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/BoneLocal.h → spine-cpp/include/spine/BoneLocal.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/BonePose.h → spine-cpp/include/spine/BonePose.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/BoneTimeline.h → spine-cpp/include/spine/BoneTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h → spine-cpp/include/spine/BoundingBoxAttachment.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/ClippingAttachment.h → spine-cpp/include/spine/ClippingAttachment.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Color.h → spine-cpp/include/spine/Color.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/ColorTimeline.h → spine-cpp/include/spine/ColorTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Constraint.h → spine-cpp/include/spine/Constraint.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/ConstraintData.h → spine-cpp/include/spine/ConstraintData.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/ConstraintTimeline.h → spine-cpp/include/spine/ConstraintTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/ConstraintTimeline1.h → spine-cpp/include/spine/ConstraintTimeline1.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/CurveTimeline.h → spine-cpp/include/spine/CurveTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Debug.h → spine-cpp/include/spine/Debug.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/DeformTimeline.h → spine-cpp/include/spine/DeformTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h → spine-cpp/include/spine/DrawOrderTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Event.h → spine-cpp/include/spine/Event.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/EventData.h → spine-cpp/include/spine/EventData.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/EventTimeline.h → spine-cpp/include/spine/EventTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Extension.h → spine-cpp/include/spine/Extension.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/HasRendererObject.h → spine-cpp/include/spine/HasRendererObject.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/HashMap.h → spine-cpp/include/spine/HashMap.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/IkConstraint.h → spine-cpp/include/spine/IkConstraint.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/IkConstraintData.h → spine-cpp/include/spine/IkConstraintData.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/IkConstraintPose.h → spine-cpp/include/spine/IkConstraintPose.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h → spine-cpp/include/spine/IkConstraintTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Inherit.h → spine-cpp/include/spine/Inherit.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/InheritTimeline.h → spine-cpp/include/spine/InheritTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Json.h → spine-cpp/include/spine/Json.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/LinkedMesh.h → spine-cpp/include/spine/LinkedMesh.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/MathUtil.h → spine-cpp/include/spine/MathUtil.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/MeshAttachment.h → spine-cpp/include/spine/MeshAttachment.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/MixBlend.h → spine-cpp/include/spine/MixBlend.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/MixDirection.h → spine-cpp/include/spine/MixDirection.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PathAttachment.h → spine-cpp/include/spine/PathAttachment.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PathConstraint.h → spine-cpp/include/spine/PathConstraint.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PathConstraintData.h → spine-cpp/include/spine/PathConstraintData.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h → spine-cpp/include/spine/PathConstraintMixTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PathConstraintPose.h → spine-cpp/include/spine/PathConstraintPose.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h → spine-cpp/include/spine/PathConstraintPositionTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h → spine-cpp/include/spine/PathConstraintSpacingTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Physics.h → spine-cpp/include/spine/Physics.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PhysicsConstraint.h → spine-cpp/include/spine/PhysicsConstraint.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PhysicsConstraintData.h → spine-cpp/include/spine/PhysicsConstraintData.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PhysicsConstraintPose.h → spine-cpp/include/spine/PhysicsConstraintPose.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PhysicsConstraintTimeline.h → spine-cpp/include/spine/PhysicsConstraintTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PointAttachment.h → spine-cpp/include/spine/PointAttachment.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Pool.h → spine-cpp/include/spine/Pool.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Pose.h → spine-cpp/include/spine/Pose.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Posed.h → spine-cpp/include/spine/Posed.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PosedActive.h → spine-cpp/include/spine/PosedActive.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PosedData.h → spine-cpp/include/spine/PosedData.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/PositionMode.h → spine-cpp/include/spine/PositionMode.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Property.h → spine-cpp/include/spine/Property.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/RTTI.h → spine-cpp/include/spine/RTTI.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/RegionAttachment.h → spine-cpp/include/spine/RegionAttachment.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/RotateMode.h → spine-cpp/include/spine/RotateMode.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/RotateTimeline.h → spine-cpp/include/spine/RotateTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/ScaleTimeline.h → spine-cpp/include/spine/ScaleTimeline.h


+ 2 - 1
spine-cpp/spine-cpp/include/spine/Sequence.h → spine-cpp/include/spine/Sequence.h

@@ -54,7 +54,7 @@ namespace spine {
 
 		void apply(SlotPose* slot, Attachment* attachment);
 
-		String getPath(const String &basePath, int index);
+		String &getPath(const String &basePath, int index);
 
 		/// Returns a unique ID for this attachment.
 		int getId() { return _id; }
@@ -83,6 +83,7 @@ namespace spine {
 		int _start;
 		int _digits;
 		int _setupIndex;
+		String _tmpPath;
 
 		static int nextID();
 	};

+ 0 - 0
spine-cpp/spine-cpp/include/spine/SequenceTimeline.h → spine-cpp/include/spine/SequenceTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/ShearTimeline.h → spine-cpp/include/spine/ShearTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Skeleton.h → spine-cpp/include/spine/Skeleton.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SkeletonBinary.h → spine-cpp/include/spine/SkeletonBinary.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SkeletonBounds.h → spine-cpp/include/spine/SkeletonBounds.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SkeletonClipping.h → spine-cpp/include/spine/SkeletonClipping.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SkeletonData.h → spine-cpp/include/spine/SkeletonData.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SkeletonJson.h → spine-cpp/include/spine/SkeletonJson.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SkeletonRenderer.h → spine-cpp/include/spine/SkeletonRenderer.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Skin.h → spine-cpp/include/spine/Skin.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Slider.h → spine-cpp/include/spine/Slider.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SliderData.h → spine-cpp/include/spine/SliderData.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SliderMixTimeline.h → spine-cpp/include/spine/SliderMixTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SliderPose.h → spine-cpp/include/spine/SliderPose.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SliderTimeline.h → spine-cpp/include/spine/SliderTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/Slot.h → spine-cpp/include/spine/Slot.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SlotCurveTimeline.h → spine-cpp/include/spine/SlotCurveTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SlotData.h → spine-cpp/include/spine/SlotData.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SlotPose.h → spine-cpp/include/spine/SlotPose.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SlotTimeline.h → spine-cpp/include/spine/SlotTimeline.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SpacingMode.h → spine-cpp/include/spine/SpacingMode.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SpineObject.h → spine-cpp/include/spine/SpineObject.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/SpineString.h → spine-cpp/include/spine/SpineString.h


+ 0 - 0
spine-cpp/spine-cpp/include/spine/TextureLoader.h → spine-cpp/include/spine/TextureLoader.h


部分文件因文件數量過多而無法顯示