From bd665df1d3bdfb1607f5223399a71db1e76fee0e Mon Sep 17 00:00:00 2001 From: badlogic Date: Mon, 5 Mar 2018 16:58:12 +0100 Subject: [PATCH] [cpp] Cleaned up API. --- spine-cpp/spine-cpp/include/spine/Animation.h | 4 +- .../spine-cpp/include/spine/AnimationState.h | 9 +-- .../include/spine/AnimationStateData.h | 4 - .../include/spine/AtlasAttachmentLoader.h | 2 - .../include/spine/AttachmentTimeline.h | 3 - spine-cpp/spine-cpp/include/spine/Bone.h | 2 - spine-cpp/spine-cpp/include/spine/BoneData.h | 2 - .../include/spine/BoundingBoxAttachment.h | 2 - .../include/spine/ClippingAttachment.h | 2 - spine-cpp/spine-cpp/include/spine/Color.h | 46 ++++++------ .../spine-cpp/include/spine/ColorTimeline.h | 2 - .../spine-cpp/include/spine/DeformTimeline.h | 2 - .../include/spine/DrawOrderTimeline.h | 2 - spine-cpp/spine-cpp/include/spine/Event.h | 2 - spine-cpp/spine-cpp/include/spine/EventData.h | 2 - .../spine-cpp/include/spine/EventTimeline.h | 2 - .../spine-cpp/include/spine/IkConstraint.h | 2 - .../include/spine/IkConstraintData.h | 2 - .../spine-cpp/include/spine/LinkedMesh.h | 2 - .../spine-cpp/include/spine/MeshAttachment.h | 7 -- .../spine-cpp/include/spine/PathAttachment.h | 3 - .../spine-cpp/include/spine/PathConstraint.h | 2 - .../include/spine/PathConstraintData.h | 1 - .../spine-cpp/include/spine/PointAttachment.h | 2 - spine-cpp/spine-cpp/include/spine/RTTI.h | 2 - .../include/spine/RegionAttachment.h | 2 - .../spine-cpp/include/spine/RotateTimeline.h | 1 - spine-cpp/spine-cpp/include/spine/Skeleton.h | 2 - .../spine-cpp/include/spine/SkeletonBinary.h | 2 - .../spine-cpp/include/spine/SkeletonBounds.h | 5 -- .../include/spine/SkeletonClipping.h | 2 - .../spine-cpp/include/spine/SkeletonData.h | 14 ---- .../spine-cpp/include/spine/SkeletonJson.h | 2 - spine-cpp/spine-cpp/include/spine/Skin.h | 4 - spine-cpp/spine-cpp/include/spine/Slot.h | 4 - spine-cpp/spine-cpp/include/spine/SlotData.h | 2 - .../include/spine/TransformConstraint.h | 2 - .../include/spine/TransformConstraintData.h | 2 - .../spine-cpp/include/spine/Triangulator.h | 2 - .../include/spine/VertexAttachment.h | 2 - spine-cpp/spine-cpp/src/spine/Animation.cpp | 11 +-- .../spine-cpp/src/spine/AnimationState.cpp | 7 +- .../src/spine/AnimationStateData.cpp | 4 +- spine-cpp/spine-cpp/src/spine/Atlas.cpp | 5 +- spine-cpp/spine-cpp/src/spine/Attachment.cpp | 4 +- .../spine-cpp/src/spine/AttachmentLoader.cpp | 4 +- .../src/spine/AttachmentTimeline.cpp | 14 +--- spine-cpp/spine-cpp/src/spine/Bone.cpp | 5 +- spine-cpp/spine-cpp/src/spine/BoneData.cpp | 5 +- .../src/spine/BoundingBoxAttachment.cpp | 4 +- .../src/spine/ClippingAttachment.cpp | 4 +- .../spine-cpp/src/spine/ColorTimeline.cpp | 17 ++--- spine-cpp/spine-cpp/src/spine/Constraint.cpp | 4 +- .../spine-cpp/src/spine/CurveTimeline.cpp | 4 +- .../spine-cpp/src/spine/DeformTimeline.cpp | 14 +--- .../spine-cpp/src/spine/DrawOrderTimeline.cpp | 14 +--- spine-cpp/spine-cpp/src/spine/Event.cpp | 5 +- spine-cpp/spine-cpp/src/spine/EventData.cpp | 5 +- .../spine-cpp/src/spine/EventTimeline.cpp | 13 +--- spine-cpp/spine-cpp/src/spine/Extension.cpp | 4 +- .../spine-cpp/src/spine/IkConstraint.cpp | 5 +- .../spine-cpp/src/spine/IkConstraintData.cpp | 5 +- .../src/spine/IkConstraintTimeline.cpp | 4 +- spine-cpp/spine-cpp/src/spine/Json.cpp | 5 +- spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp | 5 +- .../spine-cpp/src/spine/MeshAttachment.cpp | 24 +----- .../spine-cpp/src/spine/PathAttachment.cpp | 10 +-- .../spine-cpp/src/spine/PathConstraint.cpp | 5 +- .../src/spine/PathConstraintData.cpp | 5 +- .../src/spine/PathConstraintMixTimeline.cpp | 4 +- .../spine/PathConstraintPositionTimeline.cpp | 4 +- .../spine/PathConstraintSpacingTimeline.cpp | 4 +- .../spine-cpp/src/spine/PointAttachment.cpp | 5 +- spine-cpp/spine-cpp/src/spine/RTTI.cpp | 5 +- .../spine-cpp/src/spine/RegionAttachment.cpp | 4 +- .../spine-cpp/src/spine/RotateTimeline.cpp | 8 +- .../spine-cpp/src/spine/ScaleTimeline.cpp | 4 +- .../spine-cpp/src/spine/ShearTimeline.cpp | 4 +- spine-cpp/spine-cpp/src/spine/Skeleton.cpp | 4 +- .../spine-cpp/src/spine/SkeletonBinary.cpp | 12 +-- .../spine-cpp/src/spine/SkeletonBounds.cpp | 6 +- .../spine-cpp/src/spine/SkeletonClipping.cpp | 5 +- .../spine-cpp/src/spine/SkeletonData.cpp | 28 +------ .../spine-cpp/src/spine/SkeletonJson.cpp | 42 +++++------ spine-cpp/spine-cpp/src/spine/Skin.cpp | 4 +- spine-cpp/spine-cpp/src/spine/Slot.cpp | 9 +-- spine-cpp/spine-cpp/src/spine/SlotData.cpp | 5 +- spine-cpp/spine-cpp/src/spine/SpineObject.cpp | 3 +- .../src/spine/TransformConstraint.cpp | 4 +- .../src/spine/TransformConstraintData.cpp | 4 +- .../src/spine/TransformConstraintTimeline.cpp | 4 +- .../spine-cpp/src/spine/TranslateTimeline.cpp | 4 +- .../spine-cpp/src/spine/Triangulator.cpp | 4 +- .../spine-cpp/src/spine/TwoColorTimeline.cpp | 74 +++++++++---------- spine-cpp/spine-cpp/src/spine/Updatable.cpp | 4 +- .../spine-cpp/src/spine/VertexAttachment.cpp | 12 +-- spine-sfml/cpp/example/main.cpp | 8 +- spine-sfml/cpp/src/spine/spine-sfml.cpp | 26 +++---- 98 files changed, 218 insertions(+), 460 deletions(-) diff --git a/spine-cpp/spine-cpp/include/spine/Animation.h b/spine-cpp/spine-cpp/include/spine/Animation.h index a6d5ef711..82684fd3c 100644 --- a/spine-cpp/spine-cpp/include/spine/Animation.h +++ b/spine-cpp/spine-cpp/include/spine/Animation.h @@ -93,9 +93,7 @@ public: const String &getName(); - Vector getTimelines(); - - void setTimelines(Vector &inValue); + Vector &getTimelines(); float getDuration(); diff --git a/spine-cpp/spine-cpp/include/spine/AnimationState.h b/spine-cpp/spine-cpp/include/spine/AnimationState.h index bd6fcf2e8..cf2f97c6c 100644 --- a/spine-cpp/spine-cpp/include/spine/AnimationState.h +++ b/spine-cpp/spine-cpp/include/spine/AnimationState.h @@ -250,8 +250,6 @@ namespace Spine { Event* _event; EventQueueEntry(EventType eventType, TrackEntry* trackEntry, Event* event = NULL); - - }; class EventQueue : public SpineObject { @@ -370,14 +368,15 @@ namespace Spine { AnimationStateData* getData(); /// A list of tracks that have animations, which may contain NULLs. - Vector getTracks(); + Vector &getTracks(); + float getTimeScale(); void setTimeScale(float inValue); + void setOnAnimationEventFunc(OnAnimationEventFunc inValue); + void setRendererObject(void* inValue); void* getRendererObject(); - - private: static const int Subsequent, First, Dip, DipMix; diff --git a/spine-cpp/spine-cpp/include/spine/AnimationStateData.h b/spine-cpp/spine-cpp/include/spine/AnimationStateData.h index 94b650d92..39c9368a3 100644 --- a/spine-cpp/spine-cpp/include/spine/AnimationStateData.h +++ b/spine-cpp/spine-cpp/include/spine/AnimationStateData.h @@ -68,8 +68,6 @@ namespace Spine { /// float getMix(Animation* from, Animation* to); - - private: class AnimationPair : public SpineObject { public: @@ -79,8 +77,6 @@ namespace Spine { explicit AnimationPair(Animation* a1 = NULL, Animation* a2 = NULL); bool operator==(const AnimationPair &other) const; - - }; struct HashAnimationPair : public SpineObject { diff --git a/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h b/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h index 028589879..c01725da1 100644 --- a/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h +++ b/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h @@ -63,8 +63,6 @@ namespace Spine { virtual ClippingAttachment* newClippingAttachment(Skin& skin, const String& name); AtlasRegion* findRegion(const String& name); - - private: Atlas* _atlas; diff --git a/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h b/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h index cdfe0e712..1b414e887 100644 --- a/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h @@ -38,7 +38,6 @@ #include #include - namespace Spine { class Skeleton; class Event; @@ -62,9 +61,7 @@ namespace Spine { int getSlotIndex(); void setSlotIndex(int inValue); const Vector& getFrames(); - void setFrames(Vector& inValue); // time, ... const Vector& getAttachmentNames(); - void setAttachmentNames(Vector& inValue); int getFrameCount(); private: int _slotIndex; diff --git a/spine-cpp/spine-cpp/include/spine/Bone.h b/spine-cpp/spine-cpp/include/spine/Bone.h index 65eddbb26..1950e6250 100644 --- a/spine-cpp/spine-cpp/include/spine/Bone.h +++ b/spine-cpp/spine-cpp/include/spine/Bone.h @@ -221,8 +221,6 @@ public: /// Returns the magnitide (always positive) of the world scale Y. float getWorldScaleY(); - - private: static bool yDown; diff --git a/spine-cpp/spine-cpp/include/spine/BoneData.h b/spine-cpp/spine-cpp/include/spine/BoneData.h index 47b2457c2..903679384 100644 --- a/spine-cpp/spine-cpp/include/spine/BoneData.h +++ b/spine-cpp/spine-cpp/include/spine/BoneData.h @@ -107,8 +107,6 @@ public: void setTransformMode(TransformMode inValue); - - private: const int _index; const String _name; diff --git a/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h b/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h index f5b8b2229..066aa0487 100644 --- a/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h @@ -40,8 +40,6 @@ namespace Spine { RTTI_DECL explicit BoundingBoxAttachment(const String& name); - - }; } diff --git a/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h b/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h index 5a2fdcc5b..7d69efc8f 100644 --- a/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h @@ -49,8 +49,6 @@ namespace Spine { SlotData* getEndSlot(); void setEndSlot(SlotData* inValue); - - private: SlotData* _endSlot; diff --git a/spine-cpp/spine-cpp/include/spine/Color.h b/spine-cpp/spine-cpp/include/spine/Color.h index e97ed6f18..db737b4b2 100644 --- a/spine-cpp/spine-cpp/include/spine/Color.h +++ b/spine-cpp/spine-cpp/include/spine/Color.h @@ -35,58 +35,58 @@ namespace Spine { class Color : public SpineObject { public: - Color() : _r(0), _g(0), _b(0), _a(0) { + Color() : r(0), g(0), b(0), a(0) { } - Color(float r, float g, float b, float a) : _r(r), _g(g), _b(b), _a(a) { + Color(float r, float g, float b, float a) : r(r), g(g), b(b), a(a) { clamp(); } inline Color &set(float r, float g, float b, float a) { - _r = r; - _g = g; - _b = b; - _a = a; + r = r; + g = g; + b = b; + a = a; clamp(); return *this; } inline Color &set(const Color &other) { - _r = other._r; - _g = other._g; - _b = other._b; - _a = other._a; + r = other.r; + g = other.g; + b = other.b; + a = other.a; clamp(); return *this; } inline Color &add(float r, float g, float b, float a) { - _r += r; - _g += g; - _b += b; - _a += a; + r += r; + g += g; + b += b; + a += a; clamp(); return *this; } inline Color &add(const Color &other) { - _r += other._r; - _g += other._g; - _b += other._b; - _a += other._a; + r += other.r; + g += other.g; + b += other.b; + a += other.a; clamp(); return *this; } inline Color &clamp() { - _r = MathUtil::clamp(this->_r, 0, 1); - _g = MathUtil::clamp(this->_g, 0, 1); - _b = MathUtil::clamp(this->_b, 0, 1); - _a = MathUtil::clamp(this->_a, 0, 1); + r = MathUtil::clamp(this->r, 0, 1); + g = MathUtil::clamp(this->g, 0, 1); + b = MathUtil::clamp(this->b, 0, 1); + a = MathUtil::clamp(this->a, 0, 1); return *this; } - float _r, _g, _b, _a; + float r, g, b, a; }; } diff --git a/spine-cpp/spine-cpp/include/spine/ColorTimeline.h b/spine-cpp/spine-cpp/include/spine/ColorTimeline.h index b9dac17a8..6006b2b80 100644 --- a/spine-cpp/spine-cpp/include/spine/ColorTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/ColorTimeline.h @@ -61,8 +61,6 @@ public: Vector &getFrames(); - void setFrames(Vector &inValue); // time, r, g, b, a, ... - protected: static const int PREV_TIME, PREV_R, PREV_G, PREV_B, PREV_A; static const int R, G, B, A; diff --git a/spine-cpp/spine-cpp/include/spine/DeformTimeline.h b/spine-cpp/spine-cpp/include/spine/DeformTimeline.h index c33797d85..8e8ec9832 100644 --- a/spine-cpp/spine-cpp/include/spine/DeformTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/DeformTimeline.h @@ -55,9 +55,7 @@ namespace Spine { int getSlotIndex(); void setSlotIndex(int inValue); Vector& getFrames(); - void setFrames(Vector& inValue); // time, ... Vector< Vector >& getVertices(); - void setVertices(Vector< Vector >& inValue); VertexAttachment* getAttachment(); void setAttachment(VertexAttachment* inValue); diff --git a/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h b/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h index 6a3b06c5b..3baff271d 100644 --- a/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h @@ -52,9 +52,7 @@ namespace Spine { void setFrame(int frameIndex, float time, Vector& drawOrder); Vector& getFrames(); - void setFrames(Vector& inValue); // time, ... Vector< Vector >& getDrawOrders(); - void setDrawOrders(Vector< Vector >& inValue); int getFrameCount(); private: diff --git a/spine-cpp/spine-cpp/include/spine/Event.h b/spine-cpp/spine-cpp/include/spine/Event.h index ec304a8ba..9e6ab13a7 100644 --- a/spine-cpp/spine-cpp/include/spine/Event.h +++ b/spine-cpp/spine-cpp/include/spine/Event.h @@ -65,8 +65,6 @@ public: void setStringValue(const String &inValue); - - private: const EventData &_data; const float _time; diff --git a/spine-cpp/spine-cpp/include/spine/EventData.h b/spine-cpp/spine-cpp/include/spine/EventData.h index fb442c384..3de4a7591 100644 --- a/spine-cpp/spine-cpp/include/spine/EventData.h +++ b/spine-cpp/spine-cpp/include/spine/EventData.h @@ -61,8 +61,6 @@ public: void setStringValue(const String &inValue); - - private: const String _name; int _intValue; diff --git a/spine-cpp/spine-cpp/include/spine/EventTimeline.h b/spine-cpp/spine-cpp/include/spine/EventTimeline.h index 62e97daed..0d1b61f15 100644 --- a/spine-cpp/spine-cpp/include/spine/EventTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/EventTimeline.h @@ -53,9 +53,7 @@ namespace Spine { void setFrame(int frameIndex, Event* event); Vector getFrames(); - void setFrames(Vector& inValue); Vector& getEvents(); - void setEvents(Vector& inValue); int getFrameCount(); private: diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraint.h b/spine-cpp/spine-cpp/include/spine/IkConstraint.h index 223946a1b..6ec13ce6e 100644 --- a/spine-cpp/spine-cpp/include/spine/IkConstraint.h +++ b/spine-cpp/spine-cpp/include/spine/IkConstraint.h @@ -84,8 +84,6 @@ public: void setMix(float inValue); - - private: IkConstraintData &_data; Vector _bones; diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraintData.h b/spine-cpp/spine-cpp/include/spine/IkConstraintData.h index 18f72eb62..a6fad159c 100644 --- a/spine-cpp/spine-cpp/include/spine/IkConstraintData.h +++ b/spine-cpp/spine-cpp/include/spine/IkConstraintData.h @@ -68,8 +68,6 @@ namespace Spine { float getMix(); void setMix(float inValue); - - private: const String _name; int _order; diff --git a/spine-cpp/spine-cpp/include/spine/LinkedMesh.h b/spine-cpp/spine-cpp/include/spine/LinkedMesh.h index f74e8f96f..3dba61ca4 100644 --- a/spine-cpp/spine-cpp/include/spine/LinkedMesh.h +++ b/spine-cpp/spine-cpp/include/spine/LinkedMesh.h @@ -45,8 +45,6 @@ class LinkedMesh : public SpineObject { public: LinkedMesh(MeshAttachment *mesh, const String &skin, int slotIndex, const String &parent); - - private: MeshAttachment *_mesh; String _skin; diff --git a/spine-cpp/spine-cpp/include/spine/MeshAttachment.h b/spine-cpp/spine-cpp/include/spine/MeshAttachment.h index ec0090b68..cdc4b7860 100644 --- a/spine-cpp/spine-cpp/include/spine/MeshAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/MeshAttachment.h @@ -35,7 +35,6 @@ #include #include - namespace Spine { /// Attachment that displays a texture region using a mesh. class MeshAttachment : public VertexAttachment { @@ -56,14 +55,11 @@ namespace Spine { void setHullLength(float inValue); Vector& getRegionUVs(); - void setRegionUVs(Vector& inValue); /// The UV pair for each vertex, normalized within the entire texture. See also MeshAttachment::updateUVs Vector& getUVs(); - void setUVs(Vector& inValue); Vector& getTriangles(); - void setTriangles(Vector& inValue); Color& getColor(); @@ -116,14 +112,11 @@ namespace Spine { // Nonessential. Vector& getEdges(); - void setEdges(Vector& inValue); float getWidth(); void setWidth(float inValue); float getHeight(); void setHeight(float inValue); - - private: float _regionOffsetX, _regionOffsetY, _regionWidth, _regionHeight, _regionOriginalWidth, _regionOriginalHeight; MeshAttachment* _parentMesh; diff --git a/spine-cpp/spine-cpp/include/spine/PathAttachment.h b/spine-cpp/spine-cpp/include/spine/PathAttachment.h index ad3771b89..5d927310e 100644 --- a/spine-cpp/spine-cpp/include/spine/PathAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/PathAttachment.h @@ -45,13 +45,10 @@ namespace Spine { /// The length in the setup pose from the start of the path to the end of each curve. Vector& getLengths(); - void setLengths(Vector& inValue); bool isClosed(); void setClosed(bool inValue); bool isConstantSpeed(); void setConstantSpeed(bool inValue); - - private: Vector _lengths; diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraint.h b/spine-cpp/spine-cpp/include/spine/PathConstraint.h index 5ec215c08..9bc041010 100644 --- a/spine-cpp/spine-cpp/include/spine/PathConstraint.h +++ b/spine-cpp/spine-cpp/include/spine/PathConstraint.h @@ -78,8 +78,6 @@ namespace Spine { void setTarget(Slot* inValue); PathConstraintData& getData(); - - private: static const float EPSILON; diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintData.h b/spine-cpp/spine-cpp/include/spine/PathConstraintData.h index 3067c2043..1051b8156 100644 --- a/spine-cpp/spine-cpp/include/spine/PathConstraintData.h +++ b/spine-cpp/spine-cpp/include/spine/PathConstraintData.h @@ -89,7 +89,6 @@ namespace Spine { float getTranslateMix(); void setTranslateMix(float inValue); - private: const String _name; int _order; diff --git a/spine-cpp/spine-cpp/include/spine/PointAttachment.h b/spine-cpp/spine-cpp/include/spine/PointAttachment.h index b3383f342..61ae21ba0 100644 --- a/spine-cpp/spine-cpp/include/spine/PointAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/PointAttachment.h @@ -64,8 +64,6 @@ namespace Spine { float getRotation(); void setRotation(float inValue); - - private: float _x, _y, _rotation; diff --git a/spine-cpp/spine-cpp/include/spine/RTTI.h b/spine-cpp/spine-cpp/include/spine/RTTI.h index 71d4e06c1..fd3413eb0 100644 --- a/spine-cpp/spine-cpp/include/spine/RTTI.h +++ b/spine-cpp/spine-cpp/include/spine/RTTI.h @@ -48,8 +48,6 @@ public: bool instanceOf(const RTTI &rtti) const; - - private: // Prevent copying RTTI(const RTTI &obj); diff --git a/spine-cpp/spine-cpp/include/spine/RegionAttachment.h b/spine-cpp/spine-cpp/include/spine/RegionAttachment.h index e408756d7..5b8f1098a 100644 --- a/spine-cpp/spine-cpp/include/spine/RegionAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/RegionAttachment.h @@ -106,8 +106,6 @@ namespace Spine { Vector& getOffset(); Vector& getUVs(); - - private: static const int BLX; diff --git a/spine-cpp/spine-cpp/include/spine/RotateTimeline.h b/spine-cpp/spine-cpp/include/spine/RotateTimeline.h index a102c05a8..55279238e 100644 --- a/spine-cpp/spine-cpp/include/spine/RotateTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/RotateTimeline.h @@ -57,7 +57,6 @@ namespace Spine { void setBoneIndex(int inValue); Vector& getFrames(); - void setFrames(Vector inValue); private: static const int PREV_TIME = -2; diff --git a/spine-cpp/spine-cpp/include/spine/Skeleton.h b/spine-cpp/spine-cpp/include/spine/Skeleton.h index a62da2124..f485a62ad 100644 --- a/spine-cpp/spine-cpp/include/spine/Skeleton.h +++ b/spine-cpp/spine-cpp/include/spine/Skeleton.h @@ -212,8 +212,6 @@ public: void setFlipY(bool inValue); - - private: SkeletonData *_data; Vector _bones; diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonBinary.h b/spine-cpp/spine-cpp/include/spine/SkeletonBinary.h index 340ba2406..f58f1390e 100644 --- a/spine-cpp/spine-cpp/include/spine/SkeletonBinary.h +++ b/spine-cpp/spine-cpp/include/spine/SkeletonBinary.h @@ -80,8 +80,6 @@ namespace Spine { void setScale(float scale) { _scale = scale; } String& getError() { return _error; } - - private: struct DataInput : public SpineObject { diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonBounds.h b/spine-cpp/spine-cpp/include/spine/SkeletonBounds.h index 2f78488d7..205198823 100644 --- a/spine-cpp/spine-cpp/include/spine/SkeletonBounds.h +++ b/spine-cpp/spine-cpp/include/spine/SkeletonBounds.h @@ -37,7 +37,6 @@ namespace Spine { class Skeleton; class BoundingBoxAttachment; - class Polygon; /// @@ -86,8 +85,6 @@ namespace Spine { float getWidth(); float getHeight(); - - private: Vector _polygonPool; Vector _boundingBoxes; @@ -105,8 +102,6 @@ namespace Spine { Polygon() : _count(0) { _vertices.ensureCapacity(16); } - - }; } diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonClipping.h b/spine-cpp/spine-cpp/include/spine/SkeletonClipping.h index 7ea44d94e..11f1cb279 100644 --- a/spine-cpp/spine-cpp/include/spine/SkeletonClipping.h +++ b/spine-cpp/spine-cpp/include/spine/SkeletonClipping.h @@ -55,8 +55,6 @@ namespace Spine { Vector& getClippedVertices(); Vector& getClippedTriangles(); Vector& getClippedUVs(); - - private: Triangulator _triangulator; diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonData.h b/spine-cpp/spine-cpp/include/spine/SkeletonData.h index ad6bd172b..05160ea41 100644 --- a/spine-cpp/spine-cpp/include/spine/SkeletonData.h +++ b/spine-cpp/spine-cpp/include/spine/SkeletonData.h @@ -111,8 +111,6 @@ public: /// All skins, including the default skin. Vector &getSkins(); - void setSkins(Vector &inValue); - /// The skeleton's default skin. /// By default this skin contains all attachments that were not in a skin in Spine. /// @@ -123,24 +121,14 @@ public: Vector &getEvents(); - void setEvents(Vector &inValue); - Vector &getAnimations(); - void setAnimations(Vector &inValue); - Vector &getIkConstraints(); - void setIkConstraints(Vector &inValue); - Vector &getTransformConstraints(); - void setTransformConstraints(Vector &inValue); - Vector &getPathConstraints(); - void setPathConstraints(Vector &inValue); - float getWidth(); void setWidth(float inValue); @@ -167,8 +155,6 @@ public: void setFps(float inValue); - - private: String _name; Vector _bones; // Ordered parents first diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonJson.h b/spine-cpp/spine-cpp/include/spine/SkeletonJson.h index a3209f79f..04bcc213a 100644 --- a/spine-cpp/spine-cpp/include/spine/SkeletonJson.h +++ b/spine-cpp/spine-cpp/include/spine/SkeletonJson.h @@ -70,8 +70,6 @@ public: String &getError() { return _error; } - - private: AttachmentLoader *_attachmentLoader; Vector _linkedMeshes; diff --git a/spine-cpp/spine-cpp/include/spine/Skin.h b/spine-cpp/spine-cpp/include/spine/Skin.h index 0440a2c20..b23730bb5 100644 --- a/spine-cpp/spine-cpp/include/spine/Skin.h +++ b/spine-cpp/spine-cpp/include/spine/Skin.h @@ -60,8 +60,6 @@ public: } bool operator==(const AttachmentKey &other) const; - - }; struct HashAttachmentKey : public SpineObject { @@ -93,8 +91,6 @@ public: HashMap &getAttachments(); - - private: const String _name; HashMap _attachments; diff --git a/spine-cpp/spine-cpp/include/spine/Slot.h b/spine-cpp/spine-cpp/include/spine/Slot.h index 75b6c8c7f..b5248414b 100644 --- a/spine-cpp/spine-cpp/include/spine/Slot.h +++ b/spine-cpp/spine-cpp/include/spine/Slot.h @@ -113,10 +113,6 @@ public: Vector &getAttachmentVertices(); - void setAttachmentVertices(Vector &inValue); - - - private: SlotData &_data; Bone &_bone; diff --git a/spine-cpp/spine-cpp/include/spine/SlotData.h b/spine-cpp/spine-cpp/include/spine/SlotData.h index b8a745e36..7551d30ae 100644 --- a/spine-cpp/spine-cpp/include/spine/SlotData.h +++ b/spine-cpp/spine-cpp/include/spine/SlotData.h @@ -98,8 +98,6 @@ public: void setBlendMode(BlendMode inValue); - - private: const int _index; String _name; diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraint.h b/spine-cpp/spine-cpp/include/spine/TransformConstraint.h index 4569a5645..69dc172ff 100644 --- a/spine-cpp/spine-cpp/include/spine/TransformConstraint.h +++ b/spine-cpp/spine-cpp/include/spine/TransformConstraint.h @@ -73,8 +73,6 @@ namespace Spine { float getShearMix(); void setShearMix(float inValue); - - private: TransformConstraintData& _data; diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraintData.h b/spine-cpp/spine-cpp/include/spine/TransformConstraintData.h index d292462fc..7fb0cfcb3 100644 --- a/spine-cpp/spine-cpp/include/spine/TransformConstraintData.h +++ b/spine-cpp/spine-cpp/include/spine/TransformConstraintData.h @@ -67,8 +67,6 @@ namespace Spine { bool isRelative(); bool isLocal(); - - private: const String _name; diff --git a/spine-cpp/spine-cpp/include/spine/Triangulator.h b/spine-cpp/spine-cpp/include/spine/Triangulator.h index 8d04ce0fc..a888677d5 100644 --- a/spine-cpp/spine-cpp/include/spine/Triangulator.h +++ b/spine-cpp/spine-cpp/include/spine/Triangulator.h @@ -43,8 +43,6 @@ public: Vector< Vector* > &decompose(Vector &vertices, Vector &triangles); - - private: Vector* > _convexPolygons; Vector* > _convexPolygonsIndices; diff --git a/spine-cpp/spine-cpp/include/spine/VertexAttachment.h b/spine-cpp/spine-cpp/include/spine/VertexAttachment.h index d1ce5ff1c..7015b12ea 100644 --- a/spine-cpp/spine-cpp/include/spine/VertexAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/VertexAttachment.h @@ -68,10 +68,8 @@ namespace Spine { int getId(); Vector& getBones(); - void setBones(Vector inValue); Vector& getVertices(); - void setVertices(Vector inValue); int getWorldVerticesLength(); void setWorldVerticesLength(int inValue); diff --git a/spine-cpp/spine-cpp/src/spine/Animation.cpp b/spine-cpp/spine-cpp/src/spine/Animation.cpp index a8e5e6267..bc06e0ec7 100644 --- a/spine-cpp/spine-cpp/src/spine/Animation.cpp +++ b/spine-cpp/spine-cpp/src/spine/Animation.cpp @@ -36,7 +36,8 @@ #include -namespace Spine { +using namespace Spine; + Animation::Animation(const String &name, Vector &timelines, float duration) : _timelines(timelines), _duration(duration), @@ -66,15 +67,10 @@ const String &Animation::getName() { return _name; } -Vector Animation::getTimelines() { +Vector &Animation::getTimelines() { return _timelines; } -void Animation::setTimelines(Vector &inValue) { - _timelines.clear(); - _timelines.addAll(inValue); -} - float Animation::getDuration() { return _duration; } @@ -140,4 +136,3 @@ int Animation::linearSearch(Vector &values, float target, int step) { return -1; } -} diff --git a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp index d92ce8225..dc158d5cb 100644 --- a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp +++ b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp @@ -42,7 +42,8 @@ #include #include -namespace Spine { +using namespace Spine; + void dummyOnAnimationEventFunc(AnimationState *state, EventType type, TrackEntry *entry, Event *event = NULL) { } @@ -633,7 +634,7 @@ AnimationStateData *AnimationState::getData() { return _data; } -Vector AnimationState::getTracks() { +Vector &AnimationState::getTracks() { return _tracks; } @@ -980,5 +981,3 @@ void AnimationState::animationsChanged() { } } } - -} diff --git a/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp b/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp index 0facd1916..9c1fa4384 100644 --- a/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp +++ b/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp @@ -33,7 +33,8 @@ #include #include -namespace Spine { +using namespace Spine; + AnimationStateData::AnimationStateData(SkeletonData *skeletonData) : _skeletonData(skeletonData), _defaultMix(0) { } @@ -97,4 +98,3 @@ AnimationStateData::HashAnimationPair::operator()(const Spine::AnimationStateDat return (((h1 << 5) + h1) ^ h2); } -} diff --git a/spine-cpp/spine-cpp/src/spine/Atlas.cpp b/spine-cpp/spine-cpp/src/spine/Atlas.cpp index 103885796..9b9dc6542 100644 --- a/spine-cpp/spine-cpp/src/spine/Atlas.cpp +++ b/spine-cpp/spine-cpp/src/spine/Atlas.cpp @@ -34,7 +34,8 @@ #include -namespace Spine { +using namespace Spine; + Atlas::Atlas(const String &path, TextureLoader *textureLoader) : _textureLoader(textureLoader) { int dirLength; char *dir; @@ -348,5 +349,3 @@ int Atlas::equals(Str *str, const char *other) { int Atlas::toInt(Str *str) { return (int) strtol(str->begin, (char **) &str->end, 10); } - -} diff --git a/spine-cpp/spine-cpp/src/spine/Attachment.cpp b/spine-cpp/spine-cpp/src/spine/Attachment.cpp index 082ad130c..a9194e32e 100644 --- a/spine-cpp/spine-cpp/src/spine/Attachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/Attachment.cpp @@ -32,7 +32,8 @@ #include -namespace Spine { +using namespace Spine; + RTTI_IMPL_NOPARENT(Attachment); Attachment::Attachment(const String &name) : _name(name) { @@ -45,4 +46,3 @@ Attachment::~Attachment() { const String &Attachment::getName() const { return _name; } -} diff --git a/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp b/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp index cd9d3017b..872639d63 100644 --- a/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp +++ b/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp @@ -38,7 +38,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL_NOPARENT(AttachmentLoader); AttachmentLoader::AttachmentLoader() { @@ -46,4 +47,3 @@ AttachmentLoader::AttachmentLoader() { AttachmentLoader::~AttachmentLoader() { } -} diff --git a/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp b/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp index 455801b93..139f48792 100644 --- a/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp @@ -38,7 +38,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(AttachmentTimeline, Timeline); AttachmentTimeline::AttachmentTimeline(int frameCount) : Timeline(), _slotIndex(0) { @@ -108,21 +109,10 @@ const Vector &AttachmentTimeline::getFrames() { return _frames; } -void AttachmentTimeline::setFrames(Vector &inValue) { - _frames.clear(); - _frames.addAll(inValue); -} - const Vector &AttachmentTimeline::getAttachmentNames() { return _attachmentNames; } -void AttachmentTimeline::setAttachmentNames(Vector &inValue) { - _attachmentNames.clear(); - _attachmentNames.addAll(inValue); -} - int AttachmentTimeline::getFrameCount() { return static_cast(_frames.size()); } -} diff --git a/spine-cpp/spine-cpp/src/spine/Bone.cpp b/spine-cpp/spine-cpp/src/spine/Bone.cpp index c635879cb..441c7c5ec 100644 --- a/spine-cpp/spine-cpp/src/spine/Bone.cpp +++ b/spine-cpp/spine-cpp/src/spine/Bone.cpp @@ -33,7 +33,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(Bone, Updatable); bool Bone::yDown = false; @@ -544,5 +545,3 @@ void Bone::updateAppliedTransform() { } } } - -} diff --git a/spine-cpp/spine-cpp/src/spine/BoneData.cpp b/spine-cpp/spine-cpp/src/spine/BoneData.cpp index aefcefd14..584116b9f 100644 --- a/spine-cpp/spine-cpp/src/spine/BoneData.cpp +++ b/spine-cpp/spine-cpp/src/spine/BoneData.cpp @@ -32,7 +32,8 @@ #include -namespace Spine { +using namespace Spine; + BoneData::BoneData(int index, const String &name, BoneData *parent) : _index(index), _name(name), @@ -133,5 +134,3 @@ TransformMode BoneData::getTransformMode() { void BoneData::setTransformMode(TransformMode inValue) { _transformMode = inValue; } - -} diff --git a/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp b/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp index bfde45b02..0457392df 100644 --- a/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp @@ -30,9 +30,9 @@ #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(BoundingBoxAttachment, VertexAttachment); BoundingBoxAttachment::BoundingBoxAttachment(const String &name) : VertexAttachment(name) { } -} diff --git a/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp b/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp index 7ce1712a5..fc36c5059 100644 --- a/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp @@ -32,7 +32,8 @@ #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(ClippingAttachment, VertexAttachment); ClippingAttachment::ClippingAttachment(const String &name) : VertexAttachment(name), _endSlot(NULL) { @@ -45,4 +46,3 @@ SlotData *ClippingAttachment::getEndSlot() { void ClippingAttachment::setEndSlot(SlotData *inValue) { _endSlot = inValue; } -} diff --git a/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp b/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp index 85db8c01c..c23ac053d 100644 --- a/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp @@ -38,7 +38,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(ColorTimeline, CurveTimeline); const int ColorTimeline::ENTRIES = 5; @@ -69,9 +70,9 @@ void ColorTimeline::apply(Skeleton &skeleton, float lastTime, float time, Vector case MixPose_Current: { Color &color = slot.getColor(); Color &setup = slot.getData().getColor(); - color.add((setup._r - color._r) * alpha, (setup._g - color._g) * alpha, - (setup._b - color._b) * alpha, - (setup._a - color._a) * alpha); + color.add((setup.r - color.r) * alpha, (setup.g - color.g) * alpha, + (setup.b - color.b) * alpha, + (setup.a - color.a) * alpha); return; } case MixPose_CurrentLayered: @@ -110,7 +111,7 @@ void ColorTimeline::apply(Skeleton &skeleton, float lastTime, float time, Vector } else { Color &color = slot.getColor(); if (pose == MixPose_Setup) color.set(slot.getData().getColor()); - color.add((r - color._r) * alpha, (g - color._g) * alpha, (b - color._b) * alpha, (a - color._a) * alpha); + color.add((r - color.r) * alpha, (g - color.g) * alpha, (b - color.b) * alpha, (a - color.a) * alpha); } } @@ -138,9 +139,3 @@ void ColorTimeline::setSlotIndex(int inValue) { Vector &ColorTimeline::getFrames() { return _frames; } - -void ColorTimeline::setFrames(Vector &inValue) { - _frames.clear(); - _frames.addAll(inValue); -} -} diff --git a/spine-cpp/spine-cpp/src/spine/Constraint.cpp b/spine-cpp/spine-cpp/src/spine/Constraint.cpp index 163ddd2db..7b22995c8 100644 --- a/spine-cpp/spine-cpp/src/spine/Constraint.cpp +++ b/spine-cpp/spine-cpp/src/spine/Constraint.cpp @@ -30,7 +30,8 @@ #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(Constraint, Updatable); Constraint::Constraint() { @@ -38,4 +39,3 @@ Constraint::Constraint() { Constraint::~Constraint() { } -} diff --git a/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp b/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp index aa53b748a..78b9ccd9d 100644 --- a/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp @@ -32,7 +32,8 @@ #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(CurveTimeline, Timeline); const float CurveTimeline::LINEAR = 0; @@ -122,4 +123,3 @@ float CurveTimeline::getCurvePercent(int frameIndex, float percent) { float CurveTimeline::getCurveType(int frameIndex) { return _curves[frameIndex * BEZIER_SIZE]; } -} diff --git a/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp b/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp index c930a1a61..cf039e48d 100644 --- a/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp @@ -40,7 +40,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(DeformTimeline, CurveTimeline); DeformTimeline::DeformTimeline(int frameCount) : CurveTimeline(frameCount), _slotIndex(0), _attachment(NULL) { @@ -206,20 +207,10 @@ Vector &DeformTimeline::getFrames() { return _frames; } -void DeformTimeline::setFrames(Vector &inValue) { - _frames.clear(); - _frames.addAll(inValue); -} - Vector > &DeformTimeline::getVertices() { return _frameVertices; } -void DeformTimeline::setVertices(Vector > &inValue) { - _frameVertices.clear(); - _frameVertices.addAll(inValue); -} - VertexAttachment *DeformTimeline::getAttachment() { return _attachment; } @@ -227,4 +218,3 @@ VertexAttachment *DeformTimeline::getAttachment() { void DeformTimeline::setAttachment(VertexAttachment *inValue) { _attachment = inValue; } -} diff --git a/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp b/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp index 14c05dc76..0e50307f4 100644 --- a/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp @@ -38,7 +38,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(DrawOrderTimeline, Timeline); DrawOrderTimeline::DrawOrderTimeline(int frameCount) : Timeline() { @@ -112,21 +113,10 @@ Vector &DrawOrderTimeline::getFrames() { return _frames; } -void DrawOrderTimeline::setFrames(Vector &inValue) { - _frames.clear(); - _frames.addAll(inValue); -} - Vector > &DrawOrderTimeline::getDrawOrders() { return _drawOrders; } -void DrawOrderTimeline::setDrawOrders(Vector > &inValue) { - _drawOrders.clear(); - _drawOrders.addAll(inValue); -} - int DrawOrderTimeline::getFrameCount() { return static_cast(_frames.size()); } -} diff --git a/spine-cpp/spine-cpp/src/spine/Event.cpp b/spine-cpp/spine-cpp/src/spine/Event.cpp index f93a7caf4..d7fd00d5f 100644 --- a/spine-cpp/spine-cpp/src/spine/Event.cpp +++ b/spine-cpp/spine-cpp/src/spine/Event.cpp @@ -32,7 +32,8 @@ #include -namespace Spine { +using namespace Spine; + Event::Event(float time, const EventData &data) : _data(data), _time(time), @@ -72,5 +73,3 @@ const String &Event::getStringValue() { void Event::setStringValue(const String &inValue) { _stringValue = inValue; } - -} diff --git a/spine-cpp/spine-cpp/src/spine/EventData.cpp b/spine-cpp/spine-cpp/src/spine/EventData.cpp index 118420661..aa6f10cc4 100644 --- a/spine-cpp/spine-cpp/src/spine/EventData.cpp +++ b/spine-cpp/spine-cpp/src/spine/EventData.cpp @@ -32,7 +32,8 @@ #include -namespace Spine { +using namespace Spine; + EventData::EventData(const String &name) : _name(name), _intValue(0), @@ -69,5 +70,3 @@ const String &EventData::getStringValue() { void EventData::setStringValue(const String &inValue) { _stringValue = inValue; } - -} diff --git a/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp b/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp index 9312b70e6..4e432e517 100644 --- a/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp @@ -40,7 +40,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(EventTimeline, Timeline); EventTimeline::EventTimeline(int frameCount) : Timeline() { @@ -110,16 +111,6 @@ void EventTimeline::setFrame(int frameIndex, Event *event) { Vector EventTimeline::getFrames() { return _frames; } -void EventTimeline::setFrames(Vector &inValue) { - _frames.clear(); - _frames.addAll(inValue); -} // time, ... Vector &EventTimeline::getEvents() { return _events; } -void EventTimeline::setEvents(Vector &inValue) { - _events.clear(); - _events.addAll(inValue); -} - int EventTimeline::getFrameCount() { return static_cast(_frames.size()); } -} diff --git a/spine-cpp/spine-cpp/src/spine/Extension.cpp b/spine-cpp/spine-cpp/src/spine/Extension.cpp index f17ca6feb..27f8d4492 100644 --- a/spine-cpp/spine-cpp/src/spine/Extension.cpp +++ b/spine-cpp/spine-cpp/src/spine/Extension.cpp @@ -33,7 +33,8 @@ #include -namespace Spine { +using namespace Spine; + DefaultSpineExtension _defaultExtension; SpineExtension *SpineExtension::_instance = &_defaultExtension; @@ -109,4 +110,3 @@ char *DefaultSpineExtension::_readFile(const String &path, int *length) { DefaultSpineExtension::DefaultSpineExtension() : SpineExtension() { } -} diff --git a/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp b/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp index e79a905df..e7a5432a6 100644 --- a/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp +++ b/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp @@ -36,7 +36,8 @@ #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(IkConstraint, Constraint); void IkConstraint::apply(Bone &bone, float targetX, float targetY, float alpha) { @@ -257,5 +258,3 @@ float IkConstraint::getMix() { void IkConstraint::setMix(float inValue) { _mix = inValue; } - -} diff --git a/spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp b/spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp index cdbfaa4de..8a5d3a52c 100644 --- a/spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp +++ b/spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp @@ -32,7 +32,8 @@ #include -namespace Spine { +using namespace Spine; + IkConstraintData::IkConstraintData(const String &name) : _name(name), _order(0), @@ -80,5 +81,3 @@ float IkConstraintData::getMix() { void IkConstraintData::setMix(float inValue) { _mix = inValue; } - -} diff --git a/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp b/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp index f502867ae..9434b7483 100644 --- a/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp @@ -40,7 +40,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(IkConstraintTimeline, CurveTimeline); const int IkConstraintTimeline::ENTRIES = 3; @@ -122,4 +123,3 @@ void IkConstraintTimeline::setFrame(int frameIndex, float time, float mix, int b _frames[frameIndex + MIX] = mix; _frames[frameIndex + BEND_DIRECTION] = bendDirection; } -} diff --git a/spine-cpp/spine-cpp/src/spine/Json.cpp b/spine-cpp/spine-cpp/src/spine/Json.cpp index a1308bc0a..19c528a50 100644 --- a/spine-cpp/spine-cpp/src/spine/Json.cpp +++ b/spine-cpp/spine-cpp/src/spine/Json.cpp @@ -48,7 +48,8 @@ #include #include -namespace Spine { +using namespace Spine; + const int Json::JSON_FALSE = 0; const int Json::JSON_TRUE = 1; const int Json::JSON_NULL = 2; @@ -537,5 +538,3 @@ int Json::json_strcasecmp(const char *s1, const char *s2) { } } } - -} diff --git a/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp b/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp index 2f4602698..46bf8569f 100644 --- a/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp +++ b/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp @@ -32,12 +32,11 @@ #include -namespace Spine { +using namespace Spine; + LinkedMesh::LinkedMesh(MeshAttachment *mesh, const String &skin, int slotIndex, const String &parent) : _mesh(mesh), _skin(skin), _slotIndex(slotIndex), _parent(parent) { } - -} diff --git a/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp b/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp index 6662694e0..fc6027d1a 100644 --- a/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp @@ -30,7 +30,8 @@ #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(MeshAttachment, VertexAttachment); MeshAttachment::MeshAttachment(const String &name) : VertexAttachment(name), @@ -90,29 +91,14 @@ Vector &MeshAttachment::getRegionUVs() { return _regionUVs; } -void MeshAttachment::setRegionUVs(Vector &inValue) { - _regionUVs.clear(); - _regionUVs.addAll(inValue); -} - Vector &MeshAttachment::getUVs() { return _uvs; } -void MeshAttachment::setUVs(Vector &inValue) { - _uvs.clear(); - _uvs.addAll(inValue); -} - Vector &MeshAttachment::getTriangles() { return _triangles; } -void MeshAttachment::setTriangles(Vector &inValue) { - _triangles.clear(); - _triangles.addAll(inValue); -} - const String &MeshAttachment::getPath() { return _path; } @@ -248,10 +234,6 @@ Vector &MeshAttachment::getEdges() { return _edges; } -void MeshAttachment::setEdges(Vector &inValue) { - _edges.clearAndAddAll(inValue); -} - float MeshAttachment::getWidth() { return _width; } @@ -271,5 +253,3 @@ void MeshAttachment::setHeight(float inValue) { Spine::Color &MeshAttachment::getColor() { return _color; } - -} diff --git a/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp b/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp index 9d4e0c2b1..ab3a24d8e 100644 --- a/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp @@ -30,7 +30,8 @@ #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(PathAttachment, VertexAttachment); PathAttachment::PathAttachment(const String &name) : VertexAttachment(name), _closed(false), _constantSpeed(false) { @@ -40,11 +41,6 @@ Vector &PathAttachment::getLengths() { return _lengths; } -void PathAttachment::setLengths(Vector &inValue) { - _lengths.clear(); - _lengths.addAll(inValue); -} - bool PathAttachment::isClosed() { return _closed; } @@ -60,5 +56,3 @@ bool PathAttachment::isConstantSpeed() { void PathAttachment::setConstantSpeed(bool inValue) { _constantSpeed = inValue; } - -} diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp index ae92b79d8..e01a7a8c1 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp @@ -39,7 +39,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(PathConstraint, Constraint); const float PathConstraint::EPSILON = 0.00001f; @@ -546,5 +547,3 @@ void PathConstraint::addCurvePosition(float p, float x1, float y1, float cx1, fl x - (x1 * uu + cx1 * ut * 2 + cx2 * tt)); } } - -} diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp index 1ad2ab5ba..810e795b1 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp @@ -35,7 +35,8 @@ #include -namespace Spine { +using namespace Spine; + PathConstraintData::PathConstraintData(const String &name) : _name(name), _order(0), @@ -138,5 +139,3 @@ float PathConstraintData::getTranslateMix() { void PathConstraintData::setTranslateMix(float inValue) { _translateMix = inValue; } - -} diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp index 7e02e44b4..27d7efb59 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp @@ -40,7 +40,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(PathConstraintMixTimeline, CurveTimeline); const int PathConstraintMixTimeline::ENTRIES = 3; @@ -114,4 +115,3 @@ void PathConstraintMixTimeline::setFrame(int frameIndex, float time, float rotat _frames[frameIndex + ROTATE] = rotateMix; _frames[frameIndex + TRANSLATE] = translateMix; } -} diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp index a598e1fc8..8faaec966 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp @@ -40,7 +40,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(PathConstraintPositionTimeline, CurveTimeline); const int PathConstraintPositionTimeline::ENTRIES = 2; @@ -104,4 +105,3 @@ void PathConstraintPositionTimeline::setFrame(int frameIndex, float time, float _frames[frameIndex] = time; _frames[frameIndex + VALUE] = value; } -} diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp index 71ccca329..95be6b683 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp @@ -40,7 +40,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(PathConstraintSpacingTimeline, PathConstraintPositionTimeline); PathConstraintSpacingTimeline::PathConstraintSpacingTimeline(int frameCount) : PathConstraintPositionTimeline( @@ -90,4 +91,3 @@ void PathConstraintSpacingTimeline::apply(Skeleton &skeleton, float lastTime, fl int PathConstraintSpacingTimeline::getPropertyId() { return ((int) TimelineType_PathConstraintSpacing << 24) + _pathConstraintIndex; } -} diff --git a/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp b/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp index f6723f5f8..6fbd29d96 100644 --- a/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp @@ -34,7 +34,8 @@ #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(PointAttachment, Attachment); PointAttachment::PointAttachment(const String &name) : Attachment(name), _x(0), _y(0), _rotation(0) { @@ -76,5 +77,3 @@ float PointAttachment::getRotation() { void PointAttachment::setRotation(float inValue) { _rotation = inValue; } - -} diff --git a/spine-cpp/spine-cpp/src/spine/RTTI.cpp b/spine-cpp/spine-cpp/src/spine/RTTI.cpp index 29daaf86c..8d1b1e145 100644 --- a/spine-cpp/spine-cpp/src/spine/RTTI.cpp +++ b/spine-cpp/spine-cpp/src/spine/RTTI.cpp @@ -31,7 +31,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI::RTTI(const std::string &className) : _className(className), _pBaseRTTI(NULL) { } @@ -59,5 +60,3 @@ bool RTTI::instanceOf(const RTTI &rtti) const { return false; } - -} diff --git a/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp b/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp index f441db5b2..fc67a6f4e 100644 --- a/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp @@ -34,7 +34,8 @@ #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(RegionAttachment, Attachment); const int RegionAttachment::BLX = 0; @@ -283,4 +284,3 @@ Vector &RegionAttachment::getUVs() { Spine::Color &RegionAttachment::getColor() { return _color; } -} diff --git a/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp b/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp index 5916994f4..aff617a5a 100644 --- a/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp @@ -38,7 +38,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(RotateTimeline, CurveTimeline); RotateTimeline::RotateTimeline(int frameCount) : CurveTimeline(frameCount), _boneIndex(0) { @@ -125,8 +126,3 @@ void RotateTimeline::setBoneIndex(int inValue) { Vector &RotateTimeline::getFrames() { return _frames; } - -void RotateTimeline::setFrames(Vector inValue) { - _frames.clearAndAddAll(inValue); -} -} diff --git a/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp b/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp index 3fd3b9aa1..8d8e8e18c 100644 --- a/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp @@ -38,7 +38,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(ScaleTimeline, TranslateTimeline); ScaleTimeline::ScaleTimeline(int frameCount) : TranslateTimeline(frameCount) { @@ -111,4 +112,3 @@ void ScaleTimeline::apply(Skeleton &skeleton, float lastTime, float time, Vector int ScaleTimeline::getPropertyId() { return ((int) TimelineType_Scale << 24) + _boneIndex; } -} diff --git a/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp b/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp index 4ad305f6f..e2fc21d08 100644 --- a/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp @@ -38,7 +38,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(ShearTimeline, TranslateTimeline); ShearTimeline::ShearTimeline(int frameCount) : TranslateTimeline(frameCount) { @@ -95,4 +96,3 @@ void ShearTimeline::apply(Skeleton &skeleton, float lastTime, float time, Vector int ShearTimeline::getPropertyId() { return ((int) TimelineType_Shear << 24) + _boneIndex; } -} diff --git a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp b/spine-cpp/spine-cpp/src/spine/Skeleton.cpp index 85de4a5f9..44bb6eb23 100644 --- a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp +++ b/spine-cpp/spine-cpp/src/spine/Skeleton.cpp @@ -50,7 +50,8 @@ #include -namespace Spine { +using namespace Spine; + Skeleton::Skeleton(SkeletonData *skeletonData) : _data(skeletonData), _skin(NULL), @@ -644,4 +645,3 @@ void Skeleton::sortReset(Vector &bones) { bone->_sorted = false; } } -} diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp index 36e8521e4..0cfce85f1 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp @@ -71,7 +71,8 @@ #include #include -namespace Spine { +using namespace Spine; + const int SkeletonBinary::BONE_ROTATE = 0; const int SkeletonBinary::BONE_TRANSLATE = 1; const int SkeletonBinary::BONE_SCALE = 2; @@ -401,10 +402,10 @@ int SkeletonBinary::readInt(DataInput *input) { } void SkeletonBinary::readColor(DataInput *input, Color &color) { - color._r = readByte(input) / 255.0f; - color._g = readByte(input) / 255.0f; - color._b = readByte(input) / 255.0f; - color._a = readByte(input) / 255.0f; + color.r = readByte(input) / 255.0f; + color.g = readByte(input) / 255.0f; + color.b = readByte(input) / 255.0f; + color.a = readByte(input) / 255.0f; } int SkeletonBinary::readVarint(DataInput *input, bool optimizePositive) { @@ -1008,4 +1009,3 @@ void SkeletonBinary::readCurve(DataInput *input, int frameIndex, CurveTimeline * } } } -} diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp index f85188f41..b41180b2c 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp @@ -35,7 +35,8 @@ #include -namespace Spine { +using namespace Spine; + SkeletonBounds::SkeletonBounds() : _minX(0), _minY(0), _maxX(0), _maxY(0) { } @@ -231,6 +232,3 @@ void SkeletonBounds::aabbCompute() { _maxX = maxX; _maxY = maxY; } - -} - diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp index efe09d9bf..d44498544 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp @@ -33,7 +33,8 @@ #include #include -namespace Spine { +using namespace Spine; + SkeletonClipping::SkeletonClipping() : _clipAttachment(NULL) { _clipOutput.ensureCapacity(128); _clippedVertices.ensureCapacity(128); @@ -315,5 +316,3 @@ void SkeletonClipping::makeClockwise(Vector &polygon) { polygon[other + 1] = y; } } - -} diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonData.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonData.cpp index 41f9b06f3..19e70caef 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonData.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonData.cpp @@ -41,7 +41,8 @@ #include -namespace Spine { +using namespace Spine; + SkeletonData::SkeletonData() : _name(), _defaultSkin(NULL), @@ -131,10 +132,6 @@ Vector &SkeletonData::getSkins() { return _skins; } -void SkeletonData::setSkins(Vector &inValue) { - _skins.clearAndAddAll(inValue); -} - Skin *SkeletonData::getDefaultSkin() { return _defaultSkin; } @@ -147,42 +144,22 @@ Vector &SkeletonData::getEvents() { return _events; } -void SkeletonData::setEvents(Vector &inValue) { - _events.clearAndAddAll(inValue); -} - Vector &SkeletonData::getAnimations() { return _animations; } -void SkeletonData::setAnimations(Vector &inValue) { - _animations.clearAndAddAll(inValue); -} - Vector &SkeletonData::getIkConstraints() { return _ikConstraints; } -void SkeletonData::setIkConstraints(Vector &inValue) { - _ikConstraints.clearAndAddAll(inValue); -} - Vector &SkeletonData::getTransformConstraints() { return _transformConstraints; } -void SkeletonData::setTransformConstraints(Vector &inValue) { - _transformConstraints.clearAndAddAll(inValue); -} - Vector &SkeletonData::getPathConstraints() { return _pathConstraints; } -void SkeletonData::setPathConstraints(Vector &inValue) { - _pathConstraints.clearAndAddAll(inValue); -} - float SkeletonData::getWidth() { return _width; } @@ -230,4 +207,3 @@ float SkeletonData::getFps() { void SkeletonData::setFps(float inValue) { _fps = inValue; } -} diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp index 3f47b3134..44d736c1f 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp @@ -75,7 +75,8 @@ #define strdup _strdup #endif -namespace Spine { +using namespace Spine; + SkeletonJson::SkeletonJson(Atlas *atlas) : _attachmentLoader(new(__FILE__, __LINE__) AtlasAttachmentLoader(atlas)), _scale(1), _ownsLoader(true) { } @@ -210,19 +211,19 @@ SkeletonData *SkeletonJson::readSkeletonData(const char *json) { color = Json::getString(slotMap, "color", 0); if (color) { Color &c = data->getColor(); - c._r = toColor(color, 0); - c._g = toColor(color, 1); - c._b = toColor(color, 2); - c._a = toColor(color, 3); + c.r = toColor(color, 0); + c.g = toColor(color, 1); + c.b = toColor(color, 2); + c.a = toColor(color, 3); } dark = Json::getString(slotMap, "dark", 0); if (dark) { Color &darkColor = data->getDarkColor(); - darkColor._r = toColor(dark, 0); - darkColor._g = toColor(dark, 1); - darkColor._b = toColor(dark, 2); - darkColor._a = toColor(dark, 3); + darkColor.r = toColor(dark, 0); + darkColor.g = toColor(dark, 1); + darkColor.b = toColor(dark, 2); + darkColor.a = toColor(dark, 3); data->setHasDarkColor(true); } @@ -487,10 +488,10 @@ SkeletonData *SkeletonJson::readSkeletonData(const char *json) { color = Json::getString(attachmentMap, "color", 0); if (color) { - region->getColor()._r = toColor(color, 0); - region->getColor()._g = toColor(color, 1); - region->getColor()._b = toColor(color, 2); - region->getColor()._a = toColor(color, 3); + region->getColor().r = toColor(color, 0); + region->getColor().g = toColor(color, 1); + region->getColor().b = toColor(color, 2); + region->getColor().a = toColor(color, 3); } region->updateOffset(); @@ -506,10 +507,10 @@ SkeletonData *SkeletonJson::readSkeletonData(const char *json) { color = Json::getString(attachmentMap, "color", 0); if (color) { - mesh->getColor()._r = toColor(color, 0); - mesh->getColor()._g = toColor(color, 1); - mesh->getColor()._b = toColor(color, 2); - mesh->getColor()._a = toColor(color, 3); + mesh->getColor().r = toColor(color, 0); + mesh->getColor().g = toColor(color, 1); + mesh->getColor().b = toColor(color, 2); + mesh->getColor().a = toColor(color, 3); } mesh->_width = Json::getFloat(attachmentMap, "width", 32) * _scale; @@ -1185,7 +1186,7 @@ void SkeletonJson::readVertices(Json *attachmentMap, VertexAttachment *attachmen } } - attachment->setVertices(vertices); + attachment->getVertices().clearAndAddAll(vertices); return; } @@ -1204,8 +1205,8 @@ void SkeletonJson::readVertices(Json *attachmentMap, VertexAttachment *attachmen } } - attachment->setVertices(bonesAndWeights._vertices); - attachment->setBones(bonesAndWeights._bones); + attachment->getVertices().clearAndAddAll(bonesAndWeights._vertices); + attachment->getBones().clearAndAddAll(bonesAndWeights._bones); } void SkeletonJson::setError(Json *root, const String &value1, const String &value2) { @@ -1213,4 +1214,3 @@ void SkeletonJson::setError(Json *root, const String &value1, const String &valu delete root; } -} diff --git a/spine-cpp/spine-cpp/src/spine/Skin.cpp b/spine-cpp/spine-cpp/src/spine/Skin.cpp index 5ad008818..efe600e88 100644 --- a/spine-cpp/spine-cpp/src/spine/Skin.cpp +++ b/spine-cpp/spine-cpp/src/spine/Skin.cpp @@ -37,7 +37,8 @@ #include -namespace Spine { +using namespace Spine; + Skin::AttachmentKey::AttachmentKey(int slotIndex, const String &name) : _slotIndex(slotIndex), _name(name) { @@ -122,4 +123,3 @@ void Skin::attachAll(Skeleton &skeleton, Skin &oldSkin) { } } } -} diff --git a/spine-cpp/spine-cpp/src/spine/Slot.cpp b/spine-cpp/spine-cpp/src/spine/Slot.cpp index f6964409d..bc80fb06e 100644 --- a/spine-cpp/spine-cpp/src/spine/Slot.cpp +++ b/spine-cpp/spine-cpp/src/spine/Slot.cpp @@ -35,7 +35,8 @@ #include #include -namespace Spine { +using namespace Spine; + Slot::Slot(SlotData &data, Bone &bone) : _data(data), _bone(bone), @@ -113,9 +114,3 @@ void Slot::setAttachmentTime(float inValue) { Vector &Slot::getAttachmentVertices() { return _attachmentVertices; } - -void Slot::setAttachmentVertices(Vector &inValue) { - _attachmentVertices.clearAndAddAll(inValue); -} - -} diff --git a/spine-cpp/spine-cpp/src/spine/SlotData.cpp b/spine-cpp/spine-cpp/src/spine/SlotData.cpp index eb8cbb46f..6c770e970 100644 --- a/spine-cpp/spine-cpp/src/spine/SlotData.cpp +++ b/spine-cpp/spine-cpp/src/spine/SlotData.cpp @@ -32,7 +32,8 @@ #include -namespace Spine { +using namespace Spine; + SlotData::SlotData(int index, const String &name, BoneData &boneData) : _index(index), _name(name), @@ -89,5 +90,3 @@ BlendMode SlotData::getBlendMode() { void SlotData::setBlendMode(BlendMode inValue) { _blendMode = inValue; } - -} diff --git a/spine-cpp/spine-cpp/src/spine/SpineObject.cpp b/spine-cpp/spine-cpp/src/spine/SpineObject.cpp index e60667d31..6d6d945d2 100644 --- a/spine-cpp/spine-cpp/src/spine/SpineObject.cpp +++ b/spine-cpp/spine-cpp/src/spine/SpineObject.cpp @@ -31,7 +31,7 @@ #include #include -namespace Spine { +using namespace Spine; void *SpineObject::operator new(size_t sz, const char *file, int line) { return SpineExtension::calloc(sz, file, line); @@ -47,4 +47,3 @@ void SpineObject::operator delete(void *p) { SpineObject::~SpineObject() { } -} \ No newline at end of file diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp b/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp index d4b224f67..8add3154d 100644 --- a/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp +++ b/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp @@ -36,7 +36,8 @@ #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(TransformConstraint, Constraint); TransformConstraint::TransformConstraint(TransformConstraintData &data, Skeleton &skeleton) : Constraint(), @@ -376,4 +377,3 @@ void TransformConstraint::applyRelativeLocal() { bone.updateWorldTransform(x, y, rotation, scaleX, scaleY, bone._ashearX, shearY); } } -} diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp b/spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp index ea4b7f232..4c94f2177 100644 --- a/spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp +++ b/spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp @@ -34,7 +34,7 @@ #include -namespace Spine { +using namespace Spine; TransformConstraintData::TransformConstraintData(const String &name) : _name(name), _order(0), @@ -117,5 +117,3 @@ bool TransformConstraintData::isRelative() { bool TransformConstraintData::isLocal() { return _local; } - -} diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp b/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp index 827672748..b943c9300 100644 --- a/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp @@ -40,7 +40,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(TransformConstraintTimeline, CurveTimeline); const int TransformConstraintTimeline::ENTRIES = 5; @@ -137,4 +138,3 @@ TransformConstraintTimeline::setFrame(int frameIndex, float time, float rotateMi _frames[frameIndex + SCALE] = scaleMix; _frames[frameIndex + SHEAR] = shearMix; } -} diff --git a/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp b/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp index 530083f37..25c22ee12 100644 --- a/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp @@ -38,7 +38,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(TranslateTimeline, CurveTimeline); const int TranslateTimeline::ENTRIES = 3; @@ -114,4 +115,3 @@ void TranslateTimeline::setFrame(int frameIndex, float time, float x, float y) { _frames[frameIndex + X] = x; _frames[frameIndex + Y] = y; } -} diff --git a/spine-cpp/spine-cpp/src/spine/Triangulator.cpp b/spine-cpp/spine-cpp/src/spine/Triangulator.cpp index fa5e8e786..b5dc1906e 100644 --- a/spine-cpp/spine-cpp/src/spine/Triangulator.cpp +++ b/spine-cpp/spine-cpp/src/spine/Triangulator.cpp @@ -32,7 +32,7 @@ #include -namespace Spine { +using namespace Spine; Triangulator::~Triangulator() { ContainerUtil::cleanUpVectorOfPointers(_convexPolygons); @@ -296,5 +296,3 @@ int Triangulator::winding(float p1x, float p1y, float p2x, float p2y, float p3x, return p3x * py - p3y * px + px * p1y - p1x * py >= 0 ? 1 : -1; } - -} diff --git a/spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp b/spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp index 89cbd0592..0e9228d3b 100644 --- a/spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp @@ -38,7 +38,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(TwoColorTimeline, CurveTimeline); const int TwoColorTimeline::ENTRIES = 8; @@ -77,15 +78,15 @@ void TwoColorTimeline::apply(Skeleton &skeleton, float lastTime, float time, Vec return; case MixPose_Current: { Color &color = slot.getColor(); - color._r += (color._r - slot._data.getColor()._r) * alpha; - color._g += (color._g - slot._data.getColor()._g) * alpha; - color._b += (color._b - slot._data.getColor()._b) * alpha; - color._a += (color._a - slot._data.getColor()._a) * alpha; + color.r += (color.r - slot._data.getColor().r) * alpha; + color.g += (color.g - slot._data.getColor().g) * alpha; + color.b += (color.b - slot._data.getColor().b) * alpha; + color.a += (color.a - slot._data.getColor().a) * alpha; Color &darkColor = slot.getDarkColor(); - darkColor._r += (darkColor._r - slot._data.getDarkColor()._r) * alpha; - darkColor._g += (darkColor._g - slot._data.getDarkColor()._g) * alpha; - darkColor._b += (darkColor._b - slot._data.getDarkColor()._b) * alpha; + darkColor.r += (darkColor.r - slot._data.getDarkColor().r) * alpha; + darkColor.g += (darkColor.g - slot._data.getDarkColor().g) * alpha; + darkColor.b += (darkColor.b - slot._data.getDarkColor().b) * alpha; return; } case MixPose_CurrentLayered: @@ -130,48 +131,48 @@ void TwoColorTimeline::apply(Skeleton &skeleton, float lastTime, float time, Vec if (alpha == 1) { Color &color = slot.getColor(); - color._r = r; - color._g = g; - color._b = b; - color._a = a; + color.r = r; + color.g = g; + color.b = b; + color.a = a; Color &darkColor = slot.getDarkColor(); - darkColor._r = r2; - darkColor._g = g2; - darkColor._b = b2; + darkColor.r = r2; + darkColor.g = g2; + darkColor.b = b2; } else { float br, bg, bb, ba, br2, bg2, bb2; if (pose == MixPose_Setup) { - br = slot._data.getColor()._r; - bg = slot._data.getColor()._g; - bb = slot._data.getColor()._b; - ba = slot._data.getColor()._a; - br2 = slot._data.getDarkColor()._r; - bg2 = slot._data.getDarkColor()._g; - bb2 = slot._data.getDarkColor()._b; + br = slot._data.getColor().r; + bg = slot._data.getColor().g; + bb = slot._data.getColor().b; + ba = slot._data.getColor().a; + br2 = slot._data.getDarkColor().r; + bg2 = slot._data.getDarkColor().g; + bb2 = slot._data.getDarkColor().b; } else { Color &color = slot.getColor(); - br = color._r; - bg = color._g; - bb = color._b; - ba = color._a; + br = color.r; + bg = color.g; + bb = color.b; + ba = color.a; Color &darkColor = slot.getDarkColor(); - br2 = darkColor._r; - bg2 = darkColor._g; - bb2 = darkColor._b; + br2 = darkColor.r; + bg2 = darkColor.g; + bb2 = darkColor.b; } Color &color = slot.getColor(); - color._r = br + ((r - br) * alpha); - color._g = bg + ((g - bg) * alpha); - color._b = bb + ((b - bb) * alpha); - color._a = ba + ((a - ba) * alpha); + color.r = br + ((r - br) * alpha); + color.g = bg + ((g - bg) * alpha); + color.b = bb + ((b - bb) * alpha); + color.a = ba + ((a - ba) * alpha); Color &darkColor = slot.getDarkColor(); - darkColor._r = br2 + ((r2 - br2) * alpha); - darkColor._g = bg2 + ((g2 - bg2) * alpha); - darkColor._b = bb2 + ((b2 - bb2) * alpha); + darkColor.r = br2 + ((r2 - br2) * alpha); + darkColor.g = bg2 + ((g2 - bg2) * alpha); + darkColor.b = bb2 + ((b2 - bb2) * alpha); } } @@ -200,4 +201,3 @@ void TwoColorTimeline::setSlotIndex(int inValue) { assert(inValue >= 0); _slotIndex = inValue; } -} diff --git a/spine-cpp/spine-cpp/src/spine/Updatable.cpp b/spine-cpp/spine-cpp/src/spine/Updatable.cpp index 1a2ea09d8..2b081b3d1 100644 --- a/spine-cpp/spine-cpp/src/spine/Updatable.cpp +++ b/spine-cpp/spine-cpp/src/spine/Updatable.cpp @@ -30,7 +30,8 @@ #include -namespace Spine { +using namespace Spine; + RTTI_IMPL_NOPARENT(Updatable); Updatable::Updatable() { @@ -38,4 +39,3 @@ Updatable::Updatable() { Updatable::~Updatable() { } -} diff --git a/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp b/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp index 8b643db57..b6748acc0 100644 --- a/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp @@ -35,7 +35,8 @@ #include #include -namespace Spine { +using namespace Spine; + RTTI_IMPL(VertexAttachment, Attachment); VertexAttachment::VertexAttachment(const String &name) : Attachment(name), _worldVerticesLength(0), _id(getNextID()) { @@ -130,18 +131,10 @@ Vector &VertexAttachment::getBones() { return _bones; } -void VertexAttachment::setBones(Vector inValue) { - _bones.clearAndAddAll(inValue); -} - Vector &VertexAttachment::getVertices() { return _vertices; } -void VertexAttachment::setVertices(Vector inValue) { - _vertices.clearAndAddAll(inValue); -} - int VertexAttachment::getWorldVerticesLength() { return _worldVerticesLength; } @@ -155,4 +148,3 @@ int VertexAttachment::getNextID() { return (nextID++ & 65535) << 11; } -} diff --git a/spine-sfml/cpp/example/main.cpp b/spine-sfml/cpp/example/main.cpp index 0aee574ae..95bf838e6 100644 --- a/spine-sfml/cpp/example/main.cpp +++ b/spine-sfml/cpp/example/main.cpp @@ -146,11 +146,11 @@ void spineboy (SkeletonData* skeletonData, Atlas* atlas) { bounds.update(*skeleton, true); sf::Vector2i position = sf::Mouse::getPosition(window); if (bounds.containsPoint(position.x, position.y)) { - headSlot->getColor()._g = 0; - headSlot->getColor()._b = 0; + headSlot->getColor().g = 0; + headSlot->getColor().b = 0; } else { - headSlot->getColor()._g = 1; - headSlot->getColor()._b = 1; + headSlot->getColor().g = 1; + headSlot->getColor().b = 1; } drawable->update(delta); diff --git a/spine-sfml/cpp/src/spine/spine-sfml.cpp b/spine-sfml/cpp/src/spine/spine-sfml.cpp index 18ec32829..8004e18fc 100644 --- a/spine-sfml/cpp/src/spine/spine-sfml.cpp +++ b/spine-sfml/cpp/src/spine/spine-sfml.cpp @@ -134,20 +134,20 @@ void SkeletonDrawable::draw(RenderTarget &target, RenderStates states) const { continue; } else continue; - Uint8 r = static_cast(skeleton->getColor()._r * slot.getColor()._r * attachmentColor->_r * 255); - Uint8 g = static_cast(skeleton->getColor()._g * slot.getColor()._g * attachmentColor->_g * 255); - Uint8 b = static_cast(skeleton->getColor()._b * slot.getColor()._b * attachmentColor->_b * 255); - Uint8 a = static_cast(skeleton->getColor()._a * slot.getColor()._a * attachmentColor->_a * 255); + Uint8 r = static_cast(skeleton->getColor().r * slot.getColor().r * attachmentColor->r * 255); + Uint8 g = static_cast(skeleton->getColor().g * slot.getColor().g * attachmentColor->g * 255); + Uint8 b = static_cast(skeleton->getColor().b * slot.getColor().b * attachmentColor->b * 255); + Uint8 a = static_cast(skeleton->getColor().a * slot.getColor().a * attachmentColor->a * 255); vertex.color.r = r; vertex.color.g = g; vertex.color.b = b; vertex.color.a = a; Color light; - light._r = r / 255.0f; - light._g = g / 255.0f; - light._b = b / 255.0f; - light._a = a / 255.0f; + light.r = r / 255.0f; + light.g = g / 255.0f; + light.b = b / 255.0f; + light.a = a / 255.0f; sf::BlendMode blend; if (!usePremultipliedAlpha) { @@ -212,7 +212,7 @@ void SkeletonDrawable::draw(RenderTarget &target, RenderStates states) const { for (int i = 0; i < verticesCount; i++) { Color vertexColor = light; Color dark; - dark._r = dark._g = dark._b = dark._a = 0; + dark.r = dark.g = dark.b = dark.a = 0; int index = i << 1; float x = (*vertices)[index]; float y = (*vertices)[index + 1]; @@ -233,10 +233,10 @@ void SkeletonDrawable::draw(RenderTarget &target, RenderStates states) const { vertex.texCoords.x = (*uvs)[index] * size.x; vertex.texCoords.y = (*uvs)[index + 1] * size.y; Color vertexColor = tempColors[index >> 1]; - vertex.color.r = static_cast(vertexColor._r * 255); - vertex.color.g = static_cast(vertexColor._g * 255); - vertex.color.b = static_cast(vertexColor._b * 255); - vertex.color.a = static_cast(vertexColor._a * 255); + vertex.color.r = static_cast(vertexColor.r * 255); + vertex.color.g = static_cast(vertexColor.g * 255); + vertex.color.b = static_cast(vertexColor.b * 255); + vertex.color.a = static_cast(vertexColor.a * 255); vertexArray->append(vertex); } } else {