[cpp] 4.3 porting WIP

spine-cpp/spine-cpp/include/spine/BoneLocal.h

@@ -37,7 +37,7 @@
 
 namespace spine {
 	/// Stores a bone's local pose.
-	class SP_API BoneLocal : public SpineObject, public Pose<BoneLocal> {
+	class SP_API BoneLocal : public Pose<BoneLocal> {
 		RTTI_DECL
 
 	private:

spine-cpp/spine-cpp/include/spine/SlotPose.h

@@ -0,0 +1,92 @@
+/******************************************************************************
+ * Spine Runtimes License Agreement
+ * Last updated January 1, 2020. Replaces all prior versions.
+ *
+ * Copyright (c) 2013-2020, 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.
+ *****************************************************************************/
+
+#ifndef SPINE_SLOTPOSE_H_
+#define SPINE_SLOTPOSE_H_
+
+#include <spine/SpineObject.h>
+#include <spine/RTTI.h>
+#include <spine/Pose.h>
+#include <spine/Color.h>
+#include <spine/Vector.h>
+
+namespace spine {
+	class Attachment;
+	class VertexAttachment;
+
+	class SP_API SlotPose : public Pose<SlotPose> {
+		RTTI_DECL
+
+	private:
+		Color _color;
+		Color _darkColor;
+		bool _hasDarkColor;
+		Attachment* _attachment;
+		int _sequenceIndex;
+		Vector<float> _deform;
+
+	public:
+		SlotPose();
+		virtual ~SlotPose();
+
+		virtual void set(SlotPose& pose) override;
+
+		/// The color used to tint the slot's attachment. If getDarkColor() is set, this is used as the light color for two
+		/// color tinting.
+		Color& getColor();
+
+		/// The dark color used to tint the slot's attachment for two color tinting. The dark
+		/// color's alpha is not used.
+		Color& getDarkColor();
+
+		/// Returns true if this slot has a dark color.
+		bool hasDarkColor();
+
+		/// The current attachment for the slot, or null if the slot has no attachment.
+		Attachment* getAttachment();
+
+		/// Sets the slot's attachment and, if the attachment changed, resets sequenceIndex and clears the deform.
+		/// The deform is not cleared if the old attachment has the same VertexAttachment::getTimelineAttachment() as the
+		/// specified attachment.
+		void setAttachment(Attachment* attachment);
+
+		/// The index of the texture region to display when the slot's attachment has a Sequence. -1 represents the
+		/// Sequence::getSetupIndex().
+		int getSequenceIndex();
+		void setSequenceIndex(int sequenceIndex);
+
+		/// Values to deform the slot's attachment. For an unweighted mesh, the entries are local positions for each vertex. For a
+		/// weighted mesh, the entries are an offset for each vertex which will be added to the mesh's local vertex positions.
+		/// 
+		/// See VertexAttachment::computeWorldVertices() and DeformTimeline.
+		Vector<float>& getDeform();
+	};
+}
+
+#endif /* SPINE_SLOTPOSE_H_ */

spine-cpp/spine-cpp/include/spine/spine.h

@@ -108,6 +108,7 @@
 #include <spine/SliderPose.h>
 #include <spine/Slot.h>
 #include <spine/SlotData.h>
+#include <spine/SlotPose.h>
 #include <spine/SlotTimeline.h>
 #include <spine/SpacingMode.h>
 #include <spine/SpineObject.h>

spine-cpp/spine-cpp/src/spine/BoneLocal.cpp

@@ -28,7 +28,6 @@
  *****************************************************************************/
 
 #include <spine/BoneLocal.h>
-#include <spine/SpineException.h>
 
 using namespace spine;
 

spine-cpp/spine-cpp/src/spine/SlotPose.cpp

@@ -0,0 +1,96 @@
+/******************************************************************************
+ * Spine Runtimes License Agreement
+ * Last updated January 1, 2020. Replaces all prior versions.
+ *
+ * Copyright (c) 2013-2020, 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 <spine/SlotPose.h>
+#include <spine/Attachment.h>
+#include <spine/VertexAttachment.h>
+
+using namespace spine;
+
+RTTI_IMPL_NOPARENT(SlotPose)
+
+SlotPose::SlotPose() : _color(1, 1, 1, 1), _darkColor(0, 0, 0, 0), _hasDarkColor(false), _attachment(nullptr), _sequenceIndex(-1) {
+}
+
+SlotPose::~SlotPose() {
+}
+
+void SlotPose::set(SlotPose& pose) {
+	_color.set(pose._color);
+	if (pose._hasDarkColor) _darkColor.set(pose._darkColor);
+	_hasDarkColor = pose._hasDarkColor;
+	_attachment = pose._attachment;
+	_sequenceIndex = pose._sequenceIndex;
+	_deform.clear();
+	_deform.addAll(pose._deform);
+}
+
+Color& SlotPose::getColor() {
+	return _color;
+}
+
+Color& SlotPose::getDarkColor() {
+	return _darkColor;
+}
+
+bool SlotPose::hasDarkColor() {
+	return _hasDarkColor;
+}
+
+Attachment* SlotPose::getAttachment() {
+	return _attachment;
+}
+
+void SlotPose::setAttachment(Attachment* attachment) {
+	if (_attachment == attachment) return;
+	
+	// Check if we need to clear deform based on timeline attachment
+	if (!attachment ||
+		!_attachment ||
+		!attachment->getRTTI().instanceOf(VertexAttachment::rtti) ||
+		!_attachment->getRTTI().instanceOf(VertexAttachment::rtti) ||
+		static_cast<VertexAttachment*>(attachment)->getTimelineAttachment() !=
+			static_cast<VertexAttachment*>(_attachment)->getTimelineAttachment()) {
+		_deform.clear();
+	}
+	_attachment = attachment;
+	_sequenceIndex = -1;
+}
+
+int SlotPose::getSequenceIndex() {
+	return _sequenceIndex;
+}
+
+void SlotPose::setSequenceIndex(int sequenceIndex) {
+	_sequenceIndex = sequenceIndex;
+}
+
+Vector<float>& SlotPose::getDeform() {
+	return _deform;
+}