From cc4f11fded5b893a60930a14ba2b2df064cc61cf Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Fri, 11 Jul 2025 11:00:44 +0200 Subject: [PATCH] [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 --- spine-cpp/CMakeLists.txt | 13 +- spine-cpp/build.sh | 16 ++ .../{spine-cpp => }/include/spine/Animation.h | 0 .../include/spine/AnimationState.h | 0 .../include/spine/AnimationStateData.h | 0 .../{spine-cpp => }/include/spine/Array.h | 0 .../include/spine/ArrayUtils.h | 0 .../{spine-cpp => }/include/spine/Atlas.h | 0 .../include/spine/AtlasAttachmentLoader.h | 0 .../include/spine/Attachment.h | 0 .../include/spine/AttachmentLoader.h | 0 .../include/spine/AttachmentTimeline.h | 0 .../include/spine/AttachmentType.h | 0 .../{spine-cpp => }/include/spine/BlendMode.h | 0 .../include/spine/BlockAllocator.h | 0 .../{spine-cpp => }/include/spine/Bone.h | 0 .../{spine-cpp => }/include/spine/BoneData.h | 0 .../{spine-cpp => }/include/spine/BoneLocal.h | 0 .../{spine-cpp => }/include/spine/BonePose.h | 0 .../include/spine/BoneTimeline.h | 0 .../include/spine/BoundingBoxAttachment.h | 0 .../include/spine/ClippingAttachment.h | 0 .../{spine-cpp => }/include/spine/Color.h | 0 .../include/spine/ColorTimeline.h | 0 .../include/spine/Constraint.h | 0 .../include/spine/ConstraintData.h | 0 .../include/spine/ConstraintTimeline.h | 0 .../include/spine/ConstraintTimeline1.h | 0 .../include/spine/CurveTimeline.h | 0 .../{spine-cpp => }/include/spine/Debug.h | 0 .../include/spine/DeformTimeline.h | 0 .../include/spine/DrawOrderTimeline.h | 0 .../{spine-cpp => }/include/spine/Event.h | 0 .../{spine-cpp => }/include/spine/EventData.h | 0 .../include/spine/EventTimeline.h | 0 .../{spine-cpp => }/include/spine/Extension.h | 0 .../include/spine/HasRendererObject.h | 0 .../{spine-cpp => }/include/spine/HashMap.h | 0 .../include/spine/IkConstraint.h | 0 .../include/spine/IkConstraintData.h | 0 .../include/spine/IkConstraintPose.h | 0 .../include/spine/IkConstraintTimeline.h | 0 .../{spine-cpp => }/include/spine/Inherit.h | 0 .../include/spine/InheritTimeline.h | 0 .../{spine-cpp => }/include/spine/Json.h | 0 .../include/spine/LinkedMesh.h | 0 .../{spine-cpp => }/include/spine/MathUtil.h | 0 .../include/spine/MeshAttachment.h | 0 .../{spine-cpp => }/include/spine/MixBlend.h | 0 .../include/spine/MixDirection.h | 0 .../include/spine/PathAttachment.h | 0 .../include/spine/PathConstraint.h | 0 .../include/spine/PathConstraintData.h | 0 .../include/spine/PathConstraintMixTimeline.h | 0 .../include/spine/PathConstraintPose.h | 0 .../spine/PathConstraintPositionTimeline.h | 0 .../spine/PathConstraintSpacingTimeline.h | 0 .../{spine-cpp => }/include/spine/Physics.h | 0 .../include/spine/PhysicsConstraint.h | 0 .../include/spine/PhysicsConstraintData.h | 0 .../include/spine/PhysicsConstraintPose.h | 0 .../include/spine/PhysicsConstraintTimeline.h | 0 .../include/spine/PointAttachment.h | 0 .../{spine-cpp => }/include/spine/Pool.h | 0 .../{spine-cpp => }/include/spine/Pose.h | 0 .../{spine-cpp => }/include/spine/Posed.h | 0 .../include/spine/PosedActive.h | 0 .../{spine-cpp => }/include/spine/PosedData.h | 0 .../include/spine/PositionMode.h | 0 .../{spine-cpp => }/include/spine/Property.h | 0 .../{spine-cpp => }/include/spine/RTTI.h | 0 .../include/spine/RegionAttachment.h | 0 .../include/spine/RotateMode.h | 0 .../include/spine/RotateTimeline.h | 0 .../include/spine/ScaleTimeline.h | 0 .../{spine-cpp => }/include/spine/Sequence.h | 3 +- .../include/spine/SequenceTimeline.h | 0 .../include/spine/ShearTimeline.h | 0 .../{spine-cpp => }/include/spine/Skeleton.h | 0 .../include/spine/SkeletonBinary.h | 0 .../include/spine/SkeletonBounds.h | 0 .../include/spine/SkeletonClipping.h | 0 .../include/spine/SkeletonData.h | 0 .../include/spine/SkeletonJson.h | 0 .../include/spine/SkeletonRenderer.h | 0 .../{spine-cpp => }/include/spine/Skin.h | 0 .../{spine-cpp => }/include/spine/Slider.h | 0 .../include/spine/SliderData.h | 0 .../include/spine/SliderMixTimeline.h | 0 .../include/spine/SliderPose.h | 0 .../include/spine/SliderTimeline.h | 0 .../{spine-cpp => }/include/spine/Slot.h | 0 .../include/spine/SlotCurveTimeline.h | 0 .../{spine-cpp => }/include/spine/SlotData.h | 0 .../{spine-cpp => }/include/spine/SlotPose.h | 0 .../include/spine/SlotTimeline.h | 0 .../include/spine/SpacingMode.h | 0 .../include/spine/SpineObject.h | 0 .../include/spine/SpineString.h | 0 .../include/spine/TextureLoader.h | 0 .../include/spine/TextureRegion.h | 0 .../{spine-cpp => }/include/spine/Timeline.h | 0 .../include/spine/TransformConstraint.h | 0 .../include/spine/TransformConstraintData.h | 0 .../include/spine/TransformConstraintPose.h | 0 .../spine/TransformConstraintTimeline.h | 0 .../include/spine/TranslateTimeline.h | 0 .../include/spine/Triangulator.h | 0 .../{spine-cpp => }/include/spine/Update.h | 0 .../{spine-cpp => }/include/spine/Version.h | 0 .../include/spine/VertexAttachment.h | 0 spine-cpp/{spine-cpp => }/include/spine/dll.h | 0 .../{spine-cpp => }/include/spine/spine.h | 0 .../{spine-cpp => }/src/spine/Animation.cpp | 8 +- .../src/spine/AnimationState.cpp | 2 +- .../src/spine/AnimationStateData.cpp | 0 spine-cpp/{spine-cpp => }/src/spine/Atlas.cpp | 0 .../src/spine/AtlasAttachmentLoader.cpp | 0 .../{spine-cpp => }/src/spine/Attachment.cpp | 0 .../src/spine/AttachmentLoader.cpp | 0 .../src/spine/AttachmentTimeline.cpp | 0 spine-cpp/{spine-cpp => }/src/spine/Bone.cpp | 8 +- .../{spine-cpp => }/src/spine/BoneData.cpp | 0 .../{spine-cpp => }/src/spine/BoneLocal.cpp | 0 .../{spine-cpp => }/src/spine/BonePose.cpp | 0 .../src/spine/BoneTimeline.cpp | 0 .../src/spine/BoundingBoxAttachment.cpp | 0 .../src/spine/ClippingAttachment.cpp | 0 .../src/spine/ColorTimeline.cpp | 0 .../{spine-cpp => }/src/spine/Constraint.cpp | 0 .../src/spine/ConstraintData.cpp | 0 .../src/spine/ConstraintTimeline.cpp | 0 .../src/spine/ConstraintTimeline1.cpp | 0 .../src/spine/CurveTimeline.cpp | 0 .../src/spine/DeformTimeline.cpp | 0 .../src/spine/DrawOrderTimeline.cpp | 0 spine-cpp/{spine-cpp => }/src/spine/Event.cpp | 12 +- .../{spine-cpp => }/src/spine/EventData.cpp | 12 +- .../src/spine/EventTimeline.cpp | 0 .../{spine-cpp => }/src/spine/Extension.cpp | 0 .../src/spine/IkConstraint.cpp | 1 - .../src/spine/IkConstraintData.cpp | 2 +- .../src/spine/IkConstraintPose.cpp | 0 .../src/spine/IkConstraintTimeline.cpp | 2 +- .../src/spine/InheritTimeline.cpp | 6 +- spine-cpp/{spine-cpp => }/src/spine/Json.cpp | 0 .../{spine-cpp => }/src/spine/LinkedMesh.cpp | 20 +- .../{spine-cpp => }/src/spine/MathUtil.cpp | 0 .../src/spine/MeshAttachment.cpp | 0 .../src/spine/PathAttachment.cpp | 0 .../src/spine/PathConstraint.cpp | 10 +- .../src/spine/PathConstraintData.cpp | 2 +- .../src/spine/PathConstraintMixTimeline.cpp | 0 .../src/spine/PathConstraintPose.cpp | 0 .../spine/PathConstraintPositionTimeline.cpp | 6 +- .../spine/PathConstraintSpacingTimeline.cpp | 8 +- .../src/spine/PhysicsConstraint.cpp | 0 .../src/spine/PhysicsConstraintData.cpp | 2 +- .../src/spine/PhysicsConstraintPose.cpp | 0 .../src/spine/PhysicsConstraintTimeline.cpp | 0 .../src/spine/PointAttachment.cpp | 0 spine-cpp/{spine-cpp => }/src/spine/RTTI.cpp | 10 +- .../src/spine/RegionAttachment.cpp | 0 .../src/spine/RotateTimeline.cpp | 0 .../src/spine/ScaleTimeline.cpp | 0 .../{spine-cpp => }/src/spine/Sequence.cpp | 10 +- .../src/spine/SequenceTimeline.cpp | 0 .../src/spine/ShearTimeline.cpp | 0 .../{spine-cpp => }/src/spine/Skeleton.cpp | 10 +- .../src/spine/SkeletonBinary.cpp | 20 +- .../src/spine/SkeletonBounds.cpp | 0 .../src/spine/SkeletonClipping.cpp | 0 .../src/spine/SkeletonData.cpp | 0 .../src/spine/SkeletonJson.cpp | 2 +- .../src/spine/SkeletonRenderer.cpp | 0 spine-cpp/{spine-cpp => }/src/spine/Skin.cpp | 0 .../{spine-cpp => }/src/spine/Slider.cpp | 15 +- .../{spine-cpp => }/src/spine/SliderData.cpp | 0 .../src/spine/SliderMixTimeline.cpp | 0 .../{spine-cpp => }/src/spine/SliderPose.cpp | 0 .../src/spine/SliderTimeline.cpp | 0 spine-cpp/{spine-cpp => }/src/spine/Slot.cpp | 0 .../src/spine/SlotCurveTimeline.cpp | 0 .../{spine-cpp => }/src/spine/SlotData.cpp | 0 .../{spine-cpp => }/src/spine/SlotPose.cpp | 0 .../src/spine/SlotTimeline.cpp | 0 .../{spine-cpp => }/src/spine/SpineObject.cpp | 0 .../src/spine/TextureLoader.cpp | 0 .../{spine-cpp => }/src/spine/Timeline.cpp | 0 .../src/spine/TransformConstraint.cpp | 0 .../src/spine/TransformConstraintData.cpp | 13 +- .../src/spine/TransformConstraintPose.cpp | 0 .../src/spine/TransformConstraintTimeline.cpp | 2 +- .../src/spine/TranslateTimeline.cpp | 0 .../src/spine/Triangulator.cpp | 0 .../{spine-cpp => }/src/spine/Update.cpp | 0 .../src/spine/VertexAttachment.cpp | 0 spine-cpp/tests/CMakeLists.txt | 4 + spine-cpp/tests/src/DebugPrinter.cpp | 200 ++++++++++++++++++ 199 files changed, 321 insertions(+), 98 deletions(-) create mode 100755 spine-cpp/build.sh rename spine-cpp/{spine-cpp => }/include/spine/Animation.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/AnimationState.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/AnimationStateData.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Array.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/ArrayUtils.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Atlas.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/AtlasAttachmentLoader.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Attachment.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/AttachmentLoader.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/AttachmentTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/AttachmentType.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/BlendMode.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/BlockAllocator.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Bone.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/BoneData.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/BoneLocal.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/BonePose.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/BoneTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/BoundingBoxAttachment.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/ClippingAttachment.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Color.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/ColorTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Constraint.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/ConstraintData.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/ConstraintTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/ConstraintTimeline1.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/CurveTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Debug.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/DeformTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/DrawOrderTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Event.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/EventData.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/EventTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Extension.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/HasRendererObject.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/HashMap.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/IkConstraint.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/IkConstraintData.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/IkConstraintPose.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/IkConstraintTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Inherit.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/InheritTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Json.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/LinkedMesh.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/MathUtil.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/MeshAttachment.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/MixBlend.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/MixDirection.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PathAttachment.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PathConstraint.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PathConstraintData.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PathConstraintMixTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PathConstraintPose.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PathConstraintPositionTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PathConstraintSpacingTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Physics.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PhysicsConstraint.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PhysicsConstraintData.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PhysicsConstraintPose.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PhysicsConstraintTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PointAttachment.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Pool.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Pose.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Posed.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PosedActive.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PosedData.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/PositionMode.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Property.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/RTTI.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/RegionAttachment.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/RotateMode.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/RotateTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/ScaleTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Sequence.h (98%) rename spine-cpp/{spine-cpp => }/include/spine/SequenceTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/ShearTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Skeleton.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SkeletonBinary.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SkeletonBounds.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SkeletonClipping.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SkeletonData.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SkeletonJson.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SkeletonRenderer.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Skin.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Slider.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SliderData.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SliderMixTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SliderPose.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SliderTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Slot.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SlotCurveTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SlotData.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SlotPose.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SlotTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SpacingMode.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SpineObject.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/SpineString.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/TextureLoader.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/TextureRegion.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Timeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/TransformConstraint.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/TransformConstraintData.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/TransformConstraintPose.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/TransformConstraintTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/TranslateTimeline.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Triangulator.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Update.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/Version.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/VertexAttachment.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/dll.h (100%) rename spine-cpp/{spine-cpp => }/include/spine/spine.h (100%) rename spine-cpp/{spine-cpp => }/src/spine/Animation.cpp (96%) rename spine-cpp/{spine-cpp => }/src/spine/AnimationState.cpp (99%) rename spine-cpp/{spine-cpp => }/src/spine/AnimationStateData.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/Atlas.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/AtlasAttachmentLoader.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/Attachment.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/AttachmentLoader.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/AttachmentTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/Bone.cpp (95%) rename spine-cpp/{spine-cpp => }/src/spine/BoneData.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/BoneLocal.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/BonePose.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/BoneTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/BoundingBoxAttachment.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/ClippingAttachment.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/ColorTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/Constraint.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/ConstraintData.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/ConstraintTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/ConstraintTimeline1.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/CurveTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/DeformTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/DrawOrderTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/Event.cpp (90%) rename spine-cpp/{spine-cpp => }/src/spine/EventData.cpp (94%) rename spine-cpp/{spine-cpp => }/src/spine/EventTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/Extension.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/IkConstraint.cpp (99%) rename spine-cpp/{spine-cpp => }/src/spine/IkConstraintData.cpp (97%) rename spine-cpp/{spine-cpp => }/src/spine/IkConstraintPose.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/IkConstraintTimeline.cpp (98%) rename spine-cpp/{spine-cpp => }/src/spine/InheritTimeline.cpp (95%) rename spine-cpp/{spine-cpp => }/src/spine/Json.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/LinkedMesh.cpp (85%) rename spine-cpp/{spine-cpp => }/src/spine/MathUtil.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/MeshAttachment.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/PathAttachment.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/PathConstraint.cpp (98%) rename spine-cpp/{spine-cpp => }/src/spine/PathConstraintData.cpp (98%) rename spine-cpp/{spine-cpp => }/src/spine/PathConstraintMixTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/PathConstraintPose.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/PathConstraintPositionTimeline.cpp (95%) rename spine-cpp/{spine-cpp => }/src/spine/PathConstraintSpacingTimeline.cpp (92%) rename spine-cpp/{spine-cpp => }/src/spine/PhysicsConstraint.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/PhysicsConstraintData.cpp (98%) rename spine-cpp/{spine-cpp => }/src/spine/PhysicsConstraintPose.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/PhysicsConstraintTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/PointAttachment.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/RTTI.cpp (97%) rename spine-cpp/{spine-cpp => }/src/spine/RegionAttachment.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/RotateTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/ScaleTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/Sequence.cpp (95%) rename spine-cpp/{spine-cpp => }/src/spine/SequenceTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/ShearTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/Skeleton.cpp (97%) rename spine-cpp/{spine-cpp => }/src/spine/SkeletonBinary.cpp (98%) rename spine-cpp/{spine-cpp => }/src/spine/SkeletonBounds.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/SkeletonClipping.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/SkeletonData.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/SkeletonJson.cpp (99%) rename spine-cpp/{spine-cpp => }/src/spine/SkeletonRenderer.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/Skin.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/Slider.cpp (91%) rename spine-cpp/{spine-cpp => }/src/spine/SliderData.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/SliderMixTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/SliderPose.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/SliderTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/Slot.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/SlotCurveTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/SlotData.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/SlotPose.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/SlotTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/SpineObject.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/TextureLoader.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/Timeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/TransformConstraint.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/TransformConstraintData.cpp (96%) rename spine-cpp/{spine-cpp => }/src/spine/TransformConstraintPose.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/TransformConstraintTimeline.cpp (99%) rename spine-cpp/{spine-cpp => }/src/spine/TranslateTimeline.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/Triangulator.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/Update.cpp (100%) rename spine-cpp/{spine-cpp => }/src/spine/VertexAttachment.cpp (100%) create mode 100644 spine-cpp/tests/CMakeLists.txt create mode 100644 spine-cpp/tests/src/DebugPrinter.cpp diff --git a/spine-cpp/CMakeLists.txt b/spine-cpp/CMakeLists.txt index 9ce22941d..671e9f885 100644 --- a/spine-cpp/CMakeLists.txt +++ b/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::") \ No newline at end of file + NAMESPACE "Spine::") + +# Optional tests +if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + add_subdirectory(tests) +endif() \ No newline at end of file diff --git a/spine-cpp/build.sh b/spine-cpp/build.sh new file mode 100755 index 000000000..548d03981 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/spine-cpp/spine-cpp/include/spine/Animation.h b/spine-cpp/include/spine/Animation.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Animation.h rename to spine-cpp/include/spine/Animation.h diff --git a/spine-cpp/spine-cpp/include/spine/AnimationState.h b/spine-cpp/include/spine/AnimationState.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/AnimationState.h rename to spine-cpp/include/spine/AnimationState.h diff --git a/spine-cpp/spine-cpp/include/spine/AnimationStateData.h b/spine-cpp/include/spine/AnimationStateData.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/AnimationStateData.h rename to spine-cpp/include/spine/AnimationStateData.h diff --git a/spine-cpp/spine-cpp/include/spine/Array.h b/spine-cpp/include/spine/Array.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Array.h rename to spine-cpp/include/spine/Array.h diff --git a/spine-cpp/spine-cpp/include/spine/ArrayUtils.h b/spine-cpp/include/spine/ArrayUtils.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/ArrayUtils.h rename to spine-cpp/include/spine/ArrayUtils.h diff --git a/spine-cpp/spine-cpp/include/spine/Atlas.h b/spine-cpp/include/spine/Atlas.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Atlas.h rename to spine-cpp/include/spine/Atlas.h diff --git a/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h b/spine-cpp/include/spine/AtlasAttachmentLoader.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h rename to spine-cpp/include/spine/AtlasAttachmentLoader.h diff --git a/spine-cpp/spine-cpp/include/spine/Attachment.h b/spine-cpp/include/spine/Attachment.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Attachment.h rename to spine-cpp/include/spine/Attachment.h diff --git a/spine-cpp/spine-cpp/include/spine/AttachmentLoader.h b/spine-cpp/include/spine/AttachmentLoader.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/AttachmentLoader.h rename to spine-cpp/include/spine/AttachmentLoader.h diff --git a/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h b/spine-cpp/include/spine/AttachmentTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h rename to spine-cpp/include/spine/AttachmentTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/AttachmentType.h b/spine-cpp/include/spine/AttachmentType.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/AttachmentType.h rename to spine-cpp/include/spine/AttachmentType.h diff --git a/spine-cpp/spine-cpp/include/spine/BlendMode.h b/spine-cpp/include/spine/BlendMode.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/BlendMode.h rename to spine-cpp/include/spine/BlendMode.h diff --git a/spine-cpp/spine-cpp/include/spine/BlockAllocator.h b/spine-cpp/include/spine/BlockAllocator.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/BlockAllocator.h rename to spine-cpp/include/spine/BlockAllocator.h diff --git a/spine-cpp/spine-cpp/include/spine/Bone.h b/spine-cpp/include/spine/Bone.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Bone.h rename to spine-cpp/include/spine/Bone.h diff --git a/spine-cpp/spine-cpp/include/spine/BoneData.h b/spine-cpp/include/spine/BoneData.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/BoneData.h rename to spine-cpp/include/spine/BoneData.h diff --git a/spine-cpp/spine-cpp/include/spine/BoneLocal.h b/spine-cpp/include/spine/BoneLocal.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/BoneLocal.h rename to spine-cpp/include/spine/BoneLocal.h diff --git a/spine-cpp/spine-cpp/include/spine/BonePose.h b/spine-cpp/include/spine/BonePose.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/BonePose.h rename to spine-cpp/include/spine/BonePose.h diff --git a/spine-cpp/spine-cpp/include/spine/BoneTimeline.h b/spine-cpp/include/spine/BoneTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/BoneTimeline.h rename to spine-cpp/include/spine/BoneTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h b/spine-cpp/include/spine/BoundingBoxAttachment.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h rename to spine-cpp/include/spine/BoundingBoxAttachment.h diff --git a/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h b/spine-cpp/include/spine/ClippingAttachment.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/ClippingAttachment.h rename to spine-cpp/include/spine/ClippingAttachment.h diff --git a/spine-cpp/spine-cpp/include/spine/Color.h b/spine-cpp/include/spine/Color.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Color.h rename to spine-cpp/include/spine/Color.h diff --git a/spine-cpp/spine-cpp/include/spine/ColorTimeline.h b/spine-cpp/include/spine/ColorTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/ColorTimeline.h rename to spine-cpp/include/spine/ColorTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/Constraint.h b/spine-cpp/include/spine/Constraint.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Constraint.h rename to spine-cpp/include/spine/Constraint.h diff --git a/spine-cpp/spine-cpp/include/spine/ConstraintData.h b/spine-cpp/include/spine/ConstraintData.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/ConstraintData.h rename to spine-cpp/include/spine/ConstraintData.h diff --git a/spine-cpp/spine-cpp/include/spine/ConstraintTimeline.h b/spine-cpp/include/spine/ConstraintTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/ConstraintTimeline.h rename to spine-cpp/include/spine/ConstraintTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/ConstraintTimeline1.h b/spine-cpp/include/spine/ConstraintTimeline1.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/ConstraintTimeline1.h rename to spine-cpp/include/spine/ConstraintTimeline1.h diff --git a/spine-cpp/spine-cpp/include/spine/CurveTimeline.h b/spine-cpp/include/spine/CurveTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/CurveTimeline.h rename to spine-cpp/include/spine/CurveTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/Debug.h b/spine-cpp/include/spine/Debug.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Debug.h rename to spine-cpp/include/spine/Debug.h diff --git a/spine-cpp/spine-cpp/include/spine/DeformTimeline.h b/spine-cpp/include/spine/DeformTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/DeformTimeline.h rename to spine-cpp/include/spine/DeformTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h b/spine-cpp/include/spine/DrawOrderTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h rename to spine-cpp/include/spine/DrawOrderTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/Event.h b/spine-cpp/include/spine/Event.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Event.h rename to spine-cpp/include/spine/Event.h diff --git a/spine-cpp/spine-cpp/include/spine/EventData.h b/spine-cpp/include/spine/EventData.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/EventData.h rename to spine-cpp/include/spine/EventData.h diff --git a/spine-cpp/spine-cpp/include/spine/EventTimeline.h b/spine-cpp/include/spine/EventTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/EventTimeline.h rename to spine-cpp/include/spine/EventTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/Extension.h b/spine-cpp/include/spine/Extension.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Extension.h rename to spine-cpp/include/spine/Extension.h diff --git a/spine-cpp/spine-cpp/include/spine/HasRendererObject.h b/spine-cpp/include/spine/HasRendererObject.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/HasRendererObject.h rename to spine-cpp/include/spine/HasRendererObject.h diff --git a/spine-cpp/spine-cpp/include/spine/HashMap.h b/spine-cpp/include/spine/HashMap.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/HashMap.h rename to spine-cpp/include/spine/HashMap.h diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraint.h b/spine-cpp/include/spine/IkConstraint.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/IkConstraint.h rename to spine-cpp/include/spine/IkConstraint.h diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraintData.h b/spine-cpp/include/spine/IkConstraintData.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/IkConstraintData.h rename to spine-cpp/include/spine/IkConstraintData.h diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraintPose.h b/spine-cpp/include/spine/IkConstraintPose.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/IkConstraintPose.h rename to spine-cpp/include/spine/IkConstraintPose.h diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h b/spine-cpp/include/spine/IkConstraintTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h rename to spine-cpp/include/spine/IkConstraintTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/Inherit.h b/spine-cpp/include/spine/Inherit.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Inherit.h rename to spine-cpp/include/spine/Inherit.h diff --git a/spine-cpp/spine-cpp/include/spine/InheritTimeline.h b/spine-cpp/include/spine/InheritTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/InheritTimeline.h rename to spine-cpp/include/spine/InheritTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/Json.h b/spine-cpp/include/spine/Json.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Json.h rename to spine-cpp/include/spine/Json.h diff --git a/spine-cpp/spine-cpp/include/spine/LinkedMesh.h b/spine-cpp/include/spine/LinkedMesh.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/LinkedMesh.h rename to spine-cpp/include/spine/LinkedMesh.h diff --git a/spine-cpp/spine-cpp/include/spine/MathUtil.h b/spine-cpp/include/spine/MathUtil.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/MathUtil.h rename to spine-cpp/include/spine/MathUtil.h diff --git a/spine-cpp/spine-cpp/include/spine/MeshAttachment.h b/spine-cpp/include/spine/MeshAttachment.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/MeshAttachment.h rename to spine-cpp/include/spine/MeshAttachment.h diff --git a/spine-cpp/spine-cpp/include/spine/MixBlend.h b/spine-cpp/include/spine/MixBlend.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/MixBlend.h rename to spine-cpp/include/spine/MixBlend.h diff --git a/spine-cpp/spine-cpp/include/spine/MixDirection.h b/spine-cpp/include/spine/MixDirection.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/MixDirection.h rename to spine-cpp/include/spine/MixDirection.h diff --git a/spine-cpp/spine-cpp/include/spine/PathAttachment.h b/spine-cpp/include/spine/PathAttachment.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PathAttachment.h rename to spine-cpp/include/spine/PathAttachment.h diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraint.h b/spine-cpp/include/spine/PathConstraint.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PathConstraint.h rename to spine-cpp/include/spine/PathConstraint.h diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintData.h b/spine-cpp/include/spine/PathConstraintData.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PathConstraintData.h rename to spine-cpp/include/spine/PathConstraintData.h diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h b/spine-cpp/include/spine/PathConstraintMixTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h rename to spine-cpp/include/spine/PathConstraintMixTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintPose.h b/spine-cpp/include/spine/PathConstraintPose.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PathConstraintPose.h rename to spine-cpp/include/spine/PathConstraintPose.h diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h b/spine-cpp/include/spine/PathConstraintPositionTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h rename to spine-cpp/include/spine/PathConstraintPositionTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h b/spine-cpp/include/spine/PathConstraintSpacingTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h rename to spine-cpp/include/spine/PathConstraintSpacingTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/Physics.h b/spine-cpp/include/spine/Physics.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Physics.h rename to spine-cpp/include/spine/Physics.h diff --git a/spine-cpp/spine-cpp/include/spine/PhysicsConstraint.h b/spine-cpp/include/spine/PhysicsConstraint.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PhysicsConstraint.h rename to spine-cpp/include/spine/PhysicsConstraint.h diff --git a/spine-cpp/spine-cpp/include/spine/PhysicsConstraintData.h b/spine-cpp/include/spine/PhysicsConstraintData.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PhysicsConstraintData.h rename to spine-cpp/include/spine/PhysicsConstraintData.h diff --git a/spine-cpp/spine-cpp/include/spine/PhysicsConstraintPose.h b/spine-cpp/include/spine/PhysicsConstraintPose.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PhysicsConstraintPose.h rename to spine-cpp/include/spine/PhysicsConstraintPose.h diff --git a/spine-cpp/spine-cpp/include/spine/PhysicsConstraintTimeline.h b/spine-cpp/include/spine/PhysicsConstraintTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PhysicsConstraintTimeline.h rename to spine-cpp/include/spine/PhysicsConstraintTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/PointAttachment.h b/spine-cpp/include/spine/PointAttachment.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PointAttachment.h rename to spine-cpp/include/spine/PointAttachment.h diff --git a/spine-cpp/spine-cpp/include/spine/Pool.h b/spine-cpp/include/spine/Pool.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Pool.h rename to spine-cpp/include/spine/Pool.h diff --git a/spine-cpp/spine-cpp/include/spine/Pose.h b/spine-cpp/include/spine/Pose.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Pose.h rename to spine-cpp/include/spine/Pose.h diff --git a/spine-cpp/spine-cpp/include/spine/Posed.h b/spine-cpp/include/spine/Posed.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Posed.h rename to spine-cpp/include/spine/Posed.h diff --git a/spine-cpp/spine-cpp/include/spine/PosedActive.h b/spine-cpp/include/spine/PosedActive.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PosedActive.h rename to spine-cpp/include/spine/PosedActive.h diff --git a/spine-cpp/spine-cpp/include/spine/PosedData.h b/spine-cpp/include/spine/PosedData.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PosedData.h rename to spine-cpp/include/spine/PosedData.h diff --git a/spine-cpp/spine-cpp/include/spine/PositionMode.h b/spine-cpp/include/spine/PositionMode.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/PositionMode.h rename to spine-cpp/include/spine/PositionMode.h diff --git a/spine-cpp/spine-cpp/include/spine/Property.h b/spine-cpp/include/spine/Property.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Property.h rename to spine-cpp/include/spine/Property.h diff --git a/spine-cpp/spine-cpp/include/spine/RTTI.h b/spine-cpp/include/spine/RTTI.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/RTTI.h rename to spine-cpp/include/spine/RTTI.h diff --git a/spine-cpp/spine-cpp/include/spine/RegionAttachment.h b/spine-cpp/include/spine/RegionAttachment.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/RegionAttachment.h rename to spine-cpp/include/spine/RegionAttachment.h diff --git a/spine-cpp/spine-cpp/include/spine/RotateMode.h b/spine-cpp/include/spine/RotateMode.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/RotateMode.h rename to spine-cpp/include/spine/RotateMode.h diff --git a/spine-cpp/spine-cpp/include/spine/RotateTimeline.h b/spine-cpp/include/spine/RotateTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/RotateTimeline.h rename to spine-cpp/include/spine/RotateTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h b/spine-cpp/include/spine/ScaleTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/ScaleTimeline.h rename to spine-cpp/include/spine/ScaleTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/Sequence.h b/spine-cpp/include/spine/Sequence.h similarity index 98% rename from spine-cpp/spine-cpp/include/spine/Sequence.h rename to spine-cpp/include/spine/Sequence.h index b76bbfa5f..e5bb7b8ed 100644 --- a/spine-cpp/spine-cpp/include/spine/Sequence.h +++ b/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(); }; diff --git a/spine-cpp/spine-cpp/include/spine/SequenceTimeline.h b/spine-cpp/include/spine/SequenceTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SequenceTimeline.h rename to spine-cpp/include/spine/SequenceTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/ShearTimeline.h b/spine-cpp/include/spine/ShearTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/ShearTimeline.h rename to spine-cpp/include/spine/ShearTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/Skeleton.h b/spine-cpp/include/spine/Skeleton.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Skeleton.h rename to spine-cpp/include/spine/Skeleton.h diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonBinary.h b/spine-cpp/include/spine/SkeletonBinary.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SkeletonBinary.h rename to spine-cpp/include/spine/SkeletonBinary.h diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonBounds.h b/spine-cpp/include/spine/SkeletonBounds.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SkeletonBounds.h rename to spine-cpp/include/spine/SkeletonBounds.h diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonClipping.h b/spine-cpp/include/spine/SkeletonClipping.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SkeletonClipping.h rename to spine-cpp/include/spine/SkeletonClipping.h diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonData.h b/spine-cpp/include/spine/SkeletonData.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SkeletonData.h rename to spine-cpp/include/spine/SkeletonData.h diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonJson.h b/spine-cpp/include/spine/SkeletonJson.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SkeletonJson.h rename to spine-cpp/include/spine/SkeletonJson.h diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonRenderer.h b/spine-cpp/include/spine/SkeletonRenderer.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SkeletonRenderer.h rename to spine-cpp/include/spine/SkeletonRenderer.h diff --git a/spine-cpp/spine-cpp/include/spine/Skin.h b/spine-cpp/include/spine/Skin.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Skin.h rename to spine-cpp/include/spine/Skin.h diff --git a/spine-cpp/spine-cpp/include/spine/Slider.h b/spine-cpp/include/spine/Slider.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Slider.h rename to spine-cpp/include/spine/Slider.h diff --git a/spine-cpp/spine-cpp/include/spine/SliderData.h b/spine-cpp/include/spine/SliderData.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SliderData.h rename to spine-cpp/include/spine/SliderData.h diff --git a/spine-cpp/spine-cpp/include/spine/SliderMixTimeline.h b/spine-cpp/include/spine/SliderMixTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SliderMixTimeline.h rename to spine-cpp/include/spine/SliderMixTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/SliderPose.h b/spine-cpp/include/spine/SliderPose.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SliderPose.h rename to spine-cpp/include/spine/SliderPose.h diff --git a/spine-cpp/spine-cpp/include/spine/SliderTimeline.h b/spine-cpp/include/spine/SliderTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SliderTimeline.h rename to spine-cpp/include/spine/SliderTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/Slot.h b/spine-cpp/include/spine/Slot.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Slot.h rename to spine-cpp/include/spine/Slot.h diff --git a/spine-cpp/spine-cpp/include/spine/SlotCurveTimeline.h b/spine-cpp/include/spine/SlotCurveTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SlotCurveTimeline.h rename to spine-cpp/include/spine/SlotCurveTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/SlotData.h b/spine-cpp/include/spine/SlotData.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SlotData.h rename to spine-cpp/include/spine/SlotData.h diff --git a/spine-cpp/spine-cpp/include/spine/SlotPose.h b/spine-cpp/include/spine/SlotPose.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SlotPose.h rename to spine-cpp/include/spine/SlotPose.h diff --git a/spine-cpp/spine-cpp/include/spine/SlotTimeline.h b/spine-cpp/include/spine/SlotTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SlotTimeline.h rename to spine-cpp/include/spine/SlotTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/SpacingMode.h b/spine-cpp/include/spine/SpacingMode.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SpacingMode.h rename to spine-cpp/include/spine/SpacingMode.h diff --git a/spine-cpp/spine-cpp/include/spine/SpineObject.h b/spine-cpp/include/spine/SpineObject.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SpineObject.h rename to spine-cpp/include/spine/SpineObject.h diff --git a/spine-cpp/spine-cpp/include/spine/SpineString.h b/spine-cpp/include/spine/SpineString.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/SpineString.h rename to spine-cpp/include/spine/SpineString.h diff --git a/spine-cpp/spine-cpp/include/spine/TextureLoader.h b/spine-cpp/include/spine/TextureLoader.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/TextureLoader.h rename to spine-cpp/include/spine/TextureLoader.h diff --git a/spine-cpp/spine-cpp/include/spine/TextureRegion.h b/spine-cpp/include/spine/TextureRegion.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/TextureRegion.h rename to spine-cpp/include/spine/TextureRegion.h diff --git a/spine-cpp/spine-cpp/include/spine/Timeline.h b/spine-cpp/include/spine/Timeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Timeline.h rename to spine-cpp/include/spine/Timeline.h diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraint.h b/spine-cpp/include/spine/TransformConstraint.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/TransformConstraint.h rename to spine-cpp/include/spine/TransformConstraint.h diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraintData.h b/spine-cpp/include/spine/TransformConstraintData.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/TransformConstraintData.h rename to spine-cpp/include/spine/TransformConstraintData.h diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraintPose.h b/spine-cpp/include/spine/TransformConstraintPose.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/TransformConstraintPose.h rename to spine-cpp/include/spine/TransformConstraintPose.h diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h b/spine-cpp/include/spine/TransformConstraintTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h rename to spine-cpp/include/spine/TransformConstraintTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/TranslateTimeline.h b/spine-cpp/include/spine/TranslateTimeline.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/TranslateTimeline.h rename to spine-cpp/include/spine/TranslateTimeline.h diff --git a/spine-cpp/spine-cpp/include/spine/Triangulator.h b/spine-cpp/include/spine/Triangulator.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Triangulator.h rename to spine-cpp/include/spine/Triangulator.h diff --git a/spine-cpp/spine-cpp/include/spine/Update.h b/spine-cpp/include/spine/Update.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Update.h rename to spine-cpp/include/spine/Update.h diff --git a/spine-cpp/spine-cpp/include/spine/Version.h b/spine-cpp/include/spine/Version.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/Version.h rename to spine-cpp/include/spine/Version.h diff --git a/spine-cpp/spine-cpp/include/spine/VertexAttachment.h b/spine-cpp/include/spine/VertexAttachment.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/VertexAttachment.h rename to spine-cpp/include/spine/VertexAttachment.h diff --git a/spine-cpp/spine-cpp/include/spine/dll.h b/spine-cpp/include/spine/dll.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/dll.h rename to spine-cpp/include/spine/dll.h diff --git a/spine-cpp/spine-cpp/include/spine/spine.h b/spine-cpp/include/spine/spine.h similarity index 100% rename from spine-cpp/spine-cpp/include/spine/spine.h rename to spine-cpp/include/spine/spine.h diff --git a/spine-cpp/spine-cpp/src/spine/Animation.cpp b/spine-cpp/src/spine/Animation.cpp similarity index 96% rename from spine-cpp/spine-cpp/src/spine/Animation.cpp rename to spine-cpp/src/spine/Animation.cpp index 01a305d8d..35b1db7a2 100644 --- a/spine-cpp/spine-cpp/src/spine/Animation.cpp +++ b/spine-cpp/src/spine/Animation.cpp @@ -42,10 +42,10 @@ using namespace spine; Animation::Animation(const String &name, Array &timelines, float duration) : _timelines(), - _timelineIds(), - _bones(), - _duration(duration), - _name(name) { + _timelineIds(), + _bones(), + _duration(duration), + _name(name) { setTimelines(timelines); } diff --git a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp b/spine-cpp/src/spine/AnimationState.cpp similarity index 99% rename from spine-cpp/spine-cpp/src/spine/AnimationState.cpp rename to spine-cpp/src/spine/AnimationState.cpp index d35e0a1e7..451c292e2 100644 --- a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp +++ b/spine-cpp/src/spine/AnimationState.cpp @@ -749,7 +749,7 @@ void AnimationState::applyRotateTimeline(RotateTimeline *rotateTimeline, Skeleto if (firstFrame) timelinesRotation[i] = 0; if (alpha == 1) { - static_cast(rotateTimeline)->apply(skeleton, 0, time, NULL, 1, blend, MixDirection_In, false); + static_cast(rotateTimeline)->apply(skeleton, 0, time, NULL, 1, blend, MixDirection_In, false); return; } diff --git a/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp b/spine-cpp/src/spine/AnimationStateData.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp rename to spine-cpp/src/spine/AnimationStateData.cpp diff --git a/spine-cpp/spine-cpp/src/spine/Atlas.cpp b/spine-cpp/src/spine/Atlas.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/Atlas.cpp rename to spine-cpp/src/spine/Atlas.cpp diff --git a/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp b/spine-cpp/src/spine/AtlasAttachmentLoader.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp rename to spine-cpp/src/spine/AtlasAttachmentLoader.cpp diff --git a/spine-cpp/spine-cpp/src/spine/Attachment.cpp b/spine-cpp/src/spine/Attachment.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/Attachment.cpp rename to spine-cpp/src/spine/Attachment.cpp diff --git a/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp b/spine-cpp/src/spine/AttachmentLoader.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp rename to spine-cpp/src/spine/AttachmentLoader.cpp diff --git a/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp b/spine-cpp/src/spine/AttachmentTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp rename to spine-cpp/src/spine/AttachmentTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/Bone.cpp b/spine-cpp/src/spine/Bone.cpp similarity index 95% rename from spine-cpp/spine-cpp/src/spine/Bone.cpp rename to spine-cpp/src/spine/Bone.cpp index d5f18befe..0380d881f 100644 --- a/spine-cpp/spine-cpp/src/spine/Bone.cpp +++ b/spine-cpp/src/spine/Bone.cpp @@ -48,10 +48,10 @@ Bone::Bone(BoneData &data, Bone *parent) : PosedGeneric(bone._data), - PosedActive(), - _parent(parent), - _children(), - _sorted(false) { + PosedActive(), + _parent(parent), + _children(), + _sorted(false) { _constrained._bone = this; _applied->_bone = this; _pose.set(bone._pose); diff --git a/spine-cpp/spine-cpp/src/spine/BoneData.cpp b/spine-cpp/src/spine/BoneData.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/BoneData.cpp rename to spine-cpp/src/spine/BoneData.cpp diff --git a/spine-cpp/spine-cpp/src/spine/BoneLocal.cpp b/spine-cpp/src/spine/BoneLocal.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/BoneLocal.cpp rename to spine-cpp/src/spine/BoneLocal.cpp diff --git a/spine-cpp/spine-cpp/src/spine/BonePose.cpp b/spine-cpp/src/spine/BonePose.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/BonePose.cpp rename to spine-cpp/src/spine/BonePose.cpp diff --git a/spine-cpp/spine-cpp/src/spine/BoneTimeline.cpp b/spine-cpp/src/spine/BoneTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/BoneTimeline.cpp rename to spine-cpp/src/spine/BoneTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp b/spine-cpp/src/spine/BoundingBoxAttachment.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp rename to spine-cpp/src/spine/BoundingBoxAttachment.cpp diff --git a/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp b/spine-cpp/src/spine/ClippingAttachment.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp rename to spine-cpp/src/spine/ClippingAttachment.cpp diff --git a/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp b/spine-cpp/src/spine/ColorTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp rename to spine-cpp/src/spine/ColorTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/Constraint.cpp b/spine-cpp/src/spine/Constraint.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/Constraint.cpp rename to spine-cpp/src/spine/Constraint.cpp diff --git a/spine-cpp/spine-cpp/src/spine/ConstraintData.cpp b/spine-cpp/src/spine/ConstraintData.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/ConstraintData.cpp rename to spine-cpp/src/spine/ConstraintData.cpp diff --git a/spine-cpp/spine-cpp/src/spine/ConstraintTimeline.cpp b/spine-cpp/src/spine/ConstraintTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/ConstraintTimeline.cpp rename to spine-cpp/src/spine/ConstraintTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/ConstraintTimeline1.cpp b/spine-cpp/src/spine/ConstraintTimeline1.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/ConstraintTimeline1.cpp rename to spine-cpp/src/spine/ConstraintTimeline1.cpp diff --git a/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp b/spine-cpp/src/spine/CurveTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp rename to spine-cpp/src/spine/CurveTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp b/spine-cpp/src/spine/DeformTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp rename to spine-cpp/src/spine/DeformTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp b/spine-cpp/src/spine/DrawOrderTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp rename to spine-cpp/src/spine/DrawOrderTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/Event.cpp b/spine-cpp/src/spine/Event.cpp similarity index 90% rename from spine-cpp/spine-cpp/src/spine/Event.cpp rename to spine-cpp/src/spine/Event.cpp index d0fb113cd..b0dd6a28e 100644 --- a/spine-cpp/spine-cpp/src/spine/Event.cpp +++ b/spine-cpp/src/spine/Event.cpp @@ -34,12 +34,12 @@ using namespace spine; Event::Event(float time, const EventData &data) : _data(data), - _time(time), - _intValue(data.getIntValue()), - _floatValue(data.getFloatValue()), - _stringValue(data.getStringValue()), - _volume(data.getVolume()), - _balance(data.getBalance()) { + _time(time), + _intValue(data.getIntValue()), + _floatValue(data.getFloatValue()), + _stringValue(data.getStringValue()), + _volume(data.getVolume()), + _balance(data.getBalance()) { } const EventData &Event::getData() { diff --git a/spine-cpp/spine-cpp/src/spine/EventData.cpp b/spine-cpp/src/spine/EventData.cpp similarity index 94% rename from spine-cpp/spine-cpp/src/spine/EventData.cpp rename to spine-cpp/src/spine/EventData.cpp index ca40fa9d0..b6df8c7bf 100644 --- a/spine-cpp/spine-cpp/src/spine/EventData.cpp +++ b/spine-cpp/src/spine/EventData.cpp @@ -34,12 +34,12 @@ using namespace spine; EventData::EventData(const String &name) : _name(name), - _intValue(0), - _floatValue(0), - _stringValue(), - _audioPath(), - _volume(1), - _balance(0) { + _intValue(0), + _floatValue(0), + _stringValue(), + _audioPath(), + _volume(1), + _balance(0) { assert(_name.length() > 0); } diff --git a/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp b/spine-cpp/src/spine/EventTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/EventTimeline.cpp rename to spine-cpp/src/spine/EventTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/Extension.cpp b/spine-cpp/src/spine/Extension.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/Extension.cpp rename to spine-cpp/src/spine/Extension.cpp diff --git a/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp b/spine-cpp/src/spine/IkConstraint.cpp similarity index 99% rename from spine-cpp/spine-cpp/src/spine/IkConstraint.cpp rename to spine-cpp/src/spine/IkConstraint.cpp index a0a74ea00..6a450f5f8 100644 --- a/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp +++ b/spine-cpp/src/spine/IkConstraint.cpp @@ -310,4 +310,3 @@ outer_break: a2 += 360; child._rotation += a2 * mix; } - diff --git a/spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp b/spine-cpp/src/spine/IkConstraintData.cpp similarity index 97% rename from spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp rename to spine-cpp/src/spine/IkConstraintData.cpp index 0510d0b4b..fb1101b26 100644 --- a/spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp +++ b/spine-cpp/src/spine/IkConstraintData.cpp @@ -61,6 +61,6 @@ void IkConstraintData::setUniform(bool uniform) { _uniform = uniform; } -Constraint* IkConstraintData::create(Skeleton& skeleton) { +Constraint *IkConstraintData::create(Skeleton &skeleton) { return new (__FILE__, __LINE__) IkConstraint(*this, skeleton); } \ No newline at end of file diff --git a/spine-cpp/spine-cpp/src/spine/IkConstraintPose.cpp b/spine-cpp/src/spine/IkConstraintPose.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/IkConstraintPose.cpp rename to spine-cpp/src/spine/IkConstraintPose.cpp diff --git a/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp b/spine-cpp/src/spine/IkConstraintTimeline.cpp similarity index 98% rename from spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp rename to spine-cpp/src/spine/IkConstraintTimeline.cpp index 920b1c6af..dad1442fd 100644 --- a/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp +++ b/spine-cpp/src/spine/IkConstraintTimeline.cpp @@ -135,7 +135,7 @@ void IkConstraintTimeline::apply(Skeleton &skeleton, float lastTime, float time, if (direction == MixDirection_Out) return; break; } - pose._bendDirection = (int)_frames[i + BEND_DIRECTION]; + pose._bendDirection = (int) _frames[i + BEND_DIRECTION]; pose._compress = _frames[i + COMPRESS] != 0; pose._stretch = _frames[i + STRETCH] != 0; } diff --git a/spine-cpp/spine-cpp/src/spine/InheritTimeline.cpp b/spine-cpp/src/spine/InheritTimeline.cpp similarity index 95% rename from spine-cpp/spine-cpp/src/spine/InheritTimeline.cpp rename to spine-cpp/src/spine/InheritTimeline.cpp index 8c87b9900..7702381f9 100644 --- a/spine-cpp/spine-cpp/src/spine/InheritTimeline.cpp +++ b/spine-cpp/src/spine/InheritTimeline.cpp @@ -43,7 +43,7 @@ using namespace spine; RTTI_IMPL_MULTI(InheritTimeline, Timeline, BoneTimeline) InheritTimeline::InheritTimeline(size_t frameCount, int boneIndex) : Timeline(frameCount, ENTRIES), - BoneTimeline(boneIndex) { + BoneTimeline(boneIndex) { PropertyId ids[] = {((PropertyId) Property_Inherit << 32) | boneIndex}; setPropertyIds(ids, 1); } @@ -54,7 +54,7 @@ InheritTimeline::~InheritTimeline() { void InheritTimeline::setFrame(int frame, float time, Inherit inherit) { frame *= ENTRIES; _frames[frame] = time; - _frames[frame + INHERIT] = (float)inherit; + _frames[frame + INHERIT] = (float) inherit; } @@ -77,6 +77,6 @@ void InheritTimeline::apply(Skeleton &skeleton, float lastTime, float time, Arra if (blend == MixBlend_Setup || blend == MixBlend_First) pose._inherit = bone->_data._setup._inherit; } else { int idx = Animation::search(_frames, time, ENTRIES) + INHERIT; - pose._inherit = static_cast((int)_frames[idx]); + pose._inherit = static_cast((int) _frames[idx]); } } diff --git a/spine-cpp/spine-cpp/src/spine/Json.cpp b/spine-cpp/src/spine/Json.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/Json.cpp rename to spine-cpp/src/spine/Json.cpp diff --git a/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp b/spine-cpp/src/spine/LinkedMesh.cpp similarity index 85% rename from spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp rename to spine-cpp/src/spine/LinkedMesh.cpp index db8a9bb6c..f23952c11 100644 --- a/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp +++ b/spine-cpp/src/spine/LinkedMesh.cpp @@ -35,18 +35,18 @@ using namespace spine; LinkedMesh::LinkedMesh(MeshAttachment *mesh, const int skinIndex, size_t slotIndex, const String &parent, bool inheritTimelines) : _mesh(mesh), - _skinIndex(skinIndex), - _skin(""), - _slotIndex(slotIndex), - _parent(parent), - _inheritTimelines(inheritTimelines) { + _skinIndex(skinIndex), + _skin(""), + _slotIndex(slotIndex), + _parent(parent), + _inheritTimelines(inheritTimelines) { } LinkedMesh::LinkedMesh(MeshAttachment *mesh, const String &skin, size_t slotIndex, const String &parent, bool inheritTimelines) : _mesh(mesh), - _skinIndex(-1), - _skin(skin), - _slotIndex(slotIndex), - _parent(parent), - _inheritTimelines(inheritTimelines) { + _skinIndex(-1), + _skin(skin), + _slotIndex(slotIndex), + _parent(parent), + _inheritTimelines(inheritTimelines) { } diff --git a/spine-cpp/spine-cpp/src/spine/MathUtil.cpp b/spine-cpp/src/spine/MathUtil.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/MathUtil.cpp rename to spine-cpp/src/spine/MathUtil.cpp diff --git a/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp b/spine-cpp/src/spine/MeshAttachment.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp rename to spine-cpp/src/spine/MeshAttachment.cpp diff --git a/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp b/spine-cpp/src/spine/PathAttachment.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/PathAttachment.cpp rename to spine-cpp/src/spine/PathAttachment.cpp diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp b/spine-cpp/src/spine/PathConstraint.cpp similarity index 98% rename from spine-cpp/spine-cpp/src/spine/PathConstraint.cpp rename to spine-cpp/src/spine/PathConstraint.cpp index 347ab1bed..dcee4a963 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp +++ b/spine-cpp/src/spine/PathConstraint.cpp @@ -63,8 +63,8 @@ PathConstraint::PathConstraint(PathConstraintData &data, Skeleton &skeleton) : C _segments.setSize(10, 0); } -PathConstraint* PathConstraint::copy(Skeleton &skeleton) { - PathConstraint* copy = new (__FILE__, __LINE__) PathConstraint(_data, skeleton); +PathConstraint *PathConstraint::copy(Skeleton &skeleton) { + PathConstraint *copy = new (__FILE__, __LINE__) PathConstraint(_data, skeleton); copy->_pose.set(_pose); return copy; } @@ -532,7 +532,7 @@ void PathConstraint::addCurvePosition(float p, float x1, float y1, float cx1, fl output[o + 2] = MathUtil::atan2(cy1 - y1, cx1 - x1); else output[o + 2] = MathUtil::atan2(y - (y1 * uu + cy1 * ut * 2 + cy2 * tt), - x - (x1 * uu + cx1 * ut * 2 + cx2 * tt)); + x - (x1 * uu + cx1 * ut * 2 + cx2 * tt)); } } @@ -540,7 +540,7 @@ void PathConstraint::sortPathSlot(Skeleton &skeleton, Skin &skin, int slotIndex, Skin::AttachmentMap::Entries entries = skin.getAttachments(); while (entries.hasNext()) { Skin::AttachmentMap::Entry &entry = entries.next(); - if (entry._slotIndex == (size_t)slotIndex) sortPath(skeleton, entry._attachment, slotBone); + if (entry._slotIndex == (size_t) slotIndex) sortPath(skeleton, entry._attachment, slotBone); } } @@ -555,7 +555,7 @@ void PathConstraint::sortPath(Skeleton &skeleton, Attachment *attachment, Bone & for (size_t i = 0, n = pathBones.size(); i < n;) { int nn = pathBones[i++]; nn += i; - while (i < (size_t)nn) + while (i < (size_t) nn) skeleton.sortBone(bones[pathBones[i++]]); } } diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp b/spine-cpp/src/spine/PathConstraintData.cpp similarity index 98% rename from spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp rename to spine-cpp/src/spine/PathConstraintData.cpp index d6cfca2c8..e8dd97dbd 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp +++ b/spine-cpp/src/spine/PathConstraintData.cpp @@ -90,6 +90,6 @@ void PathConstraintData::setOffsetRotation(float offsetRotation) { _offsetRotation = offsetRotation; } -Constraint* PathConstraintData::create(Skeleton& skeleton) { +Constraint *PathConstraintData::create(Skeleton &skeleton) { return new (__FILE__, __LINE__) PathConstraint(*this, skeleton); } \ No newline at end of file diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp b/spine-cpp/src/spine/PathConstraintMixTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp rename to spine-cpp/src/spine/PathConstraintMixTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintPose.cpp b/spine-cpp/src/spine/PathConstraintPose.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/PathConstraintPose.cpp rename to spine-cpp/src/spine/PathConstraintPose.cpp diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp b/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp similarity index 95% rename from spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp rename to spine-cpp/src/spine/PathConstraintPositionTimeline.cpp index 868f5c0b7..7ecc5b79a 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp +++ b/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp @@ -45,9 +45,9 @@ RTTI_IMPL(PathConstraintPositionTimeline, ConstraintTimeline1) PathConstraintPositionTimeline::PathConstraintPositionTimeline(size_t frameCount, size_t bezierCount, int constraintIndex) : ConstraintTimeline1(frameCount, - bezierCount, - constraintIndex, - Property_PathConstraintPosition) { + bezierCount, + constraintIndex, + Property_PathConstraintPosition) { } PathConstraintPositionTimeline::~PathConstraintPositionTimeline() { diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp b/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp similarity index 92% rename from spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp rename to spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp index ff8fa5144..c701fe93e 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp +++ b/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp @@ -45,9 +45,9 @@ RTTI_IMPL(PathConstraintSpacingTimeline, ConstraintTimeline1) PathConstraintSpacingTimeline::PathConstraintSpacingTimeline(size_t frameCount, size_t bezierCount, int constraintIndex) : ConstraintTimeline1(frameCount, - bezierCount, - constraintIndex, - Property_PathConstraintSpacing) { + bezierCount, + constraintIndex, + Property_PathConstraintSpacing) { } PathConstraintSpacingTimeline::~PathConstraintSpacingTimeline() { @@ -59,7 +59,7 @@ void PathConstraintSpacingTimeline::apply(Skeleton &skeleton, float lastTime, fl SP_UNUSED(pEvents); SP_UNUSED(direction); - PathConstraint *constraint = (PathConstraint *)skeleton._constraints[_constraintIndex]; + PathConstraint *constraint = (PathConstraint *) skeleton._constraints[_constraintIndex]; if (constraint->isActive()) { PathConstraintPose &pose = appliedPose ? *constraint->_applied : constraint->_pose; PathConstraintData &data = constraint->_data; diff --git a/spine-cpp/spine-cpp/src/spine/PhysicsConstraint.cpp b/spine-cpp/src/spine/PhysicsConstraint.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/PhysicsConstraint.cpp rename to spine-cpp/src/spine/PhysicsConstraint.cpp diff --git a/spine-cpp/spine-cpp/src/spine/PhysicsConstraintData.cpp b/spine-cpp/src/spine/PhysicsConstraintData.cpp similarity index 98% rename from spine-cpp/spine-cpp/src/spine/PhysicsConstraintData.cpp rename to spine-cpp/src/spine/PhysicsConstraintData.cpp index 894f9d2bf..107ba86af 100644 --- a/spine-cpp/spine-cpp/src/spine/PhysicsConstraintData.cpp +++ b/spine-cpp/src/spine/PhysicsConstraintData.cpp @@ -163,6 +163,6 @@ void PhysicsConstraintData::setMixGlobal(bool mixGlobal) { _mixGlobal = mixGlobal; } -Constraint* PhysicsConstraintData::create(Skeleton& skeleton) { +Constraint *PhysicsConstraintData::create(Skeleton &skeleton) { return new (__FILE__, __LINE__) PhysicsConstraint(*this, skeleton); } \ No newline at end of file diff --git a/spine-cpp/spine-cpp/src/spine/PhysicsConstraintPose.cpp b/spine-cpp/src/spine/PhysicsConstraintPose.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/PhysicsConstraintPose.cpp rename to spine-cpp/src/spine/PhysicsConstraintPose.cpp diff --git a/spine-cpp/spine-cpp/src/spine/PhysicsConstraintTimeline.cpp b/spine-cpp/src/spine/PhysicsConstraintTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/PhysicsConstraintTimeline.cpp rename to spine-cpp/src/spine/PhysicsConstraintTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp b/spine-cpp/src/spine/PointAttachment.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/PointAttachment.cpp rename to spine-cpp/src/spine/PointAttachment.cpp diff --git a/spine-cpp/spine-cpp/src/spine/RTTI.cpp b/spine-cpp/src/spine/RTTI.cpp similarity index 97% rename from spine-cpp/spine-cpp/src/spine/RTTI.cpp rename to spine-cpp/src/spine/RTTI.cpp index 3b1140939..ee996d19f 100644 --- a/spine-cpp/spine-cpp/src/spine/RTTI.cpp +++ b/spine-cpp/src/spine/RTTI.cpp @@ -44,12 +44,12 @@ RTTI::RTTI(const char *className, const RTTI &baseRTTI) : _className(className), _interfaces[2] = NULL; } -RTTI::RTTI(const char *className, const RTTI &baseRTTI, const RTTI* interface1, const RTTI* interface2, const RTTI* interface3) +RTTI::RTTI(const char *className, const RTTI &baseRTTI, const RTTI *interface1, const RTTI *interface2, const RTTI *interface3) : _className(className), _pBaseRTTI(&baseRTTI), _interfaceCount(0) { _interfaces[0] = interface1; _interfaces[1] = interface2; _interfaces[2] = interface3; - + if (interface1) _interfaceCount++; if (interface2) _interfaceCount++; if (interface3) _interfaceCount++; @@ -68,16 +68,16 @@ bool RTTI::instanceOf(const RTTI &rtti) const { const RTTI *pCompare = this; while (pCompare) { if (!strcmp(pCompare->_className, rtti._className)) return true; - + // Check interfaces at this level of the hierarchy for (int i = 0; i < pCompare->_interfaceCount; i++) { if (pCompare->_interfaces[i] && !strcmp(pCompare->_interfaces[i]->_className, rtti._className)) { return true; } } - + pCompare = pCompare->_pBaseRTTI; } - + return false; } diff --git a/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp b/spine-cpp/src/spine/RegionAttachment.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp rename to spine-cpp/src/spine/RegionAttachment.cpp diff --git a/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp b/spine-cpp/src/spine/RotateTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp rename to spine-cpp/src/spine/RotateTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp b/spine-cpp/src/spine/ScaleTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp rename to spine-cpp/src/spine/ScaleTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/Sequence.cpp b/spine-cpp/src/spine/Sequence.cpp similarity index 95% rename from spine-cpp/spine-cpp/src/spine/Sequence.cpp rename to spine-cpp/src/spine/Sequence.cpp index 9cc9a5fb0..542654d8a 100644 --- a/spine-cpp/spine-cpp/src/spine/Sequence.cpp +++ b/spine-cpp/src/spine/Sequence.cpp @@ -83,14 +83,14 @@ void Sequence::apply(SlotPose *slot, Attachment *attachment) { } } -String Sequence::getPath(const String &basePath, int index) { - String result(basePath); +String &Sequence::getPath(const String &basePath, int index) { + _tmpPath = basePath; String frame; frame.append(_start + index); for (int i = _digits - (int) frame.length(); i > 0; i--) - result.append("0"); - result.append(frame); - return result; + _tmpPath.append("0"); + _tmpPath.append(frame); + return _tmpPath; } int Sequence::nextID() { diff --git a/spine-cpp/spine-cpp/src/spine/SequenceTimeline.cpp b/spine-cpp/src/spine/SequenceTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/SequenceTimeline.cpp rename to spine-cpp/src/spine/SequenceTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp b/spine-cpp/src/spine/ShearTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp rename to spine-cpp/src/spine/ShearTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp b/spine-cpp/src/spine/Skeleton.cpp similarity index 97% rename from spine-cpp/spine-cpp/src/spine/Skeleton.cpp rename to spine-cpp/src/spine/Skeleton.cpp index c727eb299..97790b176 100644 --- a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp +++ b/spine-cpp/src/spine/Skeleton.cpp @@ -60,7 +60,7 @@ using namespace spine; Skeleton::Skeleton(SkeletonData &skeletonData) : _data(skeletonData), _skin(NULL), _color(1, 1, 1, 1), _x(0), _y(0), - _scaleX(1), _scaleY(1), _windX(1), _windY(0), _gravityX(0), _gravityY(1), _time(0), _update(0) { + _scaleX(1), _scaleY(1), _windX(1), _windY(0), _gravityX(0), _gravityY(1), _time(0), _update(0) { _bones.ensureCapacity(_data.getBones().size()); for (size_t i = 0; i < _data.getBones().size(); ++i) { @@ -93,7 +93,7 @@ Skeleton::Skeleton(SkeletonData &skeletonData) : _data(skeletonData), _skin(NULL ConstraintData *constraintData = _data.getConstraints()[i]; Constraint *constraint = constraintData->create(*this); if (constraint->getRTTI().instanceOf(PhysicsConstraint::rtti)) { - _physics.add(static_cast(constraint)); + _physics.add(static_cast(constraint)); } _constraints.add(constraint); } @@ -145,7 +145,7 @@ void Skeleton::updateCache() { for (size_t i = 0; i < n; i++) { Constraint *constraint = constraints[i]; constraint->_active = constraint->isSourceActive() && - ((!constraint->getData().isSkinRequired()) || (_skin && _skin->_constraints.contains(&constraint->getData()))); + ((!constraint->getData().isSkinRequired()) || (_skin && _skin->_constraints.contains(&constraint->getData()))); if (constraint->_active) constraint->sort(*this); } @@ -158,7 +158,7 @@ void Skeleton::updateCache() { for (size_t i = 0; i < n; i++) { const RTTI &rtti = updateCache[i]->getRTTI(); if (rtti.instanceOf(Bone::rtti)) { - Bone *bone = (Bone*)(updateCache[i]); + Bone *bone = (Bone *) (updateCache[i]); updateCache[i] = bone->_applied; } } @@ -200,7 +200,7 @@ void Skeleton::sortBone(Bone *bone) { Bone *parent = bone->_parent; if (parent != NULL) sortBone(parent); bone->_sorted = true; - _updateCache.add((Update *)bone); + _updateCache.add((Update *) bone); } void Skeleton::sortReset(Array &bones) { diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp b/spine-cpp/src/spine/SkeletonBinary.cpp similarity index 98% rename from spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp rename to spine-cpp/src/spine/SkeletonBinary.cpp index 5b3adb49e..52d50c118 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp +++ b/spine-cpp/src/spine/SkeletonBinary.cpp @@ -80,7 +80,7 @@ using namespace spine; SkeletonBinary::SkeletonBinary(Atlas *atlas) : _attachmentLoader( - new(__FILE__, __LINE__) AtlasAttachmentLoader(atlas)), + new (__FILE__, __LINE__) AtlasAttachmentLoader(atlas)), _error(), _scale(1), _ownsLoader(true) { } @@ -183,7 +183,7 @@ SkeletonData *SkeletonBinary::readSkeletonData(const unsigned char *binary, cons /* Bones. */ Array &bones = skeletonData->_bones.setSize(input.readInt(true), NULL); - for (int i = 0; i < (int)bones.size(); ++i) { + for (int i = 0; i < (int) bones.size(); ++i) { const char *name = input.readString(); BoneData *parent = i == 0 ? 0 : bones[input.readInt(true)]; BoneData *data = new (__FILE__, __LINE__) BoneData(i, String(name, true), parent); @@ -208,7 +208,7 @@ SkeletonData *SkeletonBinary::readSkeletonData(const unsigned char *binary, cons /* Slots. */ Array &slots = skeletonData->_slots.setSize(input.readInt(true), NULL); - for (int i = 0; i < (int)slots.size(); ++i) { + for (int i = 0; i < (int) slots.size(); ++i) { String slotName = String(input.readString(), true); BoneData *boneData = bones[input.readInt(true)]; SlotData *data = new (__FILE__, __LINE__) SlotData(i, slotName, *boneData); @@ -434,7 +434,7 @@ SkeletonData *SkeletonBinary::readSkeletonData(const unsigned char *binary, cons data->_property = NULL; break; } - if(data->_property) data->_property->_offset = offset * propertyScale; + if (data->_property) data->_property->_offset = offset * propertyScale; data->_offset = input.readFloat(); data->_scale = input.readFloat() / propertyScale; } @@ -1081,12 +1081,12 @@ Animation *SkeletonBinary::readAnimation(DataInput &input, const String &name, S int index = input.readInt(true), frameCount = input.readInt(true), frameLast = frameCount - 1; TransformConstraintTimeline *timeline = new (__FILE__, __LINE__) TransformConstraintTimeline(frameCount, input.readInt(true), index); float time = input.readFloat(), mixRotate = input.readFloat(), mixX = input.readFloat(), mixY = input.readFloat(), - mixScaleX = input.readFloat(), mixScaleY = input.readFloat(), mixShearY = input.readFloat(); + mixScaleX = input.readFloat(), mixScaleY = input.readFloat(), mixShearY = input.readFloat(); for (int frame = 0, bezier = 0;; frame++) { timeline->setFrame(frame, time, mixRotate, mixX, mixY, mixScaleX, mixScaleY, mixShearY); if (frame == frameLast) break; float time2 = input.readFloat(), mixRotate2 = input.readFloat(), mixX2 = input.readFloat(), mixY2 = input.readFloat(), - mixScaleX2 = input.readFloat(), mixScaleY2 = input.readFloat(), mixShearY2 = input.readFloat(); + mixScaleX2 = input.readFloat(), mixScaleY2 = input.readFloat(), mixShearY2 = input.readFloat(); int curveType = input.readByte(); switch (curveType) { case CURVE_STEPPED: @@ -1115,7 +1115,7 @@ Animation *SkeletonBinary::readAnimation(DataInput &input, const String &name, S // Path constraint timelines. for (int i = 0, n = input.readInt(true); i < n; ++i) { int index = input.readInt(true); - PathConstraintData *data = static_cast(skeletonData._constraints[index]); + PathConstraintData *data = static_cast(skeletonData._constraints[index]); for (int ii = 0, nn = input.readInt(true); ii < nn; ii++) { int type = input.readByte(), frameCount = input.readInt(true), bezierCount = input.readInt(true); switch (type) { @@ -1127,8 +1127,8 @@ Animation *SkeletonBinary::readAnimation(DataInput &input, const String &name, S case PATH_SPACING: { readTimeline(input, timelines, *(new (__FILE__, __LINE__) PathConstraintSpacingTimeline(frameCount, - bezierCount, - index)), + bezierCount, + index)), data->_spacingMode == SpacingMode_Length || data->_spacingMode == SpacingMode_Fixed ? scale @@ -1309,7 +1309,7 @@ Animation *SkeletonBinary::readAnimation(DataInput &input, const String &name, S float time = input.readFloat(); int modeAndIndex = input.readInt(); float delay = input.readFloat(); - timeline->setFrame(frame, time, (SequenceMode)(modeAndIndex & 0xf), modeAndIndex >> 4, delay); + timeline->setFrame(frame, time, (SequenceMode) (modeAndIndex & 0xf), modeAndIndex >> 4, delay); } timelines.add(timeline); break; diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp b/spine-cpp/src/spine/SkeletonBounds.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp rename to spine-cpp/src/spine/SkeletonBounds.cpp diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp b/spine-cpp/src/spine/SkeletonClipping.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp rename to spine-cpp/src/spine/SkeletonClipping.cpp diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonData.cpp b/spine-cpp/src/spine/SkeletonData.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/SkeletonData.cpp rename to spine-cpp/src/spine/SkeletonData.cpp diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp b/spine-cpp/src/spine/SkeletonJson.cpp similarity index 99% rename from spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp rename to spine-cpp/src/spine/SkeletonJson.cpp index fef80c7eb..c20d2a5e3 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp +++ b/spine-cpp/src/spine/SkeletonJson.cpp @@ -119,7 +119,7 @@ static float propertyScale(const char *type, float scale) { return 1; } -SkeletonJson::SkeletonJson(Atlas *atlas) : _attachmentLoader(new(__FILE__, __LINE__) AtlasAttachmentLoader(atlas)), +SkeletonJson::SkeletonJson(Atlas *atlas) : _attachmentLoader(new (__FILE__, __LINE__) AtlasAttachmentLoader(atlas)), _scale(1), _ownsLoader(true) {} SkeletonJson::SkeletonJson(AttachmentLoader *attachmentLoader, bool ownsLoader) : _attachmentLoader(attachmentLoader), diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonRenderer.cpp b/spine-cpp/src/spine/SkeletonRenderer.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/SkeletonRenderer.cpp rename to spine-cpp/src/spine/SkeletonRenderer.cpp diff --git a/spine-cpp/spine-cpp/src/spine/Skin.cpp b/spine-cpp/src/spine/Skin.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/Skin.cpp rename to spine-cpp/src/spine/Skin.cpp diff --git a/spine-cpp/spine-cpp/src/spine/Slider.cpp b/spine-cpp/src/spine/Slider.cpp similarity index 91% rename from spine-cpp/spine-cpp/src/spine/Slider.cpp rename to spine-cpp/src/spine/Slider.cpp index 295b52359..db26792bb 100644 --- a/spine-cpp/spine-cpp/src/spine/Slider.cpp +++ b/spine-cpp/src/spine/Slider.cpp @@ -70,8 +70,7 @@ void Slider::update(Skeleton &skeleton, Physics physics) { if (_bone != NULL) { if (!_bone->isActive()) return; if (_data._local) _bone->_applied->validateLocalTransform(skeleton); - p._time = _data._offset - + (_data._property->value(skeleton, *_bone->_applied, _data._local, _offsets) - _data._property->_offset) * _data._scale; + p._time = _data._offset + (_data._property->value(skeleton, *_bone->_applied, _data._local, _offsets) - _data._property->_offset) * _data._scale; if (_data._loop) p._time = animation->getDuration() + MathUtil::fmod(p._time, animation->getDuration()); else @@ -84,7 +83,7 @@ void Slider::update(Skeleton &skeleton, Physics physics) { bones[indices[i]]->_applied->modifyLocal(skeleton); animation->apply(skeleton, p._time, p._time, _data._loop, NULL, p._mix, _data._additive ? MixBlend_Add : MixBlend_Replace, - MixDirection_In, true); + MixDirection_In, true); } void Slider::sort(Skeleton &skeleton) { @@ -109,18 +108,18 @@ void Slider::sort(Skeleton &skeleton) { Timeline *t = timelines[i]; if (t->getRTTI().instanceOf(SlotTimeline::rtti)) { - SlotTimeline *timeline = (SlotTimeline *)t; + SlotTimeline *timeline = (SlotTimeline *) t; skeleton.constrained(*slots[timeline->getSlotIndex()]); } else if (t->getRTTI().instanceOf(PhysicsConstraintTimeline::rtti)) { - PhysicsConstraintTimeline *timeline = (PhysicsConstraintTimeline *)t; + PhysicsConstraintTimeline *timeline = (PhysicsConstraintTimeline *) t; if (timeline->getConstraintIndex() == -1) { for (size_t ii = 0; ii < physicsCount; ii++) skeleton.constrained(*physics[ii]); } else - skeleton.constrained((Posed &)*constraints[timeline->getConstraintIndex()]); + skeleton.constrained((Posed &) *constraints[timeline->getConstraintIndex()]); } else if (t->getRTTI().instanceOf(ConstraintTimeline::rtti)) { - ConstraintTimeline *timeline = (ConstraintTimeline *)t; - skeleton.constrained((Posed &)*constraints[timeline->getConstraintIndex()]); + ConstraintTimeline *timeline = (ConstraintTimeline *) t; + skeleton.constrained((Posed &) *constraints[timeline->getConstraintIndex()]); } } } diff --git a/spine-cpp/spine-cpp/src/spine/SliderData.cpp b/spine-cpp/src/spine/SliderData.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/SliderData.cpp rename to spine-cpp/src/spine/SliderData.cpp diff --git a/spine-cpp/spine-cpp/src/spine/SliderMixTimeline.cpp b/spine-cpp/src/spine/SliderMixTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/SliderMixTimeline.cpp rename to spine-cpp/src/spine/SliderMixTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/SliderPose.cpp b/spine-cpp/src/spine/SliderPose.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/SliderPose.cpp rename to spine-cpp/src/spine/SliderPose.cpp diff --git a/spine-cpp/spine-cpp/src/spine/SliderTimeline.cpp b/spine-cpp/src/spine/SliderTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/SliderTimeline.cpp rename to spine-cpp/src/spine/SliderTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/Slot.cpp b/spine-cpp/src/spine/Slot.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/Slot.cpp rename to spine-cpp/src/spine/Slot.cpp diff --git a/spine-cpp/spine-cpp/src/spine/SlotCurveTimeline.cpp b/spine-cpp/src/spine/SlotCurveTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/SlotCurveTimeline.cpp rename to spine-cpp/src/spine/SlotCurveTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/SlotData.cpp b/spine-cpp/src/spine/SlotData.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/SlotData.cpp rename to spine-cpp/src/spine/SlotData.cpp diff --git a/spine-cpp/spine-cpp/src/spine/SlotPose.cpp b/spine-cpp/src/spine/SlotPose.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/SlotPose.cpp rename to spine-cpp/src/spine/SlotPose.cpp diff --git a/spine-cpp/spine-cpp/src/spine/SlotTimeline.cpp b/spine-cpp/src/spine/SlotTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/SlotTimeline.cpp rename to spine-cpp/src/spine/SlotTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/SpineObject.cpp b/spine-cpp/src/spine/SpineObject.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/SpineObject.cpp rename to spine-cpp/src/spine/SpineObject.cpp diff --git a/spine-cpp/spine-cpp/src/spine/TextureLoader.cpp b/spine-cpp/src/spine/TextureLoader.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/TextureLoader.cpp rename to spine-cpp/src/spine/TextureLoader.cpp diff --git a/spine-cpp/spine-cpp/src/spine/Timeline.cpp b/spine-cpp/src/spine/Timeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/Timeline.cpp rename to spine-cpp/src/spine/Timeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp b/spine-cpp/src/spine/TransformConstraint.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp rename to spine-cpp/src/spine/TransformConstraint.cpp diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp b/spine-cpp/src/spine/TransformConstraintData.cpp similarity index 96% rename from spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp rename to spine-cpp/src/spine/TransformConstraintData.cpp index d79fef084..89f9d8605 100644 --- a/spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp +++ b/spine-cpp/src/spine/TransformConstraintData.cpp @@ -162,8 +162,7 @@ ToProperty::~ToProperty() { float FromRotate::value(Skeleton &skeleton, BonePose &source, bool local, float *offsets) { if (local) return source._rotation + offsets[TransformConstraintData::ROTATION]; float sx = skeleton.getScaleX(), sy = skeleton.getScaleY(); - float value = MathUtil::atan2(source._c / sy, source._a / sx) * MathUtil::Rad_Deg - + ((source._a * source._d - source._b * source._c) * sx * sy > 0 ? offsets[TransformConstraintData::ROTATION] : -offsets[TransformConstraintData::ROTATION]); + float value = MathUtil::atan2(source._c / sy, source._a / sx) * MathUtil::Rad_Deg + ((source._a * source._d - source._b * source._c) * sx * sy > 0 ? offsets[TransformConstraintData::ROTATION] : -offsets[TransformConstraintData::ROTATION]); if (value < 0) value += 360; return value; } @@ -182,7 +181,7 @@ void ToRotate::apply(Skeleton &skeleton, TransformConstraintPose &pose, BonePose if (!additive) value -= MathUtil::atan2(c, a); if (value > MathUtil::Pi) value -= MathUtil::Pi_2; - else if (value < -MathUtil::Pi) // + else if (value < -MathUtil::Pi)// value += MathUtil::Pi_2; value *= pose._mixRotate; float cosVal = MathUtil::cos(value), sinVal = MathUtil::sin(value); @@ -241,7 +240,7 @@ void ToScaleX::apply(Skeleton &skeleton, TransformConstraintPose &pose, BonePose if (local) { if (additive) bone._scaleX *= 1 + (value - 1) * pose._mixScaleX; - else if (bone._scaleX != 0) // + else if (bone._scaleX != 0)// bone._scaleX += (value - bone._scaleX) * pose._mixScaleX; } else if (additive) { float s = 1 + (value - 1) * pose._mixScaleX; @@ -271,7 +270,7 @@ void ToScaleY::apply(Skeleton &skeleton, TransformConstraintPose &pose, BonePose if (local) { if (additive) bone._scaleY *= 1 + (value - 1) * pose._mixScaleY; - else if (bone._scaleY != 0) // + else if (bone._scaleY != 0)// bone._scaleY += (value - bone._scaleY) * pose._mixScaleY; } else if (additive) { float s = 1 + (value - 1) * pose._mixScaleY; @@ -310,7 +309,7 @@ void ToShearY::apply(Skeleton &skeleton, TransformConstraintPose &pose, BonePose value -= by - MathUtil::atan2(bone._c / sy, bone._a / sx); if (value > MathUtil::Pi) value -= MathUtil::Pi_2; - else if (value < -MathUtil::Pi) // + else if (value < -MathUtil::Pi)// value += MathUtil::Pi_2; } value = by + value * pose._mixShearY; @@ -333,6 +332,6 @@ TransformConstraintData::~TransformConstraintData() { _properties.clear(); } -Constraint* TransformConstraintData::create(Skeleton& skeleton) { +Constraint *TransformConstraintData::create(Skeleton &skeleton) { return new (__FILE__, __LINE__) TransformConstraint(*this, skeleton); } \ No newline at end of file diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraintPose.cpp b/spine-cpp/src/spine/TransformConstraintPose.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/TransformConstraintPose.cpp rename to spine-cpp/src/spine/TransformConstraintPose.cpp diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp b/spine-cpp/src/spine/TransformConstraintTimeline.cpp similarity index 99% rename from spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp rename to spine-cpp/src/spine/TransformConstraintTimeline.cpp index 55d142b03..ed379cc07 100644 --- a/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp +++ b/spine-cpp/src/spine/TransformConstraintTimeline.cpp @@ -48,7 +48,7 @@ TransformConstraintTimeline::TransformConstraintTimeline(size_t frameCount, size int transformConstraintIndex) : CurveTimeline(frameCount, TransformConstraintTimeline::ENTRIES, bezierCount), - ConstraintTimeline(transformConstraintIndex) { + ConstraintTimeline(transformConstraintIndex) { PropertyId ids[] = {((PropertyId) Property_TransformConstraint << 32) | transformConstraintIndex}; setPropertyIds(ids, 1); } diff --git a/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp b/spine-cpp/src/spine/TranslateTimeline.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp rename to spine-cpp/src/spine/TranslateTimeline.cpp diff --git a/spine-cpp/spine-cpp/src/spine/Triangulator.cpp b/spine-cpp/src/spine/Triangulator.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/Triangulator.cpp rename to spine-cpp/src/spine/Triangulator.cpp diff --git a/spine-cpp/spine-cpp/src/spine/Update.cpp b/spine-cpp/src/spine/Update.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/Update.cpp rename to spine-cpp/src/spine/Update.cpp diff --git a/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp b/spine-cpp/src/spine/VertexAttachment.cpp similarity index 100% rename from spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp rename to spine-cpp/src/spine/VertexAttachment.cpp diff --git a/spine-cpp/tests/CMakeLists.txt b/spine-cpp/tests/CMakeLists.txt new file mode 100644 index 000000000..bdd96009a --- /dev/null +++ b/spine-cpp/tests/CMakeLists.txt @@ -0,0 +1,4 @@ +# Create DebugPrinter executable +add_executable(DebugPrinter ${CMAKE_CURRENT_SOURCE_DIR}/src/DebugPrinter.cpp) +target_link_libraries(DebugPrinter spine-cpp) +target_compile_features(DebugPrinter PRIVATE cxx_std_11) \ No newline at end of file diff --git a/spine-cpp/tests/src/DebugPrinter.cpp b/spine-cpp/tests/src/DebugPrinter.cpp new file mode 100644 index 000000000..7f058ca4a --- /dev/null +++ b/spine-cpp/tests/src/DebugPrinter.cpp @@ -0,0 +1,200 @@ +/****************************************************************************** + * Spine Runtimes License Agreement + * Last updated April 5, 2025. Replaces all prior versions. + * + * Copyright (c) 2013-2025, Esoteric Software LLC + * + * Integration of the Spine Runtimes into software or otherwise creating + * derivative works of the Spine Runtimes is permitted under the terms and + * conditions of Section 2 of the Spine Editor License Agreement: + * http://esotericsoftware.com/spine-editor-license + * + * Otherwise, it is permitted to integrate the Spine Runtimes into software + * or otherwise create derivative works of the Spine Runtimes (collectively, + * "Products"), provided that each user of the Products must obtain their own + * Spine Editor license and redistribution of the Products in any form must + * include this license and copyright notice. + * + * THE SPINE RUNTIMES ARE PROVIDED BY ESOTERIC SOFTWARE LLC "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL ESOTERIC SOFTWARE LLC BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, + * BUSINESS INTERRUPTION, OR LOSS OF USE, DATA, OR PROFITS) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + *****************************************************************************/ + +#include +#include +#include +#include +#include + +using namespace spine; + +// Provide the default extension implementation +namespace spine { + SpineExtension *getDefaultExtension() { + return new DefaultSpineExtension(); + } +}// namespace spine + +// Mock texture that doesn't require OpenGL +class MockTexture { +public: + int width = 1024; + int height = 1024; +}; + +// Custom texture loader that doesn't load actual textures +class HeadlessTextureLoader : public TextureLoader { +public: + virtual void load(AtlasPage &page, const String &path) override { + // Don't load actual texture, just set dimensions + page.texture = new MockTexture(); + page.width = 1024; + page.height = 1024; + } + + virtual void unload(void *texture) override { + delete static_cast(texture); + } +}; + +class Printer { +private: + int indentLevel = 0; + static constexpr const char *INDENT = " "; + + void print(const char *format, ...) { + for (int i = 0; i < indentLevel; i++) { + printf("%s", INDENT); + } + va_list args; + va_start(args, format); + vprintf(format, args); + va_end(args); + printf("\n"); + } + + void indent() { + indentLevel++; + } + + void unindent() { + indentLevel--; + } + +public: + void printSkeletonData(SkeletonData *data) { + print("SkeletonData {"); + indent(); + + print("name: \"%s\"", data->getName().buffer()); + print("version: \"%s\"", data->getVersion().buffer()); + print("hash: \"%s\"", data->getHash().buffer()); + print("x: %.6f", data->getX()); + print("y: %.6f", data->getY()); + print("width: %.6f", data->getWidth()); + print("height: %.6f", data->getHeight()); + print("referenceScale: %.6f", data->getReferenceScale()); + print("fps: %.6f", data->getFps()); + print("imagesPath: \"%s\"", data->getImagesPath().buffer()); + print("audioPath: \"%s\"", data->getAudioPath().buffer()); + + // TODO: Add bones, slots, skins, animations, etc. in future expansion + + unindent(); + print("}"); + } + + void printSkeleton(Skeleton *skeleton) { + print("Skeleton {"); + indent(); + + print("x: %.6f", skeleton->getX()); + print("y: %.6f", skeleton->getY()); + print("scaleX: %.6f", skeleton->getScaleX()); + print("scaleY: %.6f", skeleton->getScaleY()); + print("time: %.6f", skeleton->getTime()); + + // TODO: Add runtime state (bones, slots, etc.) in future expansion + + unindent(); + print("}"); + } +}; + +int main(int argc, char *argv[]) { + if (argc < 4) { + fprintf(stderr, "Usage: DebugPrinter \n"); + return 1; + } + + const char *skeletonPath = argv[1]; + const char *atlasPath = argv[2]; + const char *animationName = argv[3]; + + // Load atlas with headless texture loader + HeadlessTextureLoader textureLoader; + Atlas *atlas = new Atlas(atlasPath, &textureLoader); + + // Load skeleton data + SkeletonData *skeletonData = nullptr; + + if (strstr(skeletonPath, ".json") != nullptr) { + SkeletonJson json(atlas); + skeletonData = json.readSkeletonDataFile(skeletonPath); + } else { + SkeletonBinary binary(atlas); + skeletonData = binary.readSkeletonDataFile(skeletonPath); + } + + if (!skeletonData) { + fprintf(stderr, "Failed to load skeleton data\n"); + delete atlas; + return 1; + } + + // Print skeleton data + printf("=== SKELETON DATA ===\n"); + Printer printer; + printer.printSkeletonData(skeletonData); + + // Create skeleton instance + Skeleton skeleton(*skeletonData); + + // Create animation state + AnimationStateData stateData(skeletonData); + AnimationState state(&stateData); + + // Find and set animation + Animation *animation = skeletonData->findAnimation(animationName); + if (!animation) { + fprintf(stderr, "Animation not found: %s\n", animationName); + delete skeletonData; + delete atlas; + return 1; + } + + state.setAnimation(0, animation, true); + + // Update and apply + state.update(0.016f); + state.apply(skeleton); + skeleton.update(0.016f); + skeleton.updateWorldTransform(Physics_Update); + + // Print skeleton state + printf("\n=== SKELETON STATE ===\n"); + printer.printSkeleton(&skeleton); + + // Cleanup + delete skeletonData; + delete atlas; + + return 0; +} \ No newline at end of file