diff --git a/spine-cpp/.cproject b/spine-cpp/.cproject
index 59dee5a8b..de0550c4d 100644
--- a/spine-cpp/.cproject
+++ b/spine-cpp/.cproject
@@ -7,7 +7,7 @@
-
+
@@ -33,7 +33,7 @@
@@ -47,8 +47,8 @@
-
-
+
+
@@ -137,10 +137,10 @@
-
+
-
+
diff --git a/spine-cpp/data/spineboy-skeleton.json b/spine-cpp/data/spineboy-skeleton.json
deleted file mode 100644
index e6df6f99a..000000000
--- a/spine-cpp/data/spineboy-skeleton.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-"bones": [
- { "name": "root", "length": 0 },
- { "name": "hip", "parent": "root", "length": 0, "x": 0.64, "y": 114.41 },
- { "name": "left upper leg", "parent": "hip", "length": 50.39, "x": 14.45, "y": 2.81, "rotation": -89.09 },
- { "name": "left lower leg", "parent": "left upper leg", "length": 56.45, "x": 51.78, "y": 3.46, "rotation": -16.65 },
- { "name": "left foot", "parent": "left lower leg", "length": 46.5, "x": 64.02, "y": -8.67, "rotation": 102.43 },
- { "name": "right upper leg", "parent": "hip", "length": 45.76, "x": -18.27, "rotation": -101.13 },
- { "name": "right lower leg", "parent": "right upper leg", "length": 58.52, "x": 50.21, "y": 0.6, "rotation": -10.7 },
- { "name": "right foot", "parent": "right lower leg", "length": 45.45, "x": 64.88, "y": 0.04, "rotation": 110.3 },
- { "name": "torso", "parent": "hip", "length": 85.82, "x": -6.42, "y": 1.97, "rotation": 94.95 },
- { "name": "neck", "parent": "torso", "length": 18.38, "x": 83.64, "y": -1.78, "rotation": 0.9 },
- { "name": "head", "parent": "neck", "length": 68.28, "x": 19.09, "y": 6.97, "rotation": -8.94 },
- { "name": "right shoulder", "parent": "torso", "length": 49.95, "x": 81.9, "y": 6.79, "rotation": 130.6 },
- { "name": "right arm", "parent": "right shoulder", "length": 36.74, "x": 49.95, "y": -0.12, "rotation": 40.12 },
- { "name": "right hand", "parent": "right arm", "length": 15.32, "x": 36.9, "y": 0.34, "rotation": 2.35 },
- { "name": "left shoulder", "parent": "torso", "length": 44.19, "x": 78.96, "y": -15.75, "rotation": -156.96 },
- { "name": "left arm", "parent": "left shoulder", "length": 35.62, "x": 44.19, "y": -0.01, "rotation": 28.16 },
- { "name": "left hand", "parent": "left arm", "length": 11.52, "x": 35.62, "y": 0.07, "rotation": 2.7 },
- { "name": "pelvis", "parent": "hip", "length": 0, "x": 1.41, "y": -6.57 }
-],
-"slots": [
- { "name": "template", "bone": "root", "color": "ff898c86" },
- { "name": "left shoulder", "bone": "left shoulder", "attachment": "left-shoulder" },
- { "name": "left arm", "bone": "left arm", "attachment": "left-arm" },
- { "name": "left hand", "bone": "left hand", "attachment": "left-hand" },
- { "name": "left foot", "bone": "left foot", "attachment": "left-foot" },
- { "name": "left lower leg", "bone": "left lower leg", "attachment": "left-lower-leg" },
- { "name": "left upper leg", "bone": "left upper leg", "attachment": "left-upper-leg" },
- { "name": "pelvis", "bone": "pelvis", "attachment": "pelvis" },
- { "name": "right foot", "bone": "right foot", "attachment": "right-foot" },
- { "name": "right lower leg", "bone": "right lower leg", "attachment": "right-lower-leg" },
- { "name": "right upper leg", "bone": "right upper leg", "attachment": "right-upper-leg" },
- { "name": "torso", "bone": "torso", "attachment": "torso" },
- { "name": "neck", "bone": "neck", "attachment": "neck" },
- { "name": "head", "bone": "head", "attachment": "head" },
- { "name": "eyes", "bone": "head", "attachment": "eyes" },
- { "name": "right shoulder", "bone": "right shoulder", "attachment": "right-shoulder" },
- { "name": "right arm", "bone": "right arm", "attachment": "right-arm" },
- { "name": "right hand", "bone": "right hand", "attachment": "right-hand" }
-],
-"skins": {
- "default": {
- "left shoulder": {
- "left-shoulder": { "x": 23.74, "y": 0.11, "rotation": 62.01, "width": 34, "height": 53 }
- },
- "left arm": {
- "left-arm": { "x": 15.11, "y": -0.44, "rotation": 33.84, "width": 35, "height": 29 }
- },
- "left hand": {
- "left-hand": { "x": 0.75, "y": 1.86, "rotation": 31.14, "width": 35, "height": 38 }
- },
- "left foot": {
- "left-foot": { "x": 24.35, "y": 8.88, "rotation": 3.32, "width": 65, "height": 30 }
- },
- "left lower leg": {
- "left-lower-leg": { "x": 24.55, "y": -1.92, "rotation": 105.75, "width": 49, "height": 64 }
- },
- "left upper leg": {
- "left-upper-leg": { "x": 26.12, "y": -1.85, "rotation": 89.09, "width": 33, "height": 67 }
- },
- "pelvis": {
- "pelvis": { "x": -4.83, "y": 10.62, "width": 63, "height": 47 }
- },
- "right foot": {
- "right-foot": { "x": 19.02, "y": 8.47, "rotation": 1.52, "width": 67, "height": 30 }
- },
- "right lower leg": {
- "right-lower-leg": { "x": 23.28, "y": -2.59, "rotation": 111.83, "width": 51, "height": 64 }
- },
- "right upper leg": {
- "right-upper-leg": { "x": 23.03, "y": 0.25, "rotation": 101.13, "width": 44, "height": 70 }
- },
- "torso": {
- "torso": { "x": 44.57, "y": -7.08, "rotation": -94.95, "width": 68, "height": 92 }
- },
- "neck": {
- "neck": { "x": 9.42, "y": -3.66, "rotation": -100.15, "width": 34, "height": 28 }
- },
- "head": {
- "head": { "x": 53.94, "y": -5.75, "rotation": -86.9, "width": 121, "height": 132 }
- },
- "eyes": {
- "eyes": { "x": 28.94, "y": -32.92, "rotation": -86.9, "width": 34, "height": 27 },
- "eyes-closed": { "x": 28.77, "y": -32.86, "rotation": -86.9, "width": 34, "height": 27 }
- },
- "right shoulder": {
- "right-shoulder": { "x": 25.86, "y": 0.03, "rotation": 134.44, "width": 52, "height": 51 }
- },
- "right arm": {
- "right-arm": { "x": 18.34, "y": -2.64, "rotation": 94.32, "width": 21, "height": 45 }
- },
- "right hand": {
- "right-hand": { "x": 6.82, "y": 1.25, "rotation": 91.96, "width": 32, "height": 32 }
- }
- }
-}
-}
\ No newline at end of file
diff --git a/spine-cpp/data/spineboy-walk.json b/spine-cpp/data/spineboy-walk.json
deleted file mode 100644
index b40e53a95..000000000
--- a/spine-cpp/data/spineboy-walk.json
+++ /dev/null
@@ -1,278 +0,0 @@
-{
-"bones": {
- "left upper leg": {
- "rotate": [
- { "time": 0, "angle": -26.55 },
- { "time": 0.1333, "angle": -8.78 },
- { "time": 0.2666, "angle": 9.51 },
- { "time": 0.4, "angle": 30.74 },
- { "time": 0.5333, "angle": 25.33 },
- { "time": 0.6666, "angle": 26.11 },
- { "time": 0.8, "angle": -7.7 },
- { "time": 0.9333, "angle": -21.19 },
- { "time": 1.0666, "angle": -26.55 }
- ],
- "translate": [
- { "time": 0, "x": -3, "y": -2.25 },
- { "time": 0.4, "x": -2.18, "y": -2.25 },
- { "time": 1.0666, "x": -3, "y": -2.25 }
- ]
- },
- "right upper leg": {
- "rotate": [
- { "time": 0, "angle": 42.45 },
- { "time": 0.1333, "angle": 52.1 },
- { "time": 0.2666, "angle": 5.96 },
- { "time": 0.5333, "angle": -16.93 },
- { "time": 0.6666, "angle": 1.89 },
- {
- "time": 0.8,
- "angle": 28.06,
- "curve": [ 0.462, 0.11, 1, 1 ]
- },
- {
- "time": 0.9333,
- "angle": 58.68,
- "curve": [ 0.5, 0.02, 1, 1 ]
- },
- { "time": 1.0666, "angle": 42.45 }
- ],
- "translate": [
- { "time": 0, "x": 8.11, "y": -2.36 },
- { "time": 0.1333, "x": 10.03, "y": -2.56 },
- { "time": 0.4, "x": 2.76, "y": -2.97 },
- { "time": 0.5333, "x": 2.76, "y": -2.81 },
- { "time": 0.9333, "x": 8.67, "y": -2.54 },
- { "time": 1.0666, "x": 8.11, "y": -2.36 }
- ]
- },
- "left lower leg": {
- "rotate": [
- { "time": 0, "angle": -10.21 },
- { "time": 0.1333, "angle": -55.64 },
- { "time": 0.2666, "angle": -68.12 },
- { "time": 0.5333, "angle": 5.11 },
- { "time": 0.6666, "angle": -28.29 },
- { "time": 0.8, "angle": 4.08 },
- { "time": 0.9333, "angle": 3.53 },
- { "time": 1.0666, "angle": -10.21 }
- ]
- },
- "left foot": {
- "rotate": [
- { "time": 0, "angle": -3.69 },
- { "time": 0.1333, "angle": -10.42 },
- { "time": 0.2666, "angle": -17.14 },
- { "time": 0.4, "angle": -2.83 },
- { "time": 0.5333, "angle": -3.87 },
- { "time": 0.6666, "angle": 2.78 },
- { "time": 0.8, "angle": 1.68 },
- { "time": 0.9333, "angle": -8.54 },
- { "time": 1.0666, "angle": -3.69 }
- ]
- },
- "right shoulder": {
- "rotate": [
- {
- "time": 0,
- "angle": 20.89,
- "curve": [ 0.264, 0, 0.75, 1 ]
- },
- {
- "time": 0.1333,
- "angle": 3.72,
- "curve": [ 0.272, 0, 0.841, 1 ]
- },
- { "time": 0.6666, "angle": -278.28 },
- { "time": 1.0666, "angle": 20.89 }
- ],
- "translate": [
- { "time": 0, "x": -7.84, "y": 7.19 },
- { "time": 0.1333, "x": -6.36, "y": 6.42 },
- { "time": 0.6666, "x": -11.07, "y": 5.25 },
- { "time": 1.0666, "x": -7.84, "y": 7.19 }
- ]
- },
- "right arm": {
- "rotate": [
- {
- "time": 0,
- "angle": -4.02,
- "curve": [ 0.267, 0, 0.804, 0.99 ]
- },
- {
- "time": 0.1333,
- "angle": -13.99,
- "curve": [ 0.341, 0, 1, 1 ]
- },
- {
- "time": 0.6666,
- "angle": 36.54,
- "curve": [ 0.307, 0, 0.787, 0.99 ]
- },
- { "time": 1.0666, "angle": -4.02 }
- ]
- },
- "right hand": {
- "rotate": [
- { "time": 0, "angle": 22.92 },
- { "time": 0.4, "angle": -8.97 },
- { "time": 0.6666, "angle": 0.51 },
- { "time": 1.0666, "angle": 22.92 }
- ]
- },
- "left shoulder": {
- "rotate": [
- { "time": 0, "angle": -1.47 },
- { "time": 0.1333, "angle": 13.6 },
- { "time": 0.6666, "angle": 280.74 },
- { "time": 1.0666, "angle": -1.47 }
- ],
- "translate": [
- { "time": 0, "x": -1.76, "y": 0.56 },
- { "time": 0.6666, "x": -2.47, "y": 8.14 },
- { "time": 1.0666, "x": -1.76, "y": 0.56 }
- ]
- },
- "left hand": {
- "rotate": [
- {
- "time": 0,
- "angle": 11.58,
- "curve": [ 0.169, 0.37, 0.632, 1.55 ]
- },
- {
- "time": 0.1333,
- "angle": 28.13,
- "curve": [ 0.692, 0, 0.692, 0.99 ]
- },
- {
- "time": 0.6666,
- "angle": -27.42,
- "curve": [ 0.117, 0.41, 0.738, 1.76 ]
- },
- { "time": 0.8, "angle": -36.32 },
- { "time": 1.0666, "angle": 11.58 }
- ]
- },
- "left arm": {
- "rotate": [
- { "time": 0, "angle": -8.27 },
- { "time": 0.1333, "angle": 18.43 },
- { "time": 0.6666, "angle": 0.88 },
- { "time": 1.0666, "angle": -8.27 }
- ]
- },
- "torso": {
- "rotate": [
- { "time": 0, "angle": -10.28 },
- {
- "time": 0.1333,
- "angle": -15.38,
- "curve": [ 0.545, 0, 1, 1 ]
- },
- {
- "time": 0.4,
- "angle": -9.78,
- "curve": [ 0.58, 0.17, 1, 1 ]
- },
- { "time": 0.6666, "angle": -15.75 },
- { "time": 0.9333, "angle": -7.06 },
- { "time": 1.0666, "angle": -10.28 }
- ],
- "translate": [
- { "time": 0, "x": -3.67, "y": 1.68 },
- { "time": 0.1333, "x": -3.67, "y": 0.68 },
- { "time": 0.4, "x": -3.67, "y": 1.97 },
- { "time": 0.6666, "x": -3.67, "y": -0.14 },
- { "time": 1.0666, "x": -3.67, "y": 1.68 }
- ]
- },
- "right foot": {
- "rotate": [
- { "time": 0, "angle": -5.25 },
- { "time": 0.2666, "angle": -4.08 },
- { "time": 0.4, "angle": -6.45 },
- { "time": 0.5333, "angle": -5.39 },
- { "time": 0.8, "angle": -11.68 },
- { "time": 0.9333, "angle": 0.46 },
- { "time": 1.0666, "angle": -5.25 }
- ]
- },
- "right lower leg": {
- "rotate": [
- { "time": 0, "angle": -3.39 },
- { "time": 0.1333, "angle": -45.53 },
- { "time": 0.2666, "angle": -2.59 },
- { "time": 0.5333, "angle": -19.53 },
- { "time": 0.6666, "angle": -64.8 },
- {
- "time": 0.8,
- "angle": -82.56,
- "curve": [ 0.557, 0.18, 1, 1 ]
- },
- { "time": 1.0666, "angle": -3.39 }
- ]
- },
- "hip": {
- "rotate": [
- { "time": 0, "angle": 0, "curve": "stepped" },
- { "time": 1.0666, "angle": 0 }
- ],
- "translate": [
- { "time": 0, "x": 0, "y": 0 },
- {
- "time": 0.1333,
- "x": 0,
- "y": -7.61,
- "curve": [ 0.272, 0.86, 1, 1 ]
- },
- { "time": 0.4, "x": 0, "y": 8.7 },
- { "time": 0.5333, "x": 0, "y": -0.41 },
- {
- "time": 0.6666,
- "x": 0,
- "y": -7.05,
- "curve": [ 0.235, 0.89, 1, 1 ]
- },
- { "time": 0.8, "x": 0, "y": 2.92 },
- { "time": 0.9333, "x": 0, "y": 6.78 },
- { "time": 1.0666, "x": 0, "y": 0 }
- ]
- },
- "neck": {
- "rotate": [
- { "time": 0, "angle": 3.6 },
- { "time": 0.1333, "angle": 17.49 },
- { "time": 0.2666, "angle": 6.1 },
- { "time": 0.4, "angle": 3.45 },
- { "time": 0.5333, "angle": 5.17 },
- { "time": 0.6666, "angle": 18.36 },
- { "time": 0.8, "angle": 6.09 },
- { "time": 0.9333, "angle": 2.28 },
- { "time": 1.0666, "angle": 3.6 }
- ]
- },
- "head": {
- "rotate": [
- {
- "time": 0,
- "angle": 3.6,
- "curve": [ 0, 0, 0.704, 1.61 ]
- },
- { "time": 0.1666, "angle": -0.2 },
- { "time": 0.2666, "angle": 6.1 },
- { "time": 0.4, "angle": 3.45 },
- {
- "time": 0.5333,
- "angle": 5.17,
- "curve": [ 0, 0, 0.704, 1.61 ]
- },
- { "time": 0.7, "angle": 1.1 },
- { "time": 0.8, "angle": 6.09 },
- { "time": 0.9333, "angle": 2.28 },
- { "time": 1.0666, "angle": 3.6 }
- ]
- }
-}
-}
\ No newline at end of file
diff --git a/spine-cpp/data/spineboy.atlas b/spine-cpp/data/spineboy.atlas
deleted file mode 100644
index ac19de904..000000000
--- a/spine-cpp/data/spineboy.atlas
+++ /dev/null
@@ -1,166 +0,0 @@
-
-../data/spineboy.png
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-head
- rotate: false
- xy: 1, 122
- size: 121, 132
- orig: 121, 132
- offset: 0, 0
- index: -1
-torso
- rotate: false
- xy: 1, 28
- size: 68, 92
- orig: 68, 92
- offset: 0, 0
- index: -1
-left-pant-bottom
- rotate: false
- xy: 1, 4
- size: 44, 22
- orig: 44, 22
- offset: 0, 0
- index: -1
-right-pant-bottom
- rotate: false
- xy: 47, 8
- size: 46, 18
- orig: 46, 18
- offset: 0, 0
- index: -1
-right-upper-leg
- rotate: false
- xy: 71, 50
- size: 44, 70
- orig: 44, 70
- offset: 0, 0
- index: -1
-pelvis
- rotate: false
- xy: 95, 1
- size: 63, 47
- orig: 63, 47
- offset: 0, 0
- index: -1
-left-upper-leg
- rotate: false
- xy: 117, 53
- size: 33, 67
- orig: 33, 67
- offset: 0, 0
- index: -1
-right-foot
- rotate: false
- xy: 160, 224
- size: 67, 30
- orig: 67, 30
- offset: 0, 0
- index: -1
-left-shoulder
- rotate: false
- xy: 124, 201
- size: 34, 53
- orig: 34, 53
- offset: 0, 0
- index: -1
-left-ankle
- rotate: false
- xy: 229, 222
- size: 25, 32
- orig: 25, 32
- offset: 0, 0
- index: -1
-left-foot
- rotate: false
- xy: 160, 192
- size: 65, 30
- orig: 65, 30
- offset: 0, 0
- index: -1
-neck
- rotate: false
- xy: 124, 171
- size: 34, 28
- orig: 34, 28
- offset: 0, 0
- index: -1
-right-arm
- rotate: false
- xy: 124, 124
- size: 21, 45
- orig: 21, 45
- offset: 0, 0
- index: -1
-right-ankle
- rotate: false
- xy: 227, 190
- size: 25, 30
- orig: 25, 30
- offset: 0, 0
- index: -1
-left-hand
- rotate: false
- xy: 147, 131
- size: 35, 38
- orig: 35, 38
- offset: 0, 0
- index: -1
-left-arm
- rotate: false
- xy: 184, 161
- size: 35, 29
- orig: 35, 29
- offset: 0, 0
- index: -1
-eyes-closed
- rotate: false
- xy: 221, 161
- size: 34, 27
- orig: 34, 27
- offset: 0, 0
- index: -1
-right-lower-leg
- rotate: false
- xy: 152, 65
- size: 51, 64
- orig: 51, 64
- offset: 0, 0
- index: -1
-right-foot-idle
- rotate: false
- xy: 184, 131
- size: 53, 28
- orig: 53, 28
- offset: 0, 0
- index: -1
-left-lower-leg
- rotate: false
- xy: 205, 65
- size: 49, 64
- orig: 49, 64
- offset: 0, 0
- index: -1
-right-shoulder
- rotate: false
- xy: 160, 12
- size: 52, 51
- orig: 52, 51
- offset: 0, 0
- index: -1
-eyes
- rotate: false
- xy: 214, 36
- size: 34, 27
- orig: 34, 27
- offset: 0, 0
- index: -1
-right-hand
- rotate: false
- xy: 214, 2
- size: 32, 32
- orig: 32, 32
- offset: 0, 0
- index: -1
diff --git a/spine-cpp/data/spineboy.png b/spine-cpp/data/spineboy.png
deleted file mode 100644
index b8b493dfd..000000000
Binary files a/spine-cpp/data/spineboy.png and /dev/null differ
diff --git a/spine-cpp/includes/json/autolink.h b/spine-cpp/include/json/autolink.h
similarity index 100%
rename from spine-cpp/includes/json/autolink.h
rename to spine-cpp/include/json/autolink.h
diff --git a/spine-cpp/includes/json/config.h b/spine-cpp/include/json/config.h
similarity index 100%
rename from spine-cpp/includes/json/config.h
rename to spine-cpp/include/json/config.h
diff --git a/spine-cpp/includes/json/features.h b/spine-cpp/include/json/features.h
similarity index 100%
rename from spine-cpp/includes/json/features.h
rename to spine-cpp/include/json/features.h
diff --git a/spine-cpp/includes/json/forwards.h b/spine-cpp/include/json/forwards.h
similarity index 100%
rename from spine-cpp/includes/json/forwards.h
rename to spine-cpp/include/json/forwards.h
diff --git a/spine-cpp/includes/json/json.h b/spine-cpp/include/json/json.h
similarity index 100%
rename from spine-cpp/includes/json/json.h
rename to spine-cpp/include/json/json.h
diff --git a/spine-cpp/includes/json/reader.h b/spine-cpp/include/json/reader.h
similarity index 100%
rename from spine-cpp/includes/json/reader.h
rename to spine-cpp/include/json/reader.h
diff --git a/spine-cpp/includes/json/value.h b/spine-cpp/include/json/value.h
similarity index 100%
rename from spine-cpp/includes/json/value.h
rename to spine-cpp/include/json/value.h
diff --git a/spine-cpp/includes/json/writer.h b/spine-cpp/include/json/writer.h
similarity index 100%
rename from spine-cpp/includes/json/writer.h
rename to spine-cpp/include/json/writer.h
diff --git a/spine-cpp/includes/spine/Animation.h b/spine-cpp/include/spine/Animation.h
similarity index 100%
rename from spine-cpp/includes/spine/Animation.h
rename to spine-cpp/include/spine/Animation.h
diff --git a/spine-cpp/includes/spine/Attachment.h b/spine-cpp/include/spine/Attachment.h
similarity index 100%
rename from spine-cpp/includes/spine/Attachment.h
rename to spine-cpp/include/spine/Attachment.h
diff --git a/spine-cpp/includes/spine/BaseAtlas.h b/spine-cpp/include/spine/BaseAtlas.h
similarity index 100%
rename from spine-cpp/includes/spine/BaseAtlas.h
rename to spine-cpp/include/spine/BaseAtlas.h
diff --git a/spine-cpp/includes/spine/BaseAttachmentLoader.h b/spine-cpp/include/spine/BaseAttachmentLoader.h
similarity index 100%
rename from spine-cpp/includes/spine/BaseAttachmentLoader.h
rename to spine-cpp/include/spine/BaseAttachmentLoader.h
diff --git a/spine-cpp/includes/spine/BaseRegionAttachment.h b/spine-cpp/include/spine/BaseRegionAttachment.h
similarity index 100%
rename from spine-cpp/includes/spine/BaseRegionAttachment.h
rename to spine-cpp/include/spine/BaseRegionAttachment.h
diff --git a/spine-cpp/includes/spine/BaseSkeleton.h b/spine-cpp/include/spine/BaseSkeleton.h
similarity index 100%
rename from spine-cpp/includes/spine/BaseSkeleton.h
rename to spine-cpp/include/spine/BaseSkeleton.h
diff --git a/spine-cpp/includes/spine/BaseSkeletonJson.h b/spine-cpp/include/spine/BaseSkeletonJson.h
similarity index 100%
rename from spine-cpp/includes/spine/BaseSkeletonJson.h
rename to spine-cpp/include/spine/BaseSkeletonJson.h
diff --git a/spine-cpp/includes/spine/Bone.h b/spine-cpp/include/spine/Bone.h
similarity index 100%
rename from spine-cpp/includes/spine/Bone.h
rename to spine-cpp/include/spine/Bone.h
diff --git a/spine-cpp/includes/spine/BoneData.h b/spine-cpp/include/spine/BoneData.h
similarity index 100%
rename from spine-cpp/includes/spine/BoneData.h
rename to spine-cpp/include/spine/BoneData.h
diff --git a/spine-cpp/includes/spine/SkeletonData.h b/spine-cpp/include/spine/SkeletonData.h
similarity index 100%
rename from spine-cpp/includes/spine/SkeletonData.h
rename to spine-cpp/include/spine/SkeletonData.h
diff --git a/spine-cpp/includes/spine/Skin.h b/spine-cpp/include/spine/Skin.h
similarity index 100%
rename from spine-cpp/includes/spine/Skin.h
rename to spine-cpp/include/spine/Skin.h
diff --git a/spine-cpp/includes/spine/Slot.h b/spine-cpp/include/spine/Slot.h
similarity index 100%
rename from spine-cpp/includes/spine/Slot.h
rename to spine-cpp/include/spine/Slot.h
diff --git a/spine-cpp/includes/spine/SlotData.h b/spine-cpp/include/spine/SlotData.h
similarity index 100%
rename from spine-cpp/includes/spine/SlotData.h
rename to spine-cpp/include/spine/SlotData.h
diff --git a/spine-sfml/.cproject b/spine-sfml/.cproject
index e0c5fcd3b..3c399205c 100644
--- a/spine-sfml/.cproject
+++ b/spine-sfml/.cproject
@@ -22,9 +22,7 @@
-
+
@@ -32,7 +30,7 @@
@@ -43,9 +41,7 @@
-
+
@@ -55,10 +51,10 @@
@@ -75,7 +71,7 @@
-
+
diff --git a/spine-sfml/src/main.cpp b/spine-sfml/src/main.cpp
index 3b1524940..4a1c6ed83 100644
--- a/spine-sfml/src/main.cpp
+++ b/spine-sfml/src/main.cpp
@@ -24,7 +24,7 @@ int main () {
skeleton->flipX = false;
skeleton->flipY = false;
skeleton->setToBindPose();
- skeleton->getRootBone()->x = 200;
+ skeleton->getRootBone()->x = 320;
skeleton->getRootBone()->y = 420;
skeleton->updateWorldTransform();