From d403db2754f16a85e6f3acad181c4e2cf080810a Mon Sep 17 00:00:00 2001 From: Stephen Gowen Date: Wed, 13 Dec 2017 12:08:23 -0500 Subject: [PATCH] Forgot to move the namespace braces. --- spine-cpp/spine-cpp/include/spine/Animation.h | 3 +-- spine-cpp/spine-cpp/include/spine/AnimationState.h | 3 +-- spine-cpp/spine-cpp/include/spine/AnimationStateData.h | 3 +-- spine-cpp/spine-cpp/include/spine/Atlas.h | 3 +-- spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h | 3 +-- spine-cpp/spine-cpp/include/spine/Attachment.h | 3 +-- spine-cpp/spine-cpp/include/spine/AttachmentLoader.h | 3 +-- spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/AttachmentType.h | 3 +-- spine-cpp/spine-cpp/include/spine/BlendMode.h | 3 +-- spine-cpp/spine-cpp/include/spine/Bone.h | 3 +-- spine-cpp/spine-cpp/include/spine/BoneData.h | 3 +-- spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h | 3 +-- spine-cpp/spine-cpp/include/spine/ClippingAttachment.h | 3 +-- spine-cpp/spine-cpp/include/spine/ColorTimeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/Constraint.h | 3 +-- spine-cpp/spine-cpp/include/spine/ContainerUtil.h | 3 +-- spine-cpp/spine-cpp/include/spine/CurveTimeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/DeformTimeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/Event.h | 3 +-- spine-cpp/spine-cpp/include/spine/EventData.h | 3 +-- spine-cpp/spine-cpp/include/spine/EventTimeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/Extension.h | 3 +-- spine-cpp/spine-cpp/include/spine/HashMap.h | 3 +-- spine-cpp/spine-cpp/include/spine/IkConstraint.h | 3 +-- spine-cpp/spine-cpp/include/spine/IkConstraintData.h | 3 +-- spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/Json.h | 3 +-- spine-cpp/spine-cpp/include/spine/LinkedMesh.h | 3 +-- spine-cpp/spine-cpp/include/spine/MathUtil.h | 3 +-- spine-cpp/spine-cpp/include/spine/MeshAttachment.h | 3 +-- spine-cpp/spine-cpp/include/spine/MixDirection.h | 3 +-- spine-cpp/spine-cpp/include/spine/MixPose.h | 3 +-- spine-cpp/spine-cpp/include/spine/PathAttachment.h | 3 +-- spine-cpp/spine-cpp/include/spine/PathConstraint.h | 3 +-- spine-cpp/spine-cpp/include/spine/PathConstraintData.h | 3 +-- spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h | 3 +-- .../spine-cpp/include/spine/PathConstraintPositionTimeline.h | 3 +-- .../spine-cpp/include/spine/PathConstraintSpacingTimeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/PointAttachment.h | 3 +-- spine-cpp/spine-cpp/include/spine/Pool.h | 3 +-- spine-cpp/spine-cpp/include/spine/PositionMode.h | 3 +-- spine-cpp/spine-cpp/include/spine/RTTI.h | 3 +-- spine-cpp/spine-cpp/include/spine/RegionAttachment.h | 3 +-- spine-cpp/spine-cpp/include/spine/RotateMode.h | 3 +-- spine-cpp/spine-cpp/include/spine/RotateTimeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/ScaleTimeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/ShearTimeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/Skeleton.h | 3 +-- spine-cpp/spine-cpp/include/spine/SkeletonBinary.h | 3 +-- spine-cpp/spine-cpp/include/spine/SkeletonBounds.h | 3 +-- spine-cpp/spine-cpp/include/spine/SkeletonClipping.h | 3 +-- spine-cpp/spine-cpp/include/spine/SkeletonData.h | 3 +-- spine-cpp/spine-cpp/include/spine/SkeletonJson.h | 3 +-- spine-cpp/spine-cpp/include/spine/Skin.h | 3 +-- spine-cpp/spine-cpp/include/spine/Slot.h | 3 +-- spine-cpp/spine-cpp/include/spine/SlotData.h | 3 +-- spine-cpp/spine-cpp/include/spine/SpacingMode.h | 3 +-- spine-cpp/spine-cpp/include/spine/TextureLoader.h | 3 +-- spine-cpp/spine-cpp/include/spine/Timeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/TimelineType.h | 3 +-- spine-cpp/spine-cpp/include/spine/TransformConstraint.h | 3 +-- spine-cpp/spine-cpp/include/spine/TransformConstraintData.h | 3 +-- .../spine-cpp/include/spine/TransformConstraintTimeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/TransformMode.h | 3 +-- spine-cpp/spine-cpp/include/spine/TranslateTimeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/Triangulator.h | 3 +-- spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h | 3 +-- spine-cpp/spine-cpp/include/spine/Updatable.h | 3 +-- spine-cpp/spine-cpp/include/spine/Vector.h | 3 +-- spine-cpp/spine-cpp/include/spine/VertexAttachment.h | 3 +-- spine-cpp/spine-cpp/include/spine/Vertices.h | 3 +-- spine-cpp/spine-cpp/src/spine/Animation.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/AnimationState.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/Atlas.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/Attachment.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/Bone.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/BoneData.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/Constraint.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/Event.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/EventData.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/EventTimeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/Extension.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/IkConstraint.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/Json.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/MathUtil.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/PathAttachment.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/PathConstraint.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp | 3 +-- .../spine-cpp/src/spine/PathConstraintPositionTimeline.cpp | 3 +-- .../spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/PointAttachment.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/RTTI.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/Skeleton.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/SkeletonData.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/Skin.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/Slot.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/SlotData.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/TextureLoader.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/Timeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/Triangulator.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/Updatable.cpp | 3 +-- spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp | 3 +-- 132 files changed, 132 insertions(+), 264 deletions(-) diff --git a/spine-cpp/spine-cpp/include/spine/Animation.h b/spine-cpp/spine-cpp/include/spine/Animation.h index fa674382e..6713fd6b2 100644 --- a/spine-cpp/spine-cpp/include/spine/Animation.h +++ b/spine-cpp/spine-cpp/include/spine/Animation.h @@ -37,8 +37,7 @@ #include -namespace Spine -{ +namespace Spine { class Timeline; class Skeleton; class Event; diff --git a/spine-cpp/spine-cpp/include/spine/AnimationState.h b/spine-cpp/spine-cpp/include/spine/AnimationState.h index 4e81c40d3..404193400 100644 --- a/spine-cpp/spine-cpp/include/spine/AnimationState.h +++ b/spine-cpp/spine-cpp/include/spine/AnimationState.h @@ -35,8 +35,7 @@ #include #include -namespace Spine -{ +namespace Spine { enum EventType { EventType_Start, EventType_Interrupt, diff --git a/spine-cpp/spine-cpp/include/spine/AnimationStateData.h b/spine-cpp/spine-cpp/include/spine/AnimationStateData.h index c2befdd01..1ce86ca26 100644 --- a/spine-cpp/spine-cpp/include/spine/AnimationStateData.h +++ b/spine-cpp/spine-cpp/include/spine/AnimationStateData.h @@ -36,8 +36,7 @@ #include #include -namespace Spine -{ +namespace Spine { class SkeletonData; class Animation; diff --git a/spine-cpp/spine-cpp/include/spine/Atlas.h b/spine-cpp/spine-cpp/include/spine/Atlas.h index 606a35faa..1fc1afbee 100644 --- a/spine-cpp/spine-cpp/include/spine/Atlas.h +++ b/spine-cpp/spine-cpp/include/spine/Atlas.h @@ -36,8 +36,7 @@ #include -namespace Spine -{ +namespace Spine { enum Format { Format_Alpha, Format_Intensity, diff --git a/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h b/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h index 2052bb69b..a43f245db 100644 --- a/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h +++ b/spine-cpp/spine-cpp/include/spine/AtlasAttachmentLoader.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class Atlas; class AtlasRegion; diff --git a/spine-cpp/spine-cpp/include/spine/Attachment.h b/spine-cpp/spine-cpp/include/spine/Attachment.h index 35ae099b7..8054e4d23 100644 --- a/spine-cpp/spine-cpp/include/spine/Attachment.h +++ b/spine-cpp/spine-cpp/include/spine/Attachment.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class Attachment { RTTI_DECL; diff --git a/spine-cpp/spine-cpp/include/spine/AttachmentLoader.h b/spine-cpp/spine-cpp/include/spine/AttachmentLoader.h index 1da82e4f7..07eb4fdfb 100644 --- a/spine-cpp/spine-cpp/include/spine/AttachmentLoader.h +++ b/spine-cpp/spine-cpp/include/spine/AttachmentLoader.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class Skin; class RegionAttachment; class MeshAttachment; diff --git a/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h b/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h index c0a1fad41..f81586ccb 100644 --- a/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/AttachmentTimeline.h @@ -39,8 +39,7 @@ #include -namespace Spine -{ +namespace Spine { class Skeleton; class Event; diff --git a/spine-cpp/spine-cpp/include/spine/AttachmentType.h b/spine-cpp/spine-cpp/include/spine/AttachmentType.h index 1ad7a4d62..76ecb42d9 100644 --- a/spine-cpp/spine-cpp/include/spine/AttachmentType.h +++ b/spine-cpp/spine-cpp/include/spine/AttachmentType.h @@ -31,8 +31,7 @@ #ifndef Spine_AttachmentType_h #define Spine_AttachmentType_h -namespace Spine -{ +namespace Spine { enum AttachmentType { AttachmentType_Region, AttachmentType_Boundingbox, diff --git a/spine-cpp/spine-cpp/include/spine/BlendMode.h b/spine-cpp/spine-cpp/include/spine/BlendMode.h index d61fcdd77..65d8a674b 100644 --- a/spine-cpp/spine-cpp/include/spine/BlendMode.h +++ b/spine-cpp/spine-cpp/include/spine/BlendMode.h @@ -31,8 +31,7 @@ #ifndef Spine_BlendMode_h #define Spine_BlendMode_h -namespace Spine -{ +namespace Spine { enum BlendMode { BlendMode_Normal = 0, BlendMode_Additive, diff --git a/spine-cpp/spine-cpp/include/spine/Bone.h b/spine-cpp/spine-cpp/include/spine/Bone.h index 4413be97d..d2e876f8c 100644 --- a/spine-cpp/spine-cpp/include/spine/Bone.h +++ b/spine-cpp/spine-cpp/include/spine/Bone.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class BoneData; class Skeleton; diff --git a/spine-cpp/spine-cpp/include/spine/BoneData.h b/spine-cpp/spine-cpp/include/spine/BoneData.h index 4825ed4fe..12b060f3f 100644 --- a/spine-cpp/spine-cpp/include/spine/BoneData.h +++ b/spine-cpp/spine-cpp/include/spine/BoneData.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class BoneData { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h b/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h index aef2b7c47..d0a707ed2 100644 --- a/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/BoundingBoxAttachment.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { /// Attachment that has a polygon for bounds checking. class BoundingBoxAttachment : public VertexAttachment { RTTI_DECL; diff --git a/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h b/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h index 8740407b3..5f4a56545 100644 --- a/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/ClippingAttachment.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class SlotData; class ClippingAttachment : public VertexAttachment { diff --git a/spine-cpp/spine-cpp/include/spine/ColorTimeline.h b/spine-cpp/spine-cpp/include/spine/ColorTimeline.h index 03295baff..14b74a5b0 100644 --- a/spine-cpp/spine-cpp/include/spine/ColorTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/ColorTimeline.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class ColorTimeline : public CurveTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/Constraint.h b/spine-cpp/spine-cpp/include/spine/Constraint.h index ced362987..4979d7602 100644 --- a/spine-cpp/spine-cpp/include/spine/Constraint.h +++ b/spine-cpp/spine-cpp/include/spine/Constraint.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { /// The interface for all constraints. class Constraint : public Updatable { RTTI_DECL; diff --git a/spine-cpp/spine-cpp/include/spine/ContainerUtil.h b/spine-cpp/spine-cpp/include/spine/ContainerUtil.h index c44c18817..3e764aeb3 100644 --- a/spine-cpp/spine-cpp/include/spine/ContainerUtil.h +++ b/spine-cpp/spine-cpp/include/spine/ContainerUtil.h @@ -38,8 +38,7 @@ #include #include -namespace Spine -{ +namespace Spine { class ContainerUtil { public: /// Finds an item by comparing each item's name. diff --git a/spine-cpp/spine-cpp/include/spine/CurveTimeline.h b/spine-cpp/spine-cpp/include/spine/CurveTimeline.h index 286d53c4a..7df660410 100644 --- a/spine-cpp/spine-cpp/include/spine/CurveTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/CurveTimeline.h @@ -36,8 +36,7 @@ #include -namespace Spine -{ +namespace Spine { /// Base class for frames that use an interpolation bezier curve. class CurveTimeline : public Timeline { RTTI_DECL; diff --git a/spine-cpp/spine-cpp/include/spine/DeformTimeline.h b/spine-cpp/spine-cpp/include/spine/DeformTimeline.h index 7510ce509..031c420f3 100644 --- a/spine-cpp/spine-cpp/include/spine/DeformTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/DeformTimeline.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class VertexAttachment; class DeformTimeline : public CurveTimeline { diff --git a/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h b/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h index e11d74c0f..263336954 100644 --- a/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/DrawOrderTimeline.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class DrawOrderTimeline : public Timeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/Event.h b/spine-cpp/spine-cpp/include/spine/Event.h index 9956d9030..179c74028 100644 --- a/spine-cpp/spine-cpp/include/spine/Event.h +++ b/spine-cpp/spine-cpp/include/spine/Event.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class EventData; /// Stores the current pose values for an Event. diff --git a/spine-cpp/spine-cpp/include/spine/EventData.h b/spine-cpp/spine-cpp/include/spine/EventData.h index dcb0c774c..691c5acbf 100644 --- a/spine-cpp/spine-cpp/include/spine/EventData.h +++ b/spine-cpp/spine-cpp/include/spine/EventData.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { /// Stores the setup pose values for an Event. class EventData { friend class SkeletonBinary; diff --git a/spine-cpp/spine-cpp/include/spine/EventTimeline.h b/spine-cpp/spine-cpp/include/spine/EventTimeline.h index f474e637b..51f290529 100644 --- a/spine-cpp/spine-cpp/include/spine/EventTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/EventTimeline.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class EventTimeline : public Timeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/Extension.h b/spine-cpp/spine-cpp/include/spine/Extension.h index 0a9379308..752d445e0 100644 --- a/spine-cpp/spine-cpp/include/spine/Extension.h +++ b/spine-cpp/spine-cpp/include/spine/Extension.h @@ -47,8 +47,7 @@ /* Call destructor and then frees memory. Can be used on const types. */ #define DESTROY(TYPE,VALUE) VALUE->~TYPE(); SPINE_EXTENSION->spineFree((void*)VALUE) -namespace Spine -{ +namespace Spine { class SpineExtension { public: static void setInstance(SpineExtension* inSpineExtension); diff --git a/spine-cpp/spine-cpp/include/spine/HashMap.h b/spine-cpp/spine-cpp/include/spine/HashMap.h index e32cf4e30..07a9b2ef3 100755 --- a/spine-cpp/spine-cpp/include/spine/HashMap.h +++ b/spine-cpp/spine-cpp/include/spine/HashMap.h @@ -34,8 +34,7 @@ #include #include -namespace Spine -{ +namespace Spine { template class HashMap { private: diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraint.h b/spine-cpp/spine-cpp/include/spine/IkConstraint.h index dbaf59786..528ebf45a 100644 --- a/spine-cpp/spine-cpp/include/spine/IkConstraint.h +++ b/spine-cpp/spine-cpp/include/spine/IkConstraint.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class IkConstraintData; class Skeleton; class Bone; diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraintData.h b/spine-cpp/spine-cpp/include/spine/IkConstraintData.h index 286bcddb2..119563d2a 100644 --- a/spine-cpp/spine-cpp/include/spine/IkConstraintData.h +++ b/spine-cpp/spine-cpp/include/spine/IkConstraintData.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class BoneData; class IkConstraintData { diff --git a/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h b/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h index 957fd9178..bbc75df6b 100644 --- a/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/IkConstraintTimeline.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class IkConstraintTimeline : public CurveTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/Json.h b/spine-cpp/spine-cpp/include/spine/Json.h index df73ddd4d..083e22322 100644 --- a/spine-cpp/spine-cpp/include/spine/Json.h +++ b/spine-cpp/spine-cpp/include/spine/Json.h @@ -36,8 +36,7 @@ #define SPINE_JSON_HAVE_PREV 0 #endif -namespace Spine -{ +namespace Spine { class Json { friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/LinkedMesh.h b/spine-cpp/spine-cpp/include/spine/LinkedMesh.h index 136c53bb8..f8fde0944 100644 --- a/spine-cpp/spine-cpp/include/spine/LinkedMesh.h +++ b/spine-cpp/spine-cpp/include/spine/LinkedMesh.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class MeshAttachment; class LinkedMesh { diff --git a/spine-cpp/spine-cpp/include/spine/MathUtil.h b/spine-cpp/spine-cpp/include/spine/MathUtil.h index cbd31b755..cd7d32f42 100644 --- a/spine-cpp/spine-cpp/include/spine/MathUtil.h +++ b/spine-cpp/spine-cpp/include/spine/MathUtil.h @@ -48,8 +48,7 @@ #define MAX(a, b) (((a) > (b)) ? (a) : (b)) #define MIN(a, b) (((a) < (b)) ? (a) : (b)) -namespace Spine -{ +namespace Spine { template int sign(T val) { return (T(0) < val) - (val < T(0)); diff --git a/spine-cpp/spine-cpp/include/spine/MeshAttachment.h b/spine-cpp/spine-cpp/include/spine/MeshAttachment.h index 7c73488f8..101f6dcf9 100644 --- a/spine-cpp/spine-cpp/include/spine/MeshAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/MeshAttachment.h @@ -37,8 +37,7 @@ #include -namespace Spine -{ +namespace Spine { /// Attachment that displays a texture region using a mesh. class MeshAttachment : public VertexAttachment { friend class SkeletonBinary; diff --git a/spine-cpp/spine-cpp/include/spine/MixDirection.h b/spine-cpp/spine-cpp/include/spine/MixDirection.h index 3dd096ea7..68f937a8b 100644 --- a/spine-cpp/spine-cpp/include/spine/MixDirection.h +++ b/spine-cpp/spine-cpp/include/spine/MixDirection.h @@ -31,8 +31,7 @@ #ifndef Spine_MixDirection_h #define Spine_MixDirection_h -namespace Spine -{ +namespace Spine { /// /// Indicates whether a timeline's alpha is mixing out over time toward 0 (the setup or current pose) or mixing in toward 1 (the timeline's pose). /// See also Timeline::apply(Skeleton&, float, float, Vector&, float, MixPose, MixDirection) diff --git a/spine-cpp/spine-cpp/include/spine/MixPose.h b/spine-cpp/spine-cpp/include/spine/MixPose.h index b9aeec4ae..7156a8fdc 100644 --- a/spine-cpp/spine-cpp/include/spine/MixPose.h +++ b/spine-cpp/spine-cpp/include/spine/MixPose.h @@ -31,8 +31,7 @@ #ifndef Spine_MixPose_h #define Spine_MixPose_h -namespace Spine -{ +namespace Spine { /// /// Controls how a timeline is mixed with the setup or current pose. /// See also Timeline::apply(Skeleton&, float, float, Vector&, float, MixPose, MixDirection) diff --git a/spine-cpp/spine-cpp/include/spine/PathAttachment.h b/spine-cpp/spine-cpp/include/spine/PathAttachment.h index f5abcc32c..4463f1d01 100644 --- a/spine-cpp/spine-cpp/include/spine/PathAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/PathAttachment.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class PathAttachment : public VertexAttachment { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraint.h b/spine-cpp/spine-cpp/include/spine/PathConstraint.h index 2daa91ebb..abb073a82 100644 --- a/spine-cpp/spine-cpp/include/spine/PathConstraint.h +++ b/spine-cpp/spine-cpp/include/spine/PathConstraint.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class PathConstraintData; class Skeleton; class PathAttachment; diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintData.h b/spine-cpp/spine-cpp/include/spine/PathConstraintData.h index 68991f8c8..c4e3812e5 100644 --- a/spine-cpp/spine-cpp/include/spine/PathConstraintData.h +++ b/spine-cpp/spine-cpp/include/spine/PathConstraintData.h @@ -38,8 +38,7 @@ #include -namespace Spine -{ +namespace Spine { class BoneData; class SlotData; diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h index 7e64ac85d..5e93c1235 100644 --- a/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/PathConstraintMixTimeline.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class PathConstraintMixTimeline : public CurveTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h index 172a897a7..fb4d222e1 100644 --- a/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/PathConstraintPositionTimeline.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class PathConstraintPositionTimeline : public CurveTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h b/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h index c30394f79..ca723f907 100644 --- a/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/PathConstraintSpacingTimeline.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class PathConstraintSpacingTimeline : public PathConstraintPositionTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/PointAttachment.h b/spine-cpp/spine-cpp/include/spine/PointAttachment.h index f1f5f0b1d..eba6a0f8d 100644 --- a/spine-cpp/spine-cpp/include/spine/PointAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/PointAttachment.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class Bone; /// diff --git a/spine-cpp/spine-cpp/include/spine/Pool.h b/spine-cpp/spine-cpp/include/spine/Pool.h index 29a447a13..18f17a6e9 100644 --- a/spine-cpp/spine-cpp/include/spine/Pool.h +++ b/spine-cpp/spine-cpp/include/spine/Pool.h @@ -35,8 +35,7 @@ #include #include -namespace Spine -{ +namespace Spine { template class Pool { public: diff --git a/spine-cpp/spine-cpp/include/spine/PositionMode.h b/spine-cpp/spine-cpp/include/spine/PositionMode.h index c5ad9bdfc..c46d3002d 100644 --- a/spine-cpp/spine-cpp/include/spine/PositionMode.h +++ b/spine-cpp/spine-cpp/include/spine/PositionMode.h @@ -31,8 +31,7 @@ #ifndef Spine_PositionMode_h #define Spine_PositionMode_h -namespace Spine -{ +namespace Spine { enum PositionMode { PositionMode_Fixed = 0, PositionMode_Percent diff --git a/spine-cpp/spine-cpp/include/spine/RTTI.h b/spine-cpp/spine-cpp/include/spine/RTTI.h index 362c3548a..73db676cc 100644 --- a/spine-cpp/spine-cpp/include/spine/RTTI.h +++ b/spine-cpp/spine-cpp/include/spine/RTTI.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class RTTI { public: RTTI(const std::string& className); diff --git a/spine-cpp/spine-cpp/include/spine/RegionAttachment.h b/spine-cpp/spine-cpp/include/spine/RegionAttachment.h index acdb6a870..e23ea4986 100644 --- a/spine-cpp/spine-cpp/include/spine/RegionAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/RegionAttachment.h @@ -39,8 +39,7 @@ #define NUM_UVS 8 -namespace Spine -{ +namespace Spine { class Bone; /// Attachment that displays a texture region. diff --git a/spine-cpp/spine-cpp/include/spine/RotateMode.h b/spine-cpp/spine-cpp/include/spine/RotateMode.h index 3c5cbe789..f7dfab14d 100644 --- a/spine-cpp/spine-cpp/include/spine/RotateMode.h +++ b/spine-cpp/spine-cpp/include/spine/RotateMode.h @@ -31,8 +31,7 @@ #ifndef Spine_RotateMode_h #define Spine_RotateMode_h -namespace Spine -{ +namespace Spine { enum RotateMode { RotateMode_Tangent = 0, RotateMode_Chain, diff --git a/spine-cpp/spine-cpp/include/spine/RotateTimeline.h b/spine-cpp/spine-cpp/include/spine/RotateTimeline.h index 778fd9a15..558f5a96b 100644 --- a/spine-cpp/spine-cpp/include/spine/RotateTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/RotateTimeline.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class RotateTimeline : public CurveTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h b/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h index f02c40afa..32f434287 100644 --- a/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/ScaleTimeline.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class ScaleTimeline : public TranslateTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/ShearTimeline.h b/spine-cpp/spine-cpp/include/spine/ShearTimeline.h index a42e2ec45..fa687e15d 100644 --- a/spine-cpp/spine-cpp/include/spine/ShearTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/ShearTimeline.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class ShearTimeline : public TranslateTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/Skeleton.h b/spine-cpp/spine-cpp/include/spine/Skeleton.h index c6f9564f3..8efd439a3 100644 --- a/spine-cpp/spine-cpp/include/spine/Skeleton.h +++ b/spine-cpp/spine-cpp/include/spine/Skeleton.h @@ -37,8 +37,7 @@ #include #include // std::numeric_limits -namespace Spine -{ +namespace Spine { class SkeletonData; class Bone; class Updatable; diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonBinary.h b/spine-cpp/spine-cpp/include/spine/SkeletonBinary.h index 96c970019..17749fca4 100644 --- a/spine-cpp/spine-cpp/include/spine/SkeletonBinary.h +++ b/spine-cpp/spine-cpp/include/spine/SkeletonBinary.h @@ -36,8 +36,7 @@ #include -namespace Spine -{ +namespace Spine { class SkeletonData; class Atlas; class AttachmentLoader; diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonBounds.h b/spine-cpp/spine-cpp/include/spine/SkeletonBounds.h index c000cbe44..983600835 100644 --- a/spine-cpp/spine-cpp/include/spine/SkeletonBounds.h +++ b/spine-cpp/spine-cpp/include/spine/SkeletonBounds.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class Skeleton; class BoundingBoxAttachment; diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonClipping.h b/spine-cpp/spine-cpp/include/spine/SkeletonClipping.h index 19baa4746..6d5667517 100644 --- a/spine-cpp/spine-cpp/include/spine/SkeletonClipping.h +++ b/spine-cpp/spine-cpp/include/spine/SkeletonClipping.h @@ -34,8 +34,7 @@ #include #include -namespace Spine -{ +namespace Spine { class Slot; class ClippingAttachment; diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonData.h b/spine-cpp/spine-cpp/include/spine/SkeletonData.h index 04e195a8c..53065ade0 100644 --- a/spine-cpp/spine-cpp/include/spine/SkeletonData.h +++ b/spine-cpp/spine-cpp/include/spine/SkeletonData.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class BoneData; class SlotData; class Skin; diff --git a/spine-cpp/spine-cpp/include/spine/SkeletonJson.h b/spine-cpp/spine-cpp/include/spine/SkeletonJson.h index 6c0ea928b..ef40a7a83 100644 --- a/spine-cpp/spine-cpp/include/spine/SkeletonJson.h +++ b/spine-cpp/spine-cpp/include/spine/SkeletonJson.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class CurveTimeline; class VertexAttachment; class Animation; diff --git a/spine-cpp/spine-cpp/include/spine/Skin.h b/spine-cpp/spine-cpp/include/spine/Skin.h index 8836b692e..5756b65d3 100644 --- a/spine-cpp/spine-cpp/include/spine/Skin.h +++ b/spine-cpp/spine-cpp/include/spine/Skin.h @@ -35,8 +35,7 @@ #include #include -namespace Spine -{ +namespace Spine { class Attachment; class Skeleton; diff --git a/spine-cpp/spine-cpp/include/spine/Slot.h b/spine-cpp/spine-cpp/include/spine/Slot.h index c85713a5c..69f7f6666 100644 --- a/spine-cpp/spine-cpp/include/spine/Slot.h +++ b/spine-cpp/spine-cpp/include/spine/Slot.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class SlotData; class Bone; class Skeleton; diff --git a/spine-cpp/spine-cpp/include/spine/SlotData.h b/spine-cpp/spine-cpp/include/spine/SlotData.h index 444195aa6..6e422e534 100644 --- a/spine-cpp/spine-cpp/include/spine/SlotData.h +++ b/spine-cpp/spine-cpp/include/spine/SlotData.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class BoneData; class SlotData { diff --git a/spine-cpp/spine-cpp/include/spine/SpacingMode.h b/spine-cpp/spine-cpp/include/spine/SpacingMode.h index e3b52dd07..b8bf965af 100644 --- a/spine-cpp/spine-cpp/include/spine/SpacingMode.h +++ b/spine-cpp/spine-cpp/include/spine/SpacingMode.h @@ -31,8 +31,7 @@ #ifndef Spine_SpacingMode_h #define Spine_SpacingMode_h -namespace Spine -{ +namespace Spine { enum SpacingMode { SpacingMode_Length = 0, SpacingMode_Fixed, diff --git a/spine-cpp/spine-cpp/include/spine/TextureLoader.h b/spine-cpp/spine-cpp/include/spine/TextureLoader.h index 5502922f7..f0b836910 100644 --- a/spine-cpp/spine-cpp/include/spine/TextureLoader.h +++ b/spine-cpp/spine-cpp/include/spine/TextureLoader.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class AtlasPage; class TextureLoader { diff --git a/spine-cpp/spine-cpp/include/spine/Timeline.h b/spine-cpp/spine-cpp/include/spine/Timeline.h index 0e1e0e3fe..d23a36753 100644 --- a/spine-cpp/spine-cpp/include/spine/Timeline.h +++ b/spine-cpp/spine-cpp/include/spine/Timeline.h @@ -36,8 +36,7 @@ #include #include -namespace Spine -{ +namespace Spine { class Skeleton; class Event; diff --git a/spine-cpp/spine-cpp/include/spine/TimelineType.h b/spine-cpp/spine-cpp/include/spine/TimelineType.h index f055fb599..518c2ce63 100644 --- a/spine-cpp/spine-cpp/include/spine/TimelineType.h +++ b/spine-cpp/spine-cpp/include/spine/TimelineType.h @@ -31,8 +31,7 @@ #ifndef Spine_TimelineType_h #define Spine_TimelineType_h -namespace Spine -{ +namespace Spine { enum TimelineType { TimelineType_Rotate = 0, TimelineType_Translate, diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraint.h b/spine-cpp/spine-cpp/include/spine/TransformConstraint.h index ad837b54d..b878c0f4c 100644 --- a/spine-cpp/spine-cpp/include/spine/TransformConstraint.h +++ b/spine-cpp/spine-cpp/include/spine/TransformConstraint.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class TransformConstraintData; class Skeleton; class Bone; diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraintData.h b/spine-cpp/spine-cpp/include/spine/TransformConstraintData.h index c12cb40c6..090675a31 100644 --- a/spine-cpp/spine-cpp/include/spine/TransformConstraintData.h +++ b/spine-cpp/spine-cpp/include/spine/TransformConstraintData.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class BoneData; class TransformConstraintData { diff --git a/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h b/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h index ddefa6f20..f117bbf82 100644 --- a/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/TransformConstraintTimeline.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class TransformConstraintTimeline : public CurveTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/TransformMode.h b/spine-cpp/spine-cpp/include/spine/TransformMode.h index 8b9c6df53..d3cb2b7f9 100644 --- a/spine-cpp/spine-cpp/include/spine/TransformMode.h +++ b/spine-cpp/spine-cpp/include/spine/TransformMode.h @@ -31,8 +31,7 @@ #ifndef Spine_TransformMode_h #define Spine_TransformMode_h -namespace Spine -{ +namespace Spine { enum TransformMode { //0000 0 Flip Scale Rotation TransformMode_Normal = 0, // 0000 diff --git a/spine-cpp/spine-cpp/include/spine/TranslateTimeline.h b/spine-cpp/spine-cpp/include/spine/TranslateTimeline.h index d5014894d..ae1f209d7 100644 --- a/spine-cpp/spine-cpp/include/spine/TranslateTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/TranslateTimeline.h @@ -36,8 +36,7 @@ #include #include -namespace Spine -{ +namespace Spine { class TranslateTimeline : public CurveTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/Triangulator.h b/spine-cpp/spine-cpp/include/spine/Triangulator.h index 8e43659ea..d5fff1994 100644 --- a/spine-cpp/spine-cpp/include/spine/Triangulator.h +++ b/spine-cpp/spine-cpp/include/spine/Triangulator.h @@ -34,8 +34,7 @@ #include #include -namespace Spine -{ +namespace Spine { class Triangulator { public: Vector& triangulate(Vector& vertices); diff --git a/spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h b/spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h index 0f8aee052..34977c3ec 100644 --- a/spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h +++ b/spine-cpp/spine-cpp/include/spine/TwoColorTimeline.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class TwoColorTimeline : public CurveTimeline { friend class SkeletonBinary; friend class SkeletonJson; diff --git a/spine-cpp/spine-cpp/include/spine/Updatable.h b/spine-cpp/spine-cpp/include/spine/Updatable.h index 8bf9df75c..d076e0439 100644 --- a/spine-cpp/spine-cpp/include/spine/Updatable.h +++ b/spine-cpp/spine-cpp/include/spine/Updatable.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class Updatable { RTTI_DECL; diff --git a/spine-cpp/spine-cpp/include/spine/Vector.h b/spine-cpp/spine-cpp/include/spine/Vector.h index 5272122b5..6fad04736 100644 --- a/spine-cpp/spine-cpp/include/spine/Vector.h +++ b/spine-cpp/spine-cpp/include/spine/Vector.h @@ -37,8 +37,7 @@ #include #include -namespace Spine -{ +namespace Spine { template class Vector { public: diff --git a/spine-cpp/spine-cpp/include/spine/VertexAttachment.h b/spine-cpp/spine-cpp/include/spine/VertexAttachment.h index a60031dd8..4385886f5 100644 --- a/spine-cpp/spine-cpp/include/spine/VertexAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/VertexAttachment.h @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { class Slot; /// An attachment with vertices that are transformed by one or more bones and can be deformed by a slot's vertices. diff --git a/spine-cpp/spine-cpp/include/spine/Vertices.h b/spine-cpp/spine-cpp/include/spine/Vertices.h index f8ba613b7..0dff1321d 100644 --- a/spine-cpp/spine-cpp/include/spine/Vertices.h +++ b/spine-cpp/spine-cpp/include/spine/Vertices.h @@ -33,8 +33,7 @@ #include -namespace Spine -{ +namespace Spine { class Vertices { public: Vector _bones; diff --git a/spine-cpp/spine-cpp/src/spine/Animation.cpp b/spine-cpp/spine-cpp/src/spine/Animation.cpp index b18b502f2..3b25f5b95 100644 --- a/spine-cpp/spine-cpp/src/spine/Animation.cpp +++ b/spine-cpp/spine-cpp/src/spine/Animation.cpp @@ -39,8 +39,7 @@ #include #include /* fmod */ -namespace Spine -{ +namespace Spine { Animation::Animation(std::string name, Vector& timelines, float duration) : _timelines(timelines), _duration(duration), diff --git a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp index 9650053b6..f11649d6b 100644 --- a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp +++ b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp @@ -46,8 +46,7 @@ #include #include -namespace Spine -{ +namespace Spine { void dummyOnAnimationEventFunc(AnimationState* state, EventType type, TrackEntry* entry, Event* event = NULL) { // Empty } diff --git a/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp b/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp index 3f1e9e173..5edb8b934 100644 --- a/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp +++ b/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp @@ -33,8 +33,7 @@ #include #include -namespace Spine -{ +namespace Spine { AnimationStateData::AnimationStateData(SkeletonData& skeletonData) : _skeletonData(skeletonData), _defaultMix(0) { // Empty } diff --git a/spine-cpp/spine-cpp/src/spine/Atlas.cpp b/spine-cpp/spine-cpp/src/spine/Atlas.cpp index 5c41d1918..01ddc728d 100644 --- a/spine-cpp/spine-cpp/src/spine/Atlas.cpp +++ b/spine-cpp/spine-cpp/src/spine/Atlas.cpp @@ -36,8 +36,7 @@ #include -namespace Spine -{ +namespace Spine { Atlas::Atlas(const char* path, TextureLoader& textureLoader) : _textureLoader(textureLoader) { int dirLength; char *dir; diff --git a/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp b/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp index 4509a071c..ada9bde71 100644 --- a/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp +++ b/spine-cpp/spine-cpp/src/spine/AtlasAttachmentLoader.cpp @@ -40,8 +40,7 @@ #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(AtlasAttachmentLoader, AttachmentLoader); AtlasAttachmentLoader::AtlasAttachmentLoader(Vector& inAtlasArray) : AttachmentLoader(), _atlasArray(inAtlasArray) { diff --git a/spine-cpp/spine-cpp/src/spine/Attachment.cpp b/spine-cpp/spine-cpp/src/spine/Attachment.cpp index b977277a0..779be06a6 100644 --- a/spine-cpp/spine-cpp/src/spine/Attachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/Attachment.cpp @@ -32,8 +32,7 @@ #include -namespace Spine -{ +namespace Spine { RTTI_IMPL_NOPARENT(Attachment); Attachment::Attachment(std::string name) : _name(name) { diff --git a/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp b/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp index b6ab71714..5d166a05c 100644 --- a/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp +++ b/spine-cpp/spine-cpp/src/spine/AttachmentLoader.cpp @@ -38,8 +38,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL_NOPARENT(AttachmentLoader); AttachmentLoader::AttachmentLoader() { diff --git a/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp b/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp index f6a68c62c..7c417a7c8 100644 --- a/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/AttachmentTimeline.cpp @@ -38,8 +38,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(AttachmentTimeline, Timeline); AttachmentTimeline::AttachmentTimeline(int frameCount) : Timeline(), _slotIndex(0) { diff --git a/spine-cpp/spine-cpp/src/spine/Bone.cpp b/spine-cpp/spine-cpp/src/spine/Bone.cpp index 1b4db4928..184b1c0e1 100644 --- a/spine-cpp/spine-cpp/src/spine/Bone.cpp +++ b/spine-cpp/spine-cpp/src/spine/Bone.cpp @@ -36,8 +36,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(Bone, Updatable); bool Bone::yDown = false; diff --git a/spine-cpp/spine-cpp/src/spine/BoneData.cpp b/spine-cpp/spine-cpp/src/spine/BoneData.cpp index 2e5ac3fbd..f0cbb9502 100644 --- a/spine-cpp/spine-cpp/src/spine/BoneData.cpp +++ b/spine-cpp/spine-cpp/src/spine/BoneData.cpp @@ -32,8 +32,7 @@ #include -namespace Spine -{ +namespace Spine { BoneData::BoneData(int index, std::string name, BoneData* parent) : _index(index), _name(name), diff --git a/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp b/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp index 02d662233..41148ae80 100644 --- a/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/BoundingBoxAttachment.cpp @@ -30,8 +30,7 @@ #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(BoundingBoxAttachment, VertexAttachment); BoundingBoxAttachment::BoundingBoxAttachment(std::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 3c8efc3b5..644ba9c39 100644 --- a/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/ClippingAttachment.cpp @@ -32,8 +32,7 @@ #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(ClippingAttachment, VertexAttachment); ClippingAttachment::ClippingAttachment(std::string name) : VertexAttachment(name), _endSlot(NULL) { diff --git a/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp b/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp index 4c6bea7a4..7f2085829 100644 --- a/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/ColorTimeline.cpp @@ -38,8 +38,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(ColorTimeline, CurveTimeline); const int ColorTimeline::ENTRIES = 5; diff --git a/spine-cpp/spine-cpp/src/spine/Constraint.cpp b/spine-cpp/spine-cpp/src/spine/Constraint.cpp index 85618372b..4f1a797cd 100644 --- a/spine-cpp/spine-cpp/src/spine/Constraint.cpp +++ b/spine-cpp/spine-cpp/src/spine/Constraint.cpp @@ -30,8 +30,7 @@ #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(Constraint, Updatable); Constraint::Constraint() { diff --git a/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp b/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp index 88b25e375..63571800d 100644 --- a/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp @@ -32,8 +32,7 @@ #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(CurveTimeline, Timeline); const float CurveTimeline::LINEAR = 0; diff --git a/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp b/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp index bede7342e..a9941702e 100644 --- a/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp @@ -40,8 +40,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(DeformTimeline, CurveTimeline); DeformTimeline::DeformTimeline(int frameCount) : CurveTimeline(frameCount), _slotIndex(0), _attachment(NULL) { diff --git a/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp b/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp index 83ad3259a..079cbcbca 100644 --- a/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp @@ -38,8 +38,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(DrawOrderTimeline, Timeline); DrawOrderTimeline::DrawOrderTimeline(int frameCount) : Timeline() { diff --git a/spine-cpp/spine-cpp/src/spine/Event.cpp b/spine-cpp/spine-cpp/src/spine/Event.cpp index 1bce25bdb..f5ef271d2 100644 --- a/spine-cpp/spine-cpp/src/spine/Event.cpp +++ b/spine-cpp/spine-cpp/src/spine/Event.cpp @@ -32,8 +32,7 @@ #include -namespace Spine -{ +namespace Spine { Event::Event(float time, const EventData& data) : _data(data), _time(time), diff --git a/spine-cpp/spine-cpp/src/spine/EventData.cpp b/spine-cpp/spine-cpp/src/spine/EventData.cpp index e6c95dc0b..1d390e459 100644 --- a/spine-cpp/spine-cpp/src/spine/EventData.cpp +++ b/spine-cpp/spine-cpp/src/spine/EventData.cpp @@ -32,8 +32,7 @@ #include -namespace Spine -{ +namespace Spine { EventData::EventData(std::string name) : _name(name), _intValue(0), diff --git a/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp b/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp index 66505930b..5fb00ccae 100644 --- a/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/EventTimeline.cpp @@ -40,8 +40,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(EventTimeline, Timeline); EventTimeline::EventTimeline(int frameCount) : Timeline() { diff --git a/spine-cpp/spine-cpp/src/spine/Extension.cpp b/spine-cpp/spine-cpp/src/spine/Extension.cpp index 09ce5543d..4e1294cdb 100644 --- a/spine-cpp/spine-cpp/src/spine/Extension.cpp +++ b/spine-cpp/spine-cpp/src/spine/Extension.cpp @@ -34,8 +34,7 @@ #include #include -namespace Spine -{ +namespace Spine { SpineExtension* SpineExtension::_instance = NULL; void SpineExtension::setInstance(SpineExtension* inValue) { diff --git a/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp b/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp index 933eb9c62..13153d794 100644 --- a/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp +++ b/spine-cpp/spine-cpp/src/spine/IkConstraint.cpp @@ -37,8 +37,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(IkConstraint, Constraint); void IkConstraint::apply(Bone& bone, float targetX, float targetY, float alpha) { diff --git a/spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp b/spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp index c06fcdccc..416d5cebe 100644 --- a/spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp +++ b/spine-cpp/spine-cpp/src/spine/IkConstraintData.cpp @@ -32,8 +32,7 @@ #include -namespace Spine -{ +namespace Spine { IkConstraintData::IkConstraintData(std::string name) : _name(name), _order(0), diff --git a/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp b/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp index e0bb67c07..6bcab4b74 100644 --- a/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/IkConstraintTimeline.cpp @@ -40,8 +40,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(IkConstraintTimeline, CurveTimeline); const int IkConstraintTimeline::ENTRIES = 3; diff --git a/spine-cpp/spine-cpp/src/spine/Json.cpp b/spine-cpp/spine-cpp/src/spine/Json.cpp index 6e967e552..2a5494f00 100644 --- a/spine-cpp/spine-cpp/src/spine/Json.cpp +++ b/spine-cpp/spine-cpp/src/spine/Json.cpp @@ -52,8 +52,7 @@ #include #include -namespace Spine -{ +namespace Spine { const int Json::JSON_FALSE = 0; const int Json::JSON_TRUE = 1; const int Json::JSON_NULL = 2; diff --git a/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp b/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp index c4e5cdb6e..2cbfef3d5 100644 --- a/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp +++ b/spine-cpp/spine-cpp/src/spine/LinkedMesh.cpp @@ -32,8 +32,7 @@ #include -namespace Spine -{ +namespace Spine { LinkedMesh::LinkedMesh(MeshAttachment* mesh, std::string skin, int slotIndex, std::string parent) : _mesh(mesh), _skin(skin), diff --git a/spine-cpp/spine-cpp/src/spine/MathUtil.cpp b/spine-cpp/spine-cpp/src/spine/MathUtil.cpp index ac1b25b69..399365063 100644 --- a/spine-cpp/spine-cpp/src/spine/MathUtil.cpp +++ b/spine-cpp/spine-cpp/src/spine/MathUtil.cpp @@ -30,8 +30,7 @@ #include -namespace Spine -{ +namespace Spine { float MathUtil::SIN_TABLE[SIN_COUNT] = {0.0f}; MathUtil::MathUtil() { diff --git a/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp b/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp index 2c6c459a4..b6c5ff92a 100644 --- a/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/MeshAttachment.cpp @@ -30,8 +30,7 @@ #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(MeshAttachment, VertexAttachment); MeshAttachment::MeshAttachment(std::string name) : VertexAttachment(name), diff --git a/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp b/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp index 866405ee2..4e5c93cfd 100644 --- a/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathAttachment.cpp @@ -30,8 +30,7 @@ #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(PathAttachment, VertexAttachment); PathAttachment::PathAttachment(std::string name) : VertexAttachment(name), _closed(false), _constantSpeed(false) { diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp index 686886290..29a8882bf 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathConstraint.cpp @@ -43,8 +43,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(PathConstraint, Constraint); const float PathConstraint::EPSILON = 0.00001f; diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp index 380719527..caa545e3d 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathConstraintData.cpp @@ -35,8 +35,7 @@ #include -namespace Spine -{ +namespace Spine { PathConstraintData::PathConstraintData(std::string name) : _name(name), _order(0), diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp index 606d71b9e..556ef1f37 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp @@ -40,8 +40,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(PathConstraintMixTimeline, CurveTimeline); const int PathConstraintMixTimeline::ENTRIES = 3; diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp index ba0a63555..e5635d4dd 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathConstraintPositionTimeline.cpp @@ -40,8 +40,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(PathConstraintPositionTimeline, CurveTimeline); const int PathConstraintPositionTimeline::ENTRIES = 2; diff --git a/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp b/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp index f029a9e4a..23305353c 100644 --- a/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/PathConstraintSpacingTimeline.cpp @@ -40,8 +40,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(PathConstraintSpacingTimeline, PathConstraintPositionTimeline); PathConstraintSpacingTimeline::PathConstraintSpacingTimeline(int frameCount) : PathConstraintPositionTimeline(frameCount) { diff --git a/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp b/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp index 09c32d43c..d69338695 100644 --- a/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/PointAttachment.cpp @@ -34,8 +34,7 @@ #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(PointAttachment, Attachment); PointAttachment::PointAttachment(std::string name) : Attachment(name), _x(0), _y(0), _rotation(0) { diff --git a/spine-cpp/spine-cpp/src/spine/RTTI.cpp b/spine-cpp/spine-cpp/src/spine/RTTI.cpp index 8a734a898..db6898c25 100644 --- a/spine-cpp/spine-cpp/src/spine/RTTI.cpp +++ b/spine-cpp/spine-cpp/src/spine/RTTI.cpp @@ -30,8 +30,7 @@ #include -namespace Spine -{ +namespace Spine { RTTI::RTTI(const std::string& className) : m_className(className), m_pBaseRTTI(NULL) { // Empty } diff --git a/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp b/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp index b2e38ba79..8a83f28ea 100644 --- a/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/RegionAttachment.cpp @@ -36,8 +36,7 @@ #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(RegionAttachment, Attachment); const int RegionAttachment::BLX = 0; diff --git a/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp b/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp index b17a406f7..cfc2866ef 100644 --- a/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/RotateTimeline.cpp @@ -38,8 +38,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(RotateTimeline, CurveTimeline); RotateTimeline::RotateTimeline(int frameCount) : CurveTimeline(frameCount), _boneIndex(0) { diff --git a/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp b/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp index fe5ccc6fc..211a6fdba 100644 --- a/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/ScaleTimeline.cpp @@ -40,8 +40,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(ScaleTimeline, TranslateTimeline); ScaleTimeline::ScaleTimeline(int frameCount) : TranslateTimeline(frameCount) { diff --git a/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp b/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp index 3cf98aefc..a4d433921 100644 --- a/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/ShearTimeline.cpp @@ -40,8 +40,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(ShearTimeline, TranslateTimeline); ShearTimeline::ShearTimeline(int frameCount) : TranslateTimeline(frameCount) { diff --git a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp b/spine-cpp/spine-cpp/src/spine/Skeleton.cpp index 1913be075..221298519 100644 --- a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp +++ b/spine-cpp/spine-cpp/src/spine/Skeleton.cpp @@ -52,8 +52,7 @@ #include #include -namespace Spine -{ +namespace Spine { Skeleton::Skeleton(SkeletonData& skeletonData) : _data(skeletonData), _skin(NULL), diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp index 68709ac59..364f128b0 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp @@ -80,8 +80,7 @@ #include -namespace Spine -{ +namespace Spine { const int SkeletonBinary::BONE_ROTATE = 0; const int SkeletonBinary::BONE_TRANSLATE = 1; const int SkeletonBinary::BONE_SCALE = 2; diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp index a1e171e03..15ad8e4f4 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp @@ -36,8 +36,7 @@ #include #include -namespace Spine -{ +namespace Spine { SkeletonBounds::SkeletonBounds() : _minX(0), _minY(0), _maxX(0), _maxY(0) { // Empty } diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp index 252856bf3..7d5ae1ddd 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonClipping.cpp @@ -33,8 +33,7 @@ #include #include -namespace Spine -{ +namespace Spine { SkeletonClipping::SkeletonClipping() : _clipAttachment(NULL) { _clipOutput.reserve(128); _clippedVertices.reserve(128); diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonData.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonData.cpp index 6c8e09e1a..67159eac3 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonData.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonData.cpp @@ -43,8 +43,7 @@ #include -namespace Spine -{ +namespace Spine { SkeletonData::SkeletonData() : _name(), _defaultSkin(NULL), diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp index fe11fe698..5bc8b0b8b 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp @@ -85,8 +85,7 @@ #define strdup _strdup #endif -namespace Spine -{ +namespace Spine { SkeletonJson::SkeletonJson(Vector& atlasArray) : _attachmentLoader(NEW(AtlasAttachmentLoader)), _scale(1), _ownsLoader(true) { new (_attachmentLoader) AtlasAttachmentLoader(atlasArray); } diff --git a/spine-cpp/spine-cpp/src/spine/Skin.cpp b/spine-cpp/spine-cpp/src/spine/Skin.cpp index c02f20dfa..12c80620a 100644 --- a/spine-cpp/spine-cpp/src/spine/Skin.cpp +++ b/spine-cpp/spine-cpp/src/spine/Skin.cpp @@ -37,8 +37,7 @@ #include -namespace Spine -{ +namespace Spine { Skin::AttachmentKey::AttachmentKey(int slotIndex, std::string name) : _slotIndex(slotIndex), _name(name) { diff --git a/spine-cpp/spine-cpp/src/spine/Slot.cpp b/spine-cpp/spine-cpp/src/spine/Slot.cpp index 65fb1585c..9ea7c7651 100644 --- a/spine-cpp/spine-cpp/src/spine/Slot.cpp +++ b/spine-cpp/spine-cpp/src/spine/Slot.cpp @@ -35,8 +35,7 @@ #include #include -namespace Spine -{ +namespace Spine { Slot::Slot(SlotData& data, Bone& bone) : _data(data), _bone(bone), diff --git a/spine-cpp/spine-cpp/src/spine/SlotData.cpp b/spine-cpp/spine-cpp/src/spine/SlotData.cpp index 8ef6adaf7..e8d517905 100644 --- a/spine-cpp/spine-cpp/src/spine/SlotData.cpp +++ b/spine-cpp/spine-cpp/src/spine/SlotData.cpp @@ -32,8 +32,7 @@ #include -namespace Spine -{ +namespace Spine { SlotData::SlotData(int index, std::string name, BoneData& boneData) : _index(index), _name(name), diff --git a/spine-cpp/spine-cpp/src/spine/TextureLoader.cpp b/spine-cpp/spine-cpp/src/spine/TextureLoader.cpp index 155f316d0..8658f8af9 100644 --- a/spine-cpp/spine-cpp/src/spine/TextureLoader.cpp +++ b/spine-cpp/spine-cpp/src/spine/TextureLoader.cpp @@ -30,8 +30,7 @@ #include -namespace Spine -{ +namespace Spine { TextureLoader::TextureLoader() { // Empty } diff --git a/spine-cpp/spine-cpp/src/spine/Timeline.cpp b/spine-cpp/spine-cpp/src/spine/Timeline.cpp index 32d22dffa..106a2896b 100644 --- a/spine-cpp/spine-cpp/src/spine/Timeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/Timeline.cpp @@ -33,8 +33,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL_NOPARENT(Timeline); Timeline::Timeline() { diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp b/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp index e9defe296..267e1dd17 100644 --- a/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp +++ b/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp @@ -37,8 +37,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(TransformConstraint, Constraint); TransformConstraint::TransformConstraint(TransformConstraintData& data, Skeleton& skeleton) : Constraint(), diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp b/spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp index e1daf92a6..fb3f5be91 100644 --- a/spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp +++ b/spine-cpp/spine-cpp/src/spine/TransformConstraintData.cpp @@ -34,8 +34,7 @@ #include -namespace Spine -{ +namespace Spine { TransformConstraintData::TransformConstraintData(std::string name) : _name(name), _order(0), diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp b/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp index 2b2f9c5d6..60b11f6eb 100644 --- a/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp @@ -40,8 +40,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(TransformConstraintTimeline, CurveTimeline); const int TransformConstraintTimeline::ENTRIES = 5; diff --git a/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp b/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp index c8dfb639e..b5ceccc75 100644 --- a/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/TranslateTimeline.cpp @@ -40,8 +40,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(TranslateTimeline, CurveTimeline); const int TranslateTimeline::ENTRIES = 3; diff --git a/spine-cpp/spine-cpp/src/spine/Triangulator.cpp b/spine-cpp/spine-cpp/src/spine/Triangulator.cpp index 1b715609f..3006cda54 100644 --- a/spine-cpp/spine-cpp/src/spine/Triangulator.cpp +++ b/spine-cpp/spine-cpp/src/spine/Triangulator.cpp @@ -32,8 +32,7 @@ #include -namespace Spine -{ +namespace Spine { Vector& Triangulator::triangulate(Vector& vertices) { int vertexCount = static_cast(vertices.size() >> 1); diff --git a/spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp b/spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp index 5cb546b26..9f824e70d 100644 --- a/spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp +++ b/spine-cpp/spine-cpp/src/spine/TwoColorTimeline.cpp @@ -38,8 +38,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(TwoColorTimeline, CurveTimeline); const int TwoColorTimeline::ENTRIES = 8; diff --git a/spine-cpp/spine-cpp/src/spine/Updatable.cpp b/spine-cpp/spine-cpp/src/spine/Updatable.cpp index 8993b94ae..581df4b43 100644 --- a/spine-cpp/spine-cpp/src/spine/Updatable.cpp +++ b/spine-cpp/spine-cpp/src/spine/Updatable.cpp @@ -30,8 +30,7 @@ #include -namespace Spine -{ +namespace Spine { RTTI_IMPL_NOPARENT(Updatable); Updatable::Updatable() { diff --git a/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp b/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp index 318b15263..be8cc1f1e 100644 --- a/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp +++ b/spine-cpp/spine-cpp/src/spine/VertexAttachment.cpp @@ -35,8 +35,7 @@ #include #include -namespace Spine -{ +namespace Spine { RTTI_IMPL(VertexAttachment, Attachment); VertexAttachment::VertexAttachment(std::string name) : Attachment(name), _worldVerticesLength(0), _id(getNextID()) {