From 7c2b6b827131590f54eb50f42b22156390cd9613 Mon Sep 17 00:00:00 2001 From: Stephen Gowen Date: Mon, 6 Nov 2017 16:54:39 -0500 Subject: [PATCH] wip --- .../spine-cpp/include/spine/MeshAttachment.h | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/spine-cpp/spine-cpp/include/spine/MeshAttachment.h b/spine-cpp/spine-cpp/include/spine/MeshAttachment.h index 27fdccdd3..e6e1b7b48 100644 --- a/spine-cpp/spine-cpp/include/spine/MeshAttachment.h +++ b/spine-cpp/spine-cpp/include/spine/MeshAttachment.h @@ -40,35 +40,35 @@ namespace Spine { RTTI_DECL; -// public: -// public int HullLength { get { return _hulllength; } set { _hulllength = value; } } -// public float[] RegionUVs { get { return _regionUVs; } set { _regionUVs = value; } } + public: +// int HullLength { get { return _hulllength; } set { _hulllength = value; } } +// float[] RegionUVs { get { return _regionUVs; } set { _regionUVs = value; } } // /// The UV pair for each vertex, normalized within the entire texture. -// public float[] UVs { get { return _uvs; } set { _uvs = value; } } -// public int[] Triangles { get { return _triangles; } set { _triangles = value; } } +// float[] UVs { get { return _uvs; } set { _uvs = value; } } +// int[] Triangles { get { return _triangles; } set { _triangles = value; } } // -// public float R { get { return r; } set { r = value; } } -// public float G { get { return g; } set { g = value; } } -// public float B { get { return b; } set { b = value; } } -// public float A { get { return a; } set { a = value; } } +// float R { get { return r; } set { r = value; } } +// float G { get { return g; } set { g = value; } } +// float B { get { return b; } set { b = value; } } +// float A { get { return a; } set { a = value; } } // -// public string Path { get; set; } -// public object RendererObject; //public Object RendererObject { get; set; } -// public float RegionU { get; set; } -// public float RegionV { get; set; } -// public float RegionU2 { get; set; } -// public float RegionV2 { get; set; } -// public bool RegionRotate { get; set; } -// public float RegionOffsetX { get { return _regionOffsetX; } set { _regionOffsetX = value; } } -// public float RegionOffsetY { get { return _regionOffsetY; } set { _regionOffsetY = value; } } // Pixels stripped from the bottom left, unrotated. -// public float RegionWidth { get { return _regionWidth; } set { _regionWidth = value; } } -// public float RegionHeight { get { return _regionHeight; } set { _regionHeight = value; } } // Unrotated, stripped size. -// public float RegionOriginalWidth { get { return _regionOriginalWidth; } set { _regionOriginalWidth = value; } } -// public float RegionOriginalHeight { get { return _regionOriginalHeight; } set { _regionOriginalHeight = value; } } // Unrotated, unstripped size. +// string Path { get; set; } +// object RendererObject; //Object RendererObject { get; set; } +// float RegionU { get; set; } +// float RegionV { get; set; } +// float RegionU2 { get; set; } +// float RegionV2 { get; set; } +// bool RegionRotate { get; set; } +// float RegionOffsetX { get { return _regionOffsetX; } set { _regionOffsetX = value; } } +// float RegionOffsetY { get { return _regionOffsetY; } set { _regionOffsetY = value; } } // Pixels stripped from the bottom left, unrotated. +// float RegionWidth { get { return _regionWidth; } set { _regionWidth = value; } } +// float RegionHeight { get { return _regionHeight; } set { _regionHeight = value; } } // Unrotated, stripped size. +// float RegionOriginalWidth { get { return _regionOriginalWidth; } set { _regionOriginalWidth = value; } } +// float RegionOriginalHeight { get { return _regionOriginalHeight; } set { _regionOriginalHeight = value; } } // Unrotated, unstripped size. // -// public bool InheritDeform { get { return _inheritDeform; } set { _inheritDeform = value; } } +// bool InheritDeform { get { return _inheritDeform; } set { _inheritDeform = value; } } // -// public MeshAttachment ParentMesh { +// MeshAttachment ParentMesh { // get { return _parentMesh; } // set { // _parentMesh = value; @@ -87,16 +87,16 @@ namespace Spine // } // // // Nonessential. -// public int[] Edges { get; set; } -// public float Width { get; set; } -// public float Height { get; set; } +// int[] Edges { get; set; } +// float Width { get; set; } +// float Height { get; set; } // -// public MeshAttachment (string name) : VertexAttachment(name) +// MeshAttachment (string name) : VertexAttachment(name) // { // // Empty // } // -// public void updateUVs() +// void updateUVs() // { // float u = RegionU, v = RegionV, width = RegionU2 - RegionU, height = RegionV2 - RegionV; // if (_uvs == null || _uvs.Length != _regionUVs.Length) @@ -122,21 +122,21 @@ namespace Spine // } // } // } -// -// virtual bool applyDeform(VertexAttachment* sourceAttachment) -// { -// return this == sourceAttachment || (_inheritDeform && _parentMesh == sourceAttachment); -// } -// -// private: -// float _regionOffsetX, _regionOffsetY, _regionWidth, _regionHeight, _regionOriginalWidth, _regionOriginalHeight; -// MeshAttachment* _parentMesh; + + virtual bool applyDeform(VertexAttachment* sourceAttachment) + { + return this == sourceAttachment || (_inheritDeform && _parentMesh == sourceAttachment); + } + + private: + float _regionOffsetX, _regionOffsetY, _regionWidth, _regionHeight, _regionOriginalWidth, _regionOriginalHeight; + MeshAttachment* _parentMesh; // float[] _uvs, _regionUVs; // int[] _triangles; -// float r = 1, g = 1, b = 1, a = 1; -// int _hulllength; -// bool _inheritDeform; -// bool _regionRotate; + float _r = 1, _g = 1, _b = 1, _a = 1; + int _hulllength; + bool _inheritDeform; + bool _regionRotate; }; }