|
@@ -111,11 +111,11 @@ static bool handlerQueued = false;
|
|
|
|
|
|
spSkeletonJson* json = spSkeletonJson_create(atlas);
|
|
spSkeletonJson* json = spSkeletonJson_create(atlas);
|
|
json->scale = scale;
|
|
json->scale = scale;
|
|
- spSkeletonData* skeletonData = nil;
|
|
|
|
-
|
|
|
|
- @synchronized(self.class) {
|
|
|
|
- spSkeletonJson_readSkeletonDataFile(json, [skeletonDataFile UTF8String]);
|
|
|
|
- }
|
|
|
|
|
|
+ spSkeletonData* skeletonData = nil;
|
|
|
|
+
|
|
|
|
+ @synchronized(self.class) {
|
|
|
|
+ spSkeletonJson_readSkeletonDataFile(json, [skeletonDataFile UTF8String]);
|
|
|
|
+ }
|
|
NSAssert(skeletonData, ([NSString stringWithFormat:@"Error reading skeleton data file: %@\nError: %s", skeletonDataFile, json->error]));
|
|
NSAssert(skeletonData, ([NSString stringWithFormat:@"Error reading skeleton data file: %@\nError: %s", skeletonDataFile, json->error]));
|
|
spSkeletonJson_dispose(json);
|
|
spSkeletonJson_dispose(json);
|
|
if (!skeletonData) return 0;
|
|
if (!skeletonData) return 0;
|
|
@@ -129,19 +129,19 @@ static bool handlerQueued = false;
|
|
self = [super init];
|
|
self = [super init];
|
|
if (!self) return nil;
|
|
if (!self) return nil;
|
|
|
|
|
|
- @synchronized(self.class) {
|
|
|
|
- _atlas = spAtlas_createFromFile([atlasFile UTF8String], 0);
|
|
|
|
- }
|
|
|
|
|
|
+ @synchronized(self.class) {
|
|
|
|
+ _atlas = spAtlas_createFromFile([atlasFile UTF8String], 0);
|
|
|
|
+ }
|
|
NSAssert(_atlas, ([NSString stringWithFormat:@"Error reading atlas file: %@", atlasFile]));
|
|
NSAssert(_atlas, ([NSString stringWithFormat:@"Error reading atlas file: %@", atlasFile]));
|
|
if (!_atlas) return 0;
|
|
if (!_atlas) return 0;
|
|
|
|
|
|
spSkeletonJson* json = spSkeletonJson_create(_atlas);
|
|
spSkeletonJson* json = spSkeletonJson_create(_atlas);
|
|
json->scale = scale;
|
|
json->scale = scale;
|
|
- spSkeletonData* skeletonData;
|
|
|
|
-
|
|
|
|
- @synchronized(self.class) {
|
|
|
|
- skeletonData = spSkeletonJson_readSkeletonDataFile(json, [skeletonDataFile UTF8String]);
|
|
|
|
- }
|
|
|
|
|
|
+ spSkeletonData* skeletonData;
|
|
|
|
+
|
|
|
|
+ @synchronized(self.class) {
|
|
|
|
+ skeletonData = spSkeletonJson_readSkeletonDataFile(json, [skeletonDataFile UTF8String]);
|
|
|
|
+ }
|
|
NSAssert(skeletonData, ([NSString stringWithFormat:@"Error reading skeleton data file: %@\nError: %s", skeletonDataFile, json->error]));
|
|
NSAssert(skeletonData, ([NSString stringWithFormat:@"Error reading skeleton data file: %@\nError: %s", skeletonDataFile, json->error]));
|
|
spSkeletonJson_dispose(json);
|
|
spSkeletonJson_dispose(json);
|
|
if (!skeletonData) return 0;
|
|
if (!skeletonData) return 0;
|