Forgot to move the namespace braces.

This commit is contained in:
Stephen Gowen 2017-12-13 12:08:23 -05:00
parent 64fd7c2886
commit d403db2754
132 changed files with 132 additions and 264 deletions

View File

@ -37,8 +37,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class Timeline;
class Skeleton;
class Event;

View File

@ -35,8 +35,7 @@
#include <spine/Pool.h>
#include <spine/MixPose.h>
namespace Spine
{
namespace Spine {
enum EventType {
EventType_Start,
EventType_Interrupt,

View File

@ -36,8 +36,7 @@
#include <assert.h>
#include <string>
namespace Spine
{
namespace Spine {
class SkeletonData;
class Animation;

View File

@ -36,8 +36,7 @@
#include <string>
namespace Spine
{
namespace Spine {
enum Format {
Format_Alpha,
Format_Intensity,

View File

@ -35,8 +35,7 @@
#include <spine/Vector.h>
namespace Spine
{
namespace Spine {
class Atlas;
class AtlasRegion;

View File

@ -35,8 +35,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class Attachment {
RTTI_DECL;

View File

@ -35,8 +35,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class Skin;
class RegionAttachment;
class MeshAttachment;

View File

@ -39,8 +39,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class Skeleton;
class Event;

View File

@ -31,8 +31,7 @@
#ifndef Spine_AttachmentType_h
#define Spine_AttachmentType_h
namespace Spine
{
namespace Spine {
enum AttachmentType {
AttachmentType_Region,
AttachmentType_Boundingbox,

View File

@ -31,8 +31,7 @@
#ifndef Spine_BlendMode_h
#define Spine_BlendMode_h
namespace Spine
{
namespace Spine {
enum BlendMode {
BlendMode_Normal = 0,
BlendMode_Additive,

View File

@ -35,8 +35,7 @@
#include <spine/Vector.h>
namespace Spine
{
namespace Spine {
class BoneData;
class Skeleton;

View File

@ -35,8 +35,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class BoneData {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -33,8 +33,7 @@
#include <spine/VertexAttachment.h>
namespace Spine
{
namespace Spine {
/// Attachment that has a polygon for bounds checking.
class BoundingBoxAttachment : public VertexAttachment {
RTTI_DECL;

View File

@ -33,8 +33,7 @@
#include <spine/VertexAttachment.h>
namespace Spine
{
namespace Spine {
class SlotData;
class ClippingAttachment : public VertexAttachment {

View File

@ -33,8 +33,7 @@
#include <spine/CurveTimeline.h>
namespace Spine
{
namespace Spine {
class ColorTimeline : public CurveTimeline {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -33,8 +33,7 @@
#include <spine/Updatable.h>
namespace Spine
{
namespace Spine {
/// The interface for all constraints.
class Constraint : public Updatable {
RTTI_DECL;

View File

@ -38,8 +38,7 @@
#include <string>
#include <assert.h>
namespace Spine
{
namespace Spine {
class ContainerUtil {
public:
/// Finds an item by comparing each item's name.

View File

@ -36,8 +36,7 @@
#include <assert.h>
namespace Spine
{
namespace Spine {
/// Base class for frames that use an interpolation bezier curve.
class CurveTimeline : public Timeline {
RTTI_DECL;

View File

@ -33,8 +33,7 @@
#include <spine/CurveTimeline.h>
namespace Spine
{
namespace Spine {
class VertexAttachment;
class DeformTimeline : public CurveTimeline {

View File

@ -33,8 +33,7 @@
#include <spine/Timeline.h>
namespace Spine
{
namespace Spine {
class DrawOrderTimeline : public Timeline {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -33,8 +33,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class EventData;
/// Stores the current pose values for an Event.

View File

@ -33,8 +33,7 @@
#include <string>
namespace Spine
{
namespace Spine {
/// Stores the setup pose values for an Event.
class EventData {
friend class SkeletonBinary;

View File

@ -33,8 +33,7 @@
#include <spine/Timeline.h>
namespace Spine
{
namespace Spine {
class EventTimeline : public Timeline {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -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);

View File

@ -34,8 +34,7 @@
#include <spine/Extension.h>
#include <spine/Vector.h>
namespace Spine
{
namespace Spine {
template <typename K, typename V, typename H>
class HashMap {
private:

View File

@ -35,8 +35,7 @@
#include <spine/Vector.h>
namespace Spine
{
namespace Spine {
class IkConstraintData;
class Skeleton;
class Bone;

View File

@ -35,8 +35,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class BoneData;
class IkConstraintData {

View File

@ -33,8 +33,7 @@
#include <spine/CurveTimeline.h>
namespace Spine
{
namespace Spine {
class IkConstraintTimeline : public CurveTimeline {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -36,8 +36,7 @@
#define SPINE_JSON_HAVE_PREV 0
#endif
namespace Spine
{
namespace Spine {
class Json {
friend class SkeletonJson;

View File

@ -33,8 +33,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class MeshAttachment;
class LinkedMesh {

View File

@ -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 <typename T>
int sign(T val) {
return (T(0) < val) - (val < T(0));

View File

@ -37,8 +37,7 @@
#include <string>
namespace Spine
{
namespace Spine {
/// Attachment that displays a texture region using a mesh.
class MeshAttachment : public VertexAttachment {
friend class SkeletonBinary;

View File

@ -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)

View File

@ -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)

View File

@ -33,8 +33,7 @@
#include <spine/VertexAttachment.h>
namespace Spine
{
namespace Spine {
class PathAttachment : public VertexAttachment {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -35,8 +35,7 @@
#include <spine/Vector.h>
namespace Spine
{
namespace Spine {
class PathConstraintData;
class Skeleton;
class PathAttachment;

View File

@ -38,8 +38,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class BoneData;
class SlotData;

View File

@ -33,8 +33,7 @@
#include <spine/CurveTimeline.h>
namespace Spine
{
namespace Spine {
class PathConstraintMixTimeline : public CurveTimeline {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -33,8 +33,7 @@
#include <spine/CurveTimeline.h>
namespace Spine
{
namespace Spine {
class PathConstraintPositionTimeline : public CurveTimeline {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -33,8 +33,7 @@
#include <spine/PathConstraintPositionTimeline.h>
namespace Spine
{
namespace Spine {
class PathConstraintSpacingTimeline : public PathConstraintPositionTimeline {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -33,8 +33,7 @@
#include <spine/Attachment.h>
namespace Spine
{
namespace Spine {
class Bone;
///

View File

@ -35,8 +35,7 @@
#include <spine/Vector.h>
#include <spine/ContainerUtil.h>
namespace Spine
{
namespace Spine {
template <typename T>
class Pool {
public:

View File

@ -31,8 +31,7 @@
#ifndef Spine_PositionMode_h
#define Spine_PositionMode_h
namespace Spine
{
namespace Spine {
enum PositionMode {
PositionMode_Fixed = 0,
PositionMode_Percent

View File

@ -33,8 +33,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class RTTI {
public:
RTTI(const std::string& className);

View File

@ -39,8 +39,7 @@
#define NUM_UVS 8
namespace Spine
{
namespace Spine {
class Bone;
/// Attachment that displays a texture region.

View File

@ -31,8 +31,7 @@
#ifndef Spine_RotateMode_h
#define Spine_RotateMode_h
namespace Spine
{
namespace Spine {
enum RotateMode {
RotateMode_Tangent = 0,
RotateMode_Chain,

View File

@ -33,8 +33,7 @@
#include <spine/CurveTimeline.h>
namespace Spine
{
namespace Spine {
class RotateTimeline : public CurveTimeline {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -33,8 +33,7 @@
#include <spine/TranslateTimeline.h>
namespace Spine
{
namespace Spine {
class ScaleTimeline : public TranslateTimeline {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -33,8 +33,7 @@
#include <spine/TranslateTimeline.h>
namespace Spine
{
namespace Spine {
class ShearTimeline : public TranslateTimeline {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -37,8 +37,7 @@
#include <string>
#include <limits> // std::numeric_limits
namespace Spine
{
namespace Spine {
class SkeletonData;
class Bone;
class Updatable;

View File

@ -36,8 +36,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class SkeletonData;
class Atlas;
class AttachmentLoader;

View File

@ -33,8 +33,7 @@
#include <spine/Vector.h>
namespace Spine
{
namespace Spine {
class Skeleton;
class BoundingBoxAttachment;

View File

@ -34,8 +34,7 @@
#include <spine/Vector.h>
#include <spine/Triangulator.h>
namespace Spine
{
namespace Spine {
class Slot;
class ClippingAttachment;

View File

@ -35,8 +35,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class BoneData;
class SlotData;
class Skin;

View File

@ -35,8 +35,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class CurveTimeline;
class VertexAttachment;
class Animation;

View File

@ -35,8 +35,7 @@
#include <spine/HashMap.h>
#include <spine/Vector.h>
namespace Spine
{
namespace Spine {
class Attachment;
class Skeleton;

View File

@ -35,8 +35,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class SlotData;
class Bone;
class Skeleton;

View File

@ -35,8 +35,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class BoneData;
class SlotData {

View File

@ -31,8 +31,7 @@
#ifndef Spine_SpacingMode_h
#define Spine_SpacingMode_h
namespace Spine
{
namespace Spine {
enum SpacingMode {
SpacingMode_Length = 0,
SpacingMode_Fixed,

View File

@ -33,8 +33,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class AtlasPage;
class TextureLoader {

View File

@ -36,8 +36,7 @@
#include <spine/MixPose.h>
#include <spine/MixDirection.h>
namespace Spine
{
namespace Spine {
class Skeleton;
class Event;

View File

@ -31,8 +31,7 @@
#ifndef Spine_TimelineType_h
#define Spine_TimelineType_h
namespace Spine
{
namespace Spine {
enum TimelineType {
TimelineType_Rotate = 0,
TimelineType_Translate,

View File

@ -35,8 +35,7 @@
#include <spine/Vector.h>
namespace Spine
{
namespace Spine {
class TransformConstraintData;
class Skeleton;
class Bone;

View File

@ -35,8 +35,7 @@
#include <string>
namespace Spine
{
namespace Spine {
class BoneData;
class TransformConstraintData {

View File

@ -33,8 +33,7 @@
#include <spine/CurveTimeline.h>
namespace Spine
{
namespace Spine {
class TransformConstraintTimeline : public CurveTimeline {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -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

View File

@ -36,8 +36,7 @@
#include <spine/Animation.h>
#include <spine/TimelineType.h>
namespace Spine
{
namespace Spine {
class TranslateTimeline : public CurveTimeline {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -34,8 +34,7 @@
#include <spine/Vector.h>
#include <spine/Pool.h>
namespace Spine
{
namespace Spine {
class Triangulator {
public:
Vector<int>& triangulate(Vector<float>& vertices);

View File

@ -33,8 +33,7 @@
#include <spine/CurveTimeline.h>
namespace Spine
{
namespace Spine {
class TwoColorTimeline : public CurveTimeline {
friend class SkeletonBinary;
friend class SkeletonJson;

View File

@ -33,8 +33,7 @@
#include <spine/RTTI.h>
namespace Spine
{
namespace Spine {
class Updatable {
RTTI_DECL;

View File

@ -37,8 +37,7 @@
#include <memory>
#include <assert.h>
namespace Spine
{
namespace Spine {
template <typename T>
class Vector {
public:

View File

@ -35,8 +35,7 @@
#include <spine/Vector.h>
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.

View File

@ -33,8 +33,7 @@
#include <spine/Vector.h>
namespace Spine
{
namespace Spine {
class Vertices {
public:
Vector<int> _bones;

View File

@ -39,8 +39,7 @@
#include <assert.h>
#include <math.h> /* fmod */
namespace Spine
{
namespace Spine {
Animation::Animation(std::string name, Vector<Timeline*>& timelines, float duration) :
_timelines(timelines),
_duration(duration),

View File

@ -46,8 +46,7 @@
#include <spine/MathUtil.h>
#include <spine/ContainerUtil.h>
namespace Spine
{
namespace Spine {
void dummyOnAnimationEventFunc(AnimationState* state, EventType type, TrackEntry* entry, Event* event = NULL) {
// Empty
}

View File

@ -33,8 +33,7 @@
#include <spine/SkeletonData.h>
#include <spine/Animation.h>
namespace Spine
{
namespace Spine {
AnimationStateData::AnimationStateData(SkeletonData& skeletonData) : _skeletonData(skeletonData), _defaultMix(0) {
// Empty
}

View File

@ -36,8 +36,7 @@
#include <cstring>
namespace Spine
{
namespace Spine {
Atlas::Atlas(const char* path, TextureLoader& textureLoader) : _textureLoader(textureLoader) {
int dirLength;
char *dir;

View File

@ -40,8 +40,7 @@
#include <spine/Atlas.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL(AtlasAttachmentLoader, AttachmentLoader);
AtlasAttachmentLoader::AtlasAttachmentLoader(Vector<Atlas*>& inAtlasArray) : AttachmentLoader(), _atlasArray(inAtlasArray) {

View File

@ -32,8 +32,7 @@
#include <assert.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL_NOPARENT(Attachment);
Attachment::Attachment(std::string name) : _name(name) {

View File

@ -38,8 +38,7 @@
#include <spine/PointAttachment.h>
#include <spine/ClippingAttachment.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL_NOPARENT(AttachmentLoader);
AttachmentLoader::AttachmentLoader() {

View File

@ -38,8 +38,7 @@
#include <spine/Slot.h>
#include <spine/SlotData.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL(AttachmentTimeline, Timeline);
AttachmentTimeline::AttachmentTimeline(int frameCount) : Timeline(), _slotIndex(0) {

View File

@ -36,8 +36,7 @@
#include <spine/MathUtil.h>
#include <spine/TransformMode.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL(Bone, Updatable);
bool Bone::yDown = false;

View File

@ -32,8 +32,7 @@
#include <assert.h>
namespace Spine
{
namespace Spine {
BoneData::BoneData(int index, std::string name, BoneData* parent) :
_index(index),
_name(name),

View File

@ -30,8 +30,7 @@
#include <spine/BoundingBoxAttachment.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL(BoundingBoxAttachment, VertexAttachment);
BoundingBoxAttachment::BoundingBoxAttachment(std::string name) : VertexAttachment(name) {

View File

@ -32,8 +32,7 @@
#include <spine/SlotData.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL(ClippingAttachment, VertexAttachment);
ClippingAttachment::ClippingAttachment(std::string name) : VertexAttachment(name), _endSlot(NULL) {

View File

@ -38,8 +38,7 @@
#include <spine/Slot.h>
#include <spine/SlotData.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL(ColorTimeline, CurveTimeline);
const int ColorTimeline::ENTRIES = 5;

View File

@ -30,8 +30,7 @@
#include <spine/Constraint.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL(Constraint, Updatable);
Constraint::Constraint() {

View File

@ -32,8 +32,7 @@
#include <spine/MathUtil.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL(CurveTimeline, Timeline);
const float CurveTimeline::LINEAR = 0;

View File

@ -40,8 +40,7 @@
#include <spine/Slot.h>
#include <spine/SlotData.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL(DeformTimeline, CurveTimeline);
DeformTimeline::DeformTimeline(int frameCount) : CurveTimeline(frameCount), _slotIndex(0), _attachment(NULL) {

View File

@ -38,8 +38,7 @@
#include <spine/Slot.h>
#include <spine/SlotData.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL(DrawOrderTimeline, Timeline);
DrawOrderTimeline::DrawOrderTimeline(int frameCount) : Timeline() {

View File

@ -32,8 +32,7 @@
#include <spine/EventData.h>
namespace Spine
{
namespace Spine {
Event::Event(float time, const EventData& data) :
_data(data),
_time(time),

View File

@ -32,8 +32,7 @@
#include <assert.h>
namespace Spine
{
namespace Spine {
EventData::EventData(std::string name) :
_name(name),
_intValue(0),

View File

@ -40,8 +40,7 @@
#include <spine/Event.h>
#include <spine/ContainerUtil.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL(EventTimeline, Timeline);
EventTimeline::EventTimeline(int frameCount) : Timeline() {

View File

@ -34,8 +34,7 @@
#include <assert.h>
#include <cstring>
namespace Spine
{
namespace Spine {
SpineExtension* SpineExtension::_instance = NULL;
void SpineExtension::setInstance(SpineExtension* inValue) {

View File

@ -37,8 +37,7 @@
#include <spine/BoneData.h>
#include <spine/MathUtil.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL(IkConstraint, Constraint);
void IkConstraint::apply(Bone& bone, float targetX, float targetY, float alpha) {

View File

@ -32,8 +32,7 @@
#include <spine/BoneData.h>
namespace Spine
{
namespace Spine {
IkConstraintData::IkConstraintData(std::string name) :
_name(name),
_order(0),

View File

@ -40,8 +40,7 @@
#include <spine/IkConstraint.h>
#include <spine/IkConstraintData.h>
namespace Spine
{
namespace Spine {
RTTI_IMPL(IkConstraintTimeline, CurveTimeline);
const int IkConstraintTimeline::ENTRIES = 3;

View File

@ -52,8 +52,7 @@
#include <spine/Extension.h>
#include <new>
namespace Spine
{
namespace Spine {
const int Json::JSON_FALSE = 0;
const int Json::JSON_TRUE = 1;
const int Json::JSON_NULL = 2;

View File

@ -32,8 +32,7 @@
#include <spine/MeshAttachment.h>
namespace Spine
{
namespace Spine {
LinkedMesh::LinkedMesh(MeshAttachment* mesh, std::string skin, int slotIndex, std::string parent) :
_mesh(mesh),
_skin(skin),

View File

@ -30,8 +30,7 @@
#include <spine/MathUtil.h>
namespace Spine
{
namespace Spine {
float MathUtil::SIN_TABLE[SIN_COUNT] = {0.0f};
MathUtil::MathUtil() {

Some files were not shown because too many files have changed in this diff Show More