diff --git a/spine-c/.cproject b/spine-c/.cproject
index a12cd6342..b2b0c13c2 100644
--- a/spine-c/.cproject
+++ b/spine-c/.cproject
@@ -7,17 +7,25 @@
-
-
+
-
+
+
+
+
+
+
+
@@ -25,8 +33,8 @@
@@ -34,8 +42,8 @@
@@ -51,7 +59,6 @@
-
diff --git a/spine-c/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/spine-c/.settings/org.eclipse.cdt.managedbuilder.core.prefs
index f647a60a9..443688ae4 100644
--- a/spine-c/.settings/org.eclipse.cdt.managedbuilder.core.prefs
+++ b/spine-c/.settings/org.eclipse.cdt.managedbuilder.core.prefs
@@ -7,7 +7,5 @@ environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.784427509/C_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.784427509/append=true
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.784427509/appendContributed=true
-environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.debug.784427509/LIBRARY_PATH/delimiter=;
-environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.debug.784427509/LIBRARY_PATH/operation=remove
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.debug.784427509/append=true
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.debug.784427509/appendContributed=true
diff --git a/spine-c/example/main.c b/spine-c/example/main.c
deleted file mode 100644
index 17c159090..000000000
--- a/spine-c/example/main.c
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-/* This demonstrates implementing an extension to spine-c. spine/extension.h declares the functions that must be implemented along
- * with internal methods exposed to facilitate extension. */
-
-#include
-#include
-#include
-
-/**/
-
-void _spAtlasPage_createTexture (spAtlasPage* self, const char* path) {
- self->rendererObject = 0;
- self->width = 123;
- self->height = 456;
-}
-
-void _spAtlasPage_disposeTexture (spAtlasPage* self) {
-}
-
-char* _spUtil_readFile (const char* path, int* length) {
- return _readFile(path, length);
-}
-
-/**/
-
-int main (void) {
- spAtlas* atlas = spAtlas_createFromFile("data/spineboy.atlas", 0);
- printf("First region name: %s, x: %d, y: %d\n", atlas->regions->name, atlas->regions->x, atlas->regions->y);
- printf("First page name: %s, size: %d, %d\n", atlas->pages->name, atlas->pages->width, atlas->pages->height);
-
- spSkeletonJson* json = spSkeletonJson_create(atlas);
- spSkeletonData *skeletonData = spSkeletonJson_readSkeletonDataFile(json, "data/spineboy.json");
- if (!skeletonData) {
- printf("Error: %s\n", json->error);
- exit(0);
- }
- printf("Default skin name: %s\n", skeletonData->defaultSkin->name);
-
- spSkeleton* skeleton = spSkeleton_create(skeletonData);
-
- spAnimation* animation = spSkeletonData_findAnimation(skeletonData, "walk");
- if (!animation) {
- printf("Error: Animation not found: walk\n");
- exit(0);
- }
- printf("Animation timelineCount: %d\n", animation->timelineCount);
-
- spSkeleton_dispose(skeleton);
- spSkeletonData_dispose(skeletonData);
- spSkeletonJson_dispose(json);
- spAtlas_dispose(atlas);
-
- return 0;
-}
diff --git a/spine-sfml/.cproject b/spine-sfml/.cproject
index 90c8a4b4b..581916d56 100644
--- a/spine-sfml/.cproject
+++ b/spine-sfml/.cproject
@@ -3,9 +3,7 @@
-
-
-
+
@@ -18,9 +16,19 @@
-
+
+
+
+
+
+
-
+
@@ -31,31 +39,39 @@
-
+
-
+
+
+
@@ -65,13 +81,14 @@
-
-
-
+
+
-
+
+
+
@@ -157,12 +174,12 @@
-
-
-
+
+
+
diff --git a/spine-sfml/.project b/spine-sfml/.project
index 369defc7d..c17ffb5df 100644
--- a/spine-sfml/.project
+++ b/spine-sfml/.project
@@ -3,6 +3,7 @@
spine-sfml
+ spine-c
@@ -24,11 +25,4 @@
org.eclipse.cdt.managedbuilder.core.managedBuildNature
org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
-
-
- spine-c src
- 2
- PARENT-1-PROJECT_LOC/spine-c/src
-
-
diff --git a/spine-sfml/example/main.cpp b/spine-sfml/example/main.cpp
index b4be10e26..223e26f73 100644
--- a/spine-sfml/example/main.cpp
+++ b/spine-sfml/example/main.cpp
@@ -62,10 +62,10 @@ void callback (AnimationState* state, int trackIndex, EventType type, Event* eve
void spineboy () {
// Load atlas, skeleton, and animations.
- Atlas* atlas = Atlas_createFromFile("../data/spineboy.atlas", 0);
+ Atlas* atlas = Atlas_createFromFile("data/spineboy.atlas", 0);
SkeletonJson* json = SkeletonJson_create(atlas);
json->scale = 0.6f;
- SkeletonData *skeletonData = SkeletonJson_readSkeletonDataFile(json, "../data/spineboy.json");
+ SkeletonData *skeletonData = SkeletonJson_readSkeletonDataFile(json, "data/spineboy.json");
if (!skeletonData) {
printf("%s\n", json->error);
exit(0);
@@ -136,10 +136,10 @@ void spineboy () {
void goblins () {
// Load atlas, skeleton, and animations.
- Atlas* atlas = Atlas_createFromFile("../data/goblins-ffd.atlas", 0);
+ Atlas* atlas = Atlas_createFromFile("data/goblins-ffd.atlas", 0);
SkeletonJson* json = SkeletonJson_create(atlas);
json->scale = 1.4f;
- SkeletonData *skeletonData = SkeletonJson_readSkeletonDataFile(json, "../data/goblins-ffd.json");
+ SkeletonData *skeletonData = SkeletonJson_readSkeletonDataFile(json, "data/goblins-ffd.json");
if (!skeletonData) {
printf("Error: %s\n", json->error);
exit(0);