diff --git a/Documentation/5. Connecting with Cocos2d.md b/Documentation/5. Connecting with Cocos2d.md
index d7da7d9aa..d80dc0214 100644
--- a/Documentation/5. Connecting with Cocos2d.md
+++ b/Documentation/5. Connecting with Cocos2d.md
@@ -2,36 +2,36 @@
For any non-trivial use of SpriteBuilder, you will need to connect your ccb-files to your code. This section explains how to do that.
## Loading ccb-files in Code
-SpriteBuilder documents, or ccb-files, need to be published into a compact binary format, ccbi, before they can be loaded into your app. To publish all your files, click on the Publish icon or choose *Publish* from the *File* menu. The ccbi-files can be loaded by calling the *load:* method in the *CCBReader* class as follows. Leave out the file extension when specifying the file name.
+SpriteBuilder documents, or ccb-files, need to be published into a compact binary format, ccbi, before they can be loaded into your app. To publish all your files, click on the Publish icon or choose *Publish* from the *File* menu. The ccbi-files can be loaded by calling the *load:* method in the *CCSBReader* class as follows. Leave out the file extension when specifying the file name.
- CCNode* myNode = [CCBReader load:@"MyCCBFile"];
+ CCNode* myNode = [CCSBReader load:@"MyCCBFile"];
You may need to cast the returned value depending on what sort of object the root node in your ccbi-file is and how you will use it in your code. For instance, if you load a CCParticleSystem, use the following code:
- CCParticleSystem* myParticles = (CCParticleSystem*) [CCBReader load:@"MyParticleSystem"];
+ CCParticleSystem* myParticles = (CCParticleSystem*) [CCSBReader load:@"MyParticleSystem"];
-For your convenience, CCBReader can also wrap your node graph in a scene. To load your ccbi-file in a scene, call *loadAsScene:*
+For your convenience, CCSBReader can also wrap your node graph in a scene. To load your ccbi-file in a scene, call *loadAsScene:*
- CCScene* myScene = [CCBReader sceneWithNodeGraphFromFile:@"MyScene"];
+ CCScene* myScene = [CCSBReader sceneWithNodeGraphFromFile:@"MyScene"];
### Passing an Owner Variable
-Sometimes you need to be able to access instance variables from, and get callbacks to, an object other than the root node of a ccb-file. To do this, you will need to pass an *owner* to the CCBReader. To get the variable or callback assigned to the owner, make sure that you've selected *owner* when declaring the instance variable name or callback in SpriteBuilder. Then call the *load:owner:* or *loadAsScene:owner:* method of CCBReader when loading your file.
+Sometimes you need to be able to access instance variables from, and get callbacks to, an object other than the root node of a ccb-file. To do this, you will need to pass an *owner* to the CCSBReader. To get the variable or callback assigned to the owner, make sure that you've selected *owner* when declaring the instance variable name or callback in SpriteBuilder. Then call the *load:owner:* or *loadAsScene:owner:* method of CCSBReader when loading your file.
MyCallbackClass* callbackClass = [[MyCallbackClass callbackClass alloc] init];
- CCNode* myNode = [CCBReader load:@"MyNodeGraph.ccbi" owner:callbackClass];
+ CCNode* myNode = [CCSBReader load:@"MyNodeGraph.ccbi" owner:callbackClass];
### Accessing Variables and Callbacks in a sub ccb-file
-If you are using sub ccb-files, specifying the root node as target will refer to the root node of the sub ccb-file. The owner target is the object that you pass to the CCBReader.
+If you are using sub ccb-files, specifying the root node as target will refer to the root node of the sub ccb-file. The owner target is the object that you pass to the CCSBReader.
## Using Custom Classes
-The most common way to link your code with SpriteBuilder is to use custom classes. To assign a custom class to a node in SpriteBuilder, select the node then enter the name of your custom class in the code connections tab of the property inspector. Remember that your custom class needs to be a sub class of the selected object. When loading the ccb-file, CCBReader will initialize your custom class using the super class's *init* method then set all of the object's properties. If you need to do any extra initialization of your object after the properties are set, CCBReader will call the *didLoadFromCCB* method.
+The most common way to link your code with SpriteBuilder is to use custom classes. To assign a custom class to a node in SpriteBuilder, select the node then enter the name of your custom class in the code connections tab of the property inspector. Remember that your custom class needs to be a sub class of the selected object. When loading the ccb-file, CCSBReader will initialize your custom class using the super class's *init* method then set all of the object's properties. If you need to do any extra initialization of your object after the properties are set, CCSBReader will call the *didLoadFromCCB* method.

-Please note that CCBReader will not be able to use any custom init methods. You will need to have a working plain init method for all custom classes that you use with SpriteBuilder. You can use custom classes for any node in your ccb-file, however, the most common use is to override the root node.
+Please note that CCSBReader will not be able to use any custom init methods. You will need to have a working plain init method for all custom classes that you use with SpriteBuilder. You can use custom classes for any node in your ccb-file, however, the most common use is to override the root node.
## Linking Instance Variables
-References to objects in your ccb-file can be linked to instance variables when the file is loaded. These instance variables can be either in the root node of the document, in which case it must have been assigned a custom class. You can also assign them to a custom object, which is optionally passed as the *owner* object to the CCBReader. To load the ccb-file and assign instances to its owner, the node graph needs to be loaded by calling either the *load:owner:* or the *loadAsScene:owner:* method.
+References to objects in your ccb-file can be linked to instance variables when the file is loaded. These instance variables can be either in the root node of the document, in which case it must have been assigned a custom class. You can also assign them to a custom object, which is optionally passed as the *owner* object to the CCSBReader. To load the ccb-file and assign instances to its owner, the node graph needs to be loaded by calling either the *load:owner:* or the *loadAsScene:owner:* method.

diff --git a/Documentation/7. Working with Animations.md b/Documentation/7. Working with Animations.md
index d16a009a0..8f2cc2a40 100644
--- a/Documentation/7. Working with Animations.md
+++ b/Documentation/7. Working with Animations.md
@@ -55,7 +55,7 @@ To have a timeline play in sequence, click the *No chained timeline* text and se
### Playing Back Animations in Code
To programmatically control the animations you create with SpriteBuilder you will need to retrieve the *CCAnimationManager*. The animation manager is assigned to the node when the ccbi-file is loaded.
- CCNode* myNodeGraph = [CCBReader load:@"myFile.ccbi"];
+ CCNode* myNodeGraph = [CCSBReader load:@"myFile.ccbi"];
CCAnimationManager* animationManager = myNodeGraph.userObject;
The animation manager will be returned as an autoreleased object. To play back a specific timeline call the *runAnimationsForSequenceNamed:* method. If a timeline is currently playing, it will be immediately stopped when calling this method.
diff --git a/Documentation/X1. Creating Node Plug-ins.md b/Documentation/X1. Creating Node Plug-ins.md
index db96929ae..b7bd9dd07 100644
--- a/Documentation/X1. Creating Node Plug-ins.md
+++ b/Documentation/X1. Creating Node Plug-ins.md
@@ -16,7 +16,7 @@ To compile and test the plug-in, first make sure that you have built a copy of S
## Basic plug-in structure
-To make a working node plug-in, you will need to add your class to the plug-in project and edit the _CCBPProperties.plist_ file. When loading your custom class, SpriteBuilder/CCBReader will create it using the _alloc_ and default _init_ methods, then assign all the object's properties. Therefore, it is required that your class can be initialized using the _init_ method only (without using a custom init-method).
+To make a working node plug-in, you will need to add your class to the plug-in project and edit the _CCBPProperties.plist_ file. When loading your custom class, SpriteBuilder/CCSBReader will create it using the _alloc_ and default _init_ methods, then assign all the object's properties. Therefore, it is required that your class can be initialized using the _init_ method only (without using a custom init-method).
The classes you add to a plug-in are linked in runtime against the Cocos2d library; only the header files are included in the project. If your node-object uses more than one class, those classes shouldn't be included in other plug-ins or there may be conflicts when loading the plug-ins.
@@ -88,7 +88,7 @@ Most of the plug-in magic happens in the _CCBPProperties.plist_ file. It defines
## PlugInProperty
-A PlugInProperty defines how a property should be displayed in SpriteBuilder and how it should be loaded into an app by CCBReader. It is a dictionary with the keys listed below. Which property _type_:s are supported and how they are serialized (for the _default_ value) is defined in the _Property Types_ document.
+A PlugInProperty defines how a property should be displayed in SpriteBuilder and how it should be loaded into an app by CCSBReader. It is a dictionary with the keys listed below. Which property _type_:s are supported and how they are serialized (for the _default_ value) is defined in the _Property Types_ document.
### Required keys
diff --git a/Documentation/X4. CCBi File Format.md b/Documentation/X4. CCBi File Format.md
index 7c2365a65..e9947d8bd 100644
--- a/Documentation/X4. CCBi File Format.md
+++ b/Documentation/X4. CCBi File Format.md
@@ -1,6 +1,6 @@
# SpriteBuilder - CCBi File Format
-This is a description of the SpriteBuilder export (publish) file format for Cocos2d. It is a binary file format designed to be as compact as possible and very quick to load. This document covers version 4 of the ccbi file format, released with SpriteBuilder 1. If you are implementing or porting a reader for the ccbi file format, you may want to also have a look at the CCBReader, which is the reference implementation.
+This is a description of the SpriteBuilder export (publish) file format for Cocos2d. It is a binary file format designed to be as compact as possible and very quick to load. This document covers version 4 of the ccbi file format, released with SpriteBuilder 1. If you are implementing or porting a reader for the ccbi file format, you may want to also have a look at the CCSBReader, which is the reference implementation.
## Basic types
@@ -342,7 +342,7 @@ Represents a node or a node graph (if the node has children). Nodes that use the
CSTRING | jsController | Name of the js controller; only written if jsControlled is set in the HEADER |
- UINT | memberVarAssignmentType | The target this node should be assigned as a variable for. 0 = No target; 1 = document's root node; 2 = owner (as passed to CCBReader) |
+ UINT | memberVarAssignmentType | The target this node should be assigned as a variable for. 0 = No target; 1 = document's root node; 2 = owner (as passed to CCSBReader) |
CSTRING | memberVarAssignmentName | The name of the variable this node should be assigned to (only written if memberVarAssignmentType != 0) |
diff --git a/SpriteBuilder/Cocos2D iPhone/CCBXCocos2diPhone.m b/SpriteBuilder/Cocos2D iPhone/CCBXCocos2diPhone.m
index 47eeac70e..486eb3d0c 100644
--- a/SpriteBuilder/Cocos2D iPhone/CCBXCocos2diPhone.m
+++ b/SpriteBuilder/Cocos2D iPhone/CCBXCocos2diPhone.m
@@ -23,7 +23,7 @@
*/
#import "CCBXCocos2diPhone.h"
-#import "CCBBinaryWriter.h"
+#import "CCSBBinaryWriter.h"
@implementation CCBXCocos2diPhone
@@ -34,7 +34,7 @@ - (NSString*) extension
- (NSData *)exportDocument:(NSDictionary *)doc
{
- CCBBinaryWriter * writer = [[CCBBinaryWriter alloc] init];
+ CCSBBinaryWriter * writer = [[CCSBBinaryWriter alloc] init];
writer.serializedProjectSettings = serializedProjectSettings;
writer.delegate = self.delegate;
[writer writeDocument:doc];
diff --git a/SpriteBuilder/Cocos2D iPhone/CCBBinaryWriter.h b/SpriteBuilder/Cocos2D iPhone/CCSBBinaryWriter.h
similarity index 98%
rename from SpriteBuilder/Cocos2D iPhone/CCBBinaryWriter.h
rename to SpriteBuilder/Cocos2D iPhone/CCSBBinaryWriter.h
index 157ca8690..bd1bb67d8 100644
--- a/SpriteBuilder/Cocos2D iPhone/CCBBinaryWriter.h
+++ b/SpriteBuilder/Cocos2D iPhone/CCSBBinaryWriter.h
@@ -37,7 +37,7 @@ enum {
kCCBXFloatFull
};
-@interface CCBBinaryWriter : NSObject
+@interface CCSBBinaryWriter : NSObject
{
NSDictionary* serializedProjectSettings;
diff --git a/SpriteBuilder/Cocos2D iPhone/CCBBinaryWriter.m b/SpriteBuilder/Cocos2D iPhone/CCSBBinaryWriter.m
similarity index 99%
rename from SpriteBuilder/Cocos2D iPhone/CCBBinaryWriter.m
rename to SpriteBuilder/Cocos2D iPhone/CCSBBinaryWriter.m
index 4b0856c4b..f4582fe66 100644
--- a/SpriteBuilder/Cocos2D iPhone/CCBBinaryWriter.m
+++ b/SpriteBuilder/Cocos2D iPhone/CCSBBinaryWriter.m
@@ -22,14 +22,14 @@
* THE SOFTWARE.
*/
-#import "CCBBinaryWriter.h"
+#import "CCSBBinaryWriter.h"
#import "SequencerKeyframe.h"
#import "SequencerKeyframeEasing.h"
#import "CustomPropSetting.h"
#import "NSArray+Query.h"
#import "CCRendererBasicTypes.h"
-@implementation CCBBinaryWriter
+@implementation CCSBBinaryWriter
@synthesize data;
@synthesize serializedProjectSettings;
diff --git a/SpriteBuilder/SpriteBuilder Tests/CCAnimation_Tests.m b/SpriteBuilder/SpriteBuilder Tests/CCAnimation_Tests.m
index 15084e025..fa8329e1d 100644
--- a/SpriteBuilder/SpriteBuilder Tests/CCAnimation_Tests.m
+++ b/SpriteBuilder/SpriteBuilder Tests/CCAnimation_Tests.m
@@ -11,7 +11,7 @@
#import "CCBXCocos2diPhone.h"
#import "PlugInManager.h"
#import "PlugInExport.h"
-#import "CCBReader.h"
+#import "CCSBReader.h"
#import "CCAnimationManager.h"
#import "CCAnimationManager_Private.h"
#import "CCBSequence.h"
@@ -129,7 +129,7 @@ - (void)testAnimationSync1
if(!animData)
return;
- CCBReader * reader = [CCBReader reader];
+ CCSBReader * reader = [CCSBReader reader];
CCNode * rootNode = [reader loadWithData:animData owner:callbackTest];
CCNode * node0 = rootNode.children[0];
@@ -190,7 +190,7 @@ -(void)testAnimationCallback1
if(!animData)
return;
- CCBReader * reader = [CCBReader reader];
+ CCSBReader * reader = [CCSBReader reader];
CCNode * rootNode = [reader loadWithData:animData owner:callbackTest];
CCBSequence * seq = rootNode.animationManager.sequences[0];
@@ -246,7 +246,7 @@ -(void)testAnimationTween1
if(!animData)
return;
- CCBReader * reader = [CCBReader reader];
+ CCSBReader * reader = [CCSBReader reader];
CCNode * rootNode = [reader loadWithData:animData owner:callbackTest];
CCNode * node0 = rootNode.children[0];
@@ -386,7 +386,7 @@ -(void)testAnimationLoop1
if(!animData)
return;
- CCBReader * reader = [CCBReader reader];
+ CCSBReader * reader = [CCSBReader reader];
CCNode * rootNode = [reader loadWithData:animData owner:callbackHelper];
CCNode * node0 = rootNode.children[0];
@@ -449,7 +449,7 @@ -(void)testAnimationSeeking1
if(!animData)
return;
- CCBReader * reader = [CCBReader reader];
+ CCSBReader * reader = [CCSBReader reader];
CCNode * rootNode = [reader loadWithData:animData owner:nil];
CCNode * node0 = rootNode.children[0];
@@ -520,7 +520,7 @@ -(void)testAnimationChaining1
if(!animData)
return;
- CCBReader * reader = [CCBReader reader];
+ CCSBReader * reader = [CCSBReader reader];
CCNode * rootNode = [reader loadWithData:animData owner:nil];
const CGFloat kAnimationDuration = 1.0f;
@@ -549,7 +549,7 @@ -(void)testVisibility1
if(!animData)
return;
- CCBReader * reader = [CCBReader reader];
+ CCSBReader * reader = [CCSBReader reader];
CCNode * rootNode = [reader loadWithData:animData owner:nil];
CCNode * node0 = rootNode.children[0];
@@ -581,7 +581,7 @@ -(void)testZeroDurationTimeline1
if(!animData)
return;
- CCBReader * reader = [CCBReader reader];
+ CCSBReader * reader = [CCSBReader reader];
CCNode * rootNode = [reader loadWithData:animData owner:nil];
CCNode * node0 = rootNode.children[0];
diff --git a/SpriteBuilder/SpriteBuilder Tests/CCBDictionaryWriter_Tests.m b/SpriteBuilder/SpriteBuilder Tests/CCBDictionaryWriter_Tests.m
index e55f42a16..b90344408 100644
--- a/SpriteBuilder/SpriteBuilder Tests/CCBDictionaryWriter_Tests.m
+++ b/SpriteBuilder/SpriteBuilder Tests/CCBDictionaryWriter_Tests.m
@@ -9,7 +9,7 @@
#import
#import "FileSystemTestCase.h"
#import "PlugInManager.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
@interface CCBDictionaryWriter_Tests : FileSystemTestCase
@@ -25,7 +25,7 @@ - (void)testSerializeNode
[node addChild:sprite];
- NSMutableDictionary *result = [CCBDictionaryWriter serializeNode:node];
+ NSMutableDictionary *result = [CCSBDictionaryWriter serializeNode:node];
NSDictionary *expectedDict =
@{
diff --git a/SpriteBuilder/SpriteBuilder Tests/CCBReader_EffectsTest.m b/SpriteBuilder/SpriteBuilder Tests/CCBReader_EffectsTest.m
index c9b4c77ae..aad2becf8 100644
--- a/SpriteBuilder/SpriteBuilder Tests/CCBReader_EffectsTest.m
+++ b/SpriteBuilder/SpriteBuilder Tests/CCBReader_EffectsTest.m
@@ -8,7 +8,7 @@
#import
#import "Cocos2dTestHelpers.h"
-#import "CCBReader.h"
+#import "CCSBReader.h"
@interface CCBReader_EffectsTest : XCTestCase
@@ -35,7 +35,7 @@ - (void)testCCBRenderTest
if(!animData)
return;
- CCBReader * reader = [CCBReader reader];
+ CCSBReader * reader = [CCSBReader reader];
[reader loadWithData:animData owner:nil];
diff --git a/SpriteBuilder/SpriteBuilder Tests/CCBReader_Tests.m b/SpriteBuilder/SpriteBuilder Tests/CCBReader_Tests.m
index fec32f54c..01c3b49dd 100644
--- a/SpriteBuilder/SpriteBuilder Tests/CCBReader_Tests.m
+++ b/SpriteBuilder/SpriteBuilder Tests/CCBReader_Tests.m
@@ -1,5 +1,5 @@
//
-// CCBReader.m
+// CCSBReader.m
// SpriteBuilder
//
// Created by Nicky Weber on 20.05.14.
@@ -7,7 +7,7 @@
//
#import
-#import "CCBBinaryWriter.h"
+#import "CCSBBinaryWriter.h"
#import "CCBReader_Private.h"
#import "Cocos2dTestHelpers.h"
@@ -31,7 +31,7 @@ - (void)tearDown
- (void)testCCBVersionCompatibility
{
- XCTAssertEqual(kCCBVersion, kCCBBinaryVersion, @"CCB version %d read by CCBReader is incompatible with version %d written by SpriteBuilder. Is cocos2d up to date?", kCCBVersion, kCCBBinaryVersion);
+ XCTAssertEqual(kCCBVersion, kCCBBinaryVersion, @"CCB version %d read by CCSBReader is incompatible with version %d written by SpriteBuilder. Is cocos2d up to date?", kCCBVersion, kCCBBinaryVersion);
}
@end
diff --git a/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj b/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj
index 0d95f3115..8af943de8 100644
--- a/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj
+++ b/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj
@@ -35,7 +35,7 @@
772BE567133E40D60009B5B9 /* missing-texture.png in Resources */ = {isa = PBXBuildFile; fileRef = 772BE566133E40D60009B5B9 /* missing-texture.png */; };
772BE572133E48350009B5B9 /* CCBGlobals.m in Sources */ = {isa = PBXBuildFile; fileRef = 772BE571133E48340009B5B9 /* CCBGlobals.m */; };
772BE57C134398EE0009B5B9 /* NewDocWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 772BE57B134398EE0009B5B9 /* NewDocWindow.xib */; };
- 772BE5801343A6EF0009B5B9 /* CCBDictionaryWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 772BE57F1343A6EE0009B5B9 /* CCBDictionaryWriter.m */; };
+ 772BE5801343A6EF0009B5B9 /* CCSBDictionaryWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 772BE57F1343A6EE0009B5B9 /* CCSBDictionaryWriter.m */; };
772BE58E134BB6C00009B5B9 /* CCBDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 772BE58D134BB6BE0009B5B9 /* CCBDocument.m */; };
774E4EC2136D98AB0025D0A8 /* select-bl.png in Resources */ = {isa = PBXBuildFile; fileRef = 774E4EBD136D98AB0025D0A8 /* select-bl.png */; };
774E4EC3136D98AB0025D0A8 /* select-br.png in Resources */ = {isa = PBXBuildFile; fileRef = 774E4EBE136D98AB0025D0A8 /* select-br.png */; };
@@ -770,7 +770,7 @@
E3EDBC1415483E3200EEF1F3 /* ResolutionSettingsWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = E3EDBC1315483E3200EEF1F3 /* ResolutionSettingsWindow.m */; };
E3EDBC1615483EE000EEF1F3 /* ResolutionSettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = E3EDBC1515483EE000EEF1F3 /* ResolutionSettingsWindow.xib */; };
E3EDBC251549971000EEF1F3 /* CCBFileUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = E3EDBC241549971000EEF1F3 /* CCBFileUtil.m */; };
- E3F2C21314FC157E007B660D /* CCBBinaryWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = E3F2C21214FC157E007B660D /* CCBBinaryWriter.m */; };
+ E3F2C21314FC157E007B660D /* CCSBBinaryWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = E3F2C21214FC157E007B660D /* CCSBBinaryWriter.m */; };
E3F3F83F153C72A3005443EE /* NotesLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = E3F3F83E153C72A3005443EE /* NotesLayer.m */; };
E3F3F843153C7700005443EE /* StickyNote.m in Sources */ = {isa = PBXBuildFile; fileRef = E3F3F842153C7700005443EE /* StickyNote.m */; };
E3F3F845153C7772005443EE /* notes-bg-1x.png in Resources */ = {isa = PBXBuildFile; fileRef = E3F3F844153C7772005443EE /* notes-bg-1x.png */; };
@@ -1339,8 +1339,8 @@
772BE570133E48340009B5B9 /* CCBGlobals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBGlobals.h; sourceTree = ""; };
772BE571133E48340009B5B9 /* CCBGlobals.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCBGlobals.m; sourceTree = ""; };
772BE57B134398EE0009B5B9 /* NewDocWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NewDocWindow.xib; sourceTree = ""; };
- 772BE57E1343A6ED0009B5B9 /* CCBDictionaryWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBDictionaryWriter.h; sourceTree = ""; };
- 772BE57F1343A6EE0009B5B9 /* CCBDictionaryWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCBDictionaryWriter.m; sourceTree = ""; };
+ 772BE57E1343A6ED0009B5B9 /* CCSBDictionaryWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSBDictionaryWriter.h; sourceTree = ""; };
+ 772BE57F1343A6EE0009B5B9 /* CCSBDictionaryWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCSBDictionaryWriter.m; sourceTree = ""; };
772BE58C134BB6BD0009B5B9 /* CCBDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBDocument.h; sourceTree = ""; };
772BE58D134BB6BE0009B5B9 /* CCBDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCBDocument.m; sourceTree = ""; };
774E4EBD136D98AB0025D0A8 /* select-bl.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "select-bl.png"; sourceTree = ""; };
@@ -2384,8 +2384,8 @@
E3EDBC1515483EE000EEF1F3 /* ResolutionSettingsWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ResolutionSettingsWindow.xib; sourceTree = ""; };
E3EDBC231549971000EEF1F3 /* CCBFileUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBFileUtil.h; sourceTree = ""; };
E3EDBC241549971000EEF1F3 /* CCBFileUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCBFileUtil.m; sourceTree = ""; };
- E3F2C21114FC157E007B660D /* CCBBinaryWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBBinaryWriter.h; sourceTree = ""; };
- E3F2C21214FC157E007B660D /* CCBBinaryWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCBBinaryWriter.m; sourceTree = ""; };
+ E3F2C21114FC157E007B660D /* CCSBBinaryWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSBBinaryWriter.h; sourceTree = ""; };
+ E3F2C21214FC157E007B660D /* CCSBBinaryWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCSBBinaryWriter.m; sourceTree = ""; };
E3F3F83D153C72A3005443EE /* NotesLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotesLayer.h; sourceTree = ""; };
E3F3F83E153C72A3005443EE /* NotesLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotesLayer.m; sourceTree = ""; };
E3F3F841153C7700005443EE /* StickyNote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StickyNote.h; sourceTree = ""; };
@@ -3041,8 +3041,8 @@
children = (
772BE58C134BB6BD0009B5B9 /* CCBDocument.h */,
772BE58D134BB6BE0009B5B9 /* CCBDocument.m */,
- 772BE57E1343A6ED0009B5B9 /* CCBDictionaryWriter.h */,
- 772BE57F1343A6EE0009B5B9 /* CCBDictionaryWriter.m */,
+ 772BE57E1343A6ED0009B5B9 /* CCSBDictionaryWriter.h */,
+ 772BE57F1343A6EE0009B5B9 /* CCSBDictionaryWriter.m */,
E3C3660214EB2C1B007CD5FF /* CCBDictionaryReader.h */,
E3C3660314EB2C1B007CD5FF /* CCBDictionaryReader.m */,
E312EDC516AF71FE000778C8 /* CCBDictionaryReaderRenamedProps.plist */,
@@ -5188,8 +5188,8 @@
E398C02514FB81A30078E771 /* Supporting Files */,
E398C03914FB8F850078E771 /* CCBXCocos2diPhone.h */,
E398C03A14FB8F850078E771 /* CCBXCocos2diPhone.m */,
- E3F2C21114FC157E007B660D /* CCBBinaryWriter.h */,
- E3F2C21214FC157E007B660D /* CCBBinaryWriter.m */,
+ E3F2C21114FC157E007B660D /* CCSBBinaryWriter.h */,
+ E3F2C21214FC157E007B660D /* CCSBBinaryWriter.m */,
);
name = "Cocos2D iPhone";
path = "../Cocos2D iPhone";
@@ -7208,7 +7208,7 @@
7789ACEA133AB47A00CEFCC7 /* CocosScene.m in Sources */,
772BE565133C06320009B5B9 /* NSFlippedView.m in Sources */,
772BE572133E48350009B5B9 /* CCBGlobals.m in Sources */,
- 772BE5801343A6EF0009B5B9 /* CCBDictionaryWriter.m in Sources */,
+ 772BE5801343A6EF0009B5B9 /* CCSBDictionaryWriter.m in Sources */,
772BE58E134BB6C00009B5B9 /* CCBDocument.m in Sources */,
771B2B321353818200B260BA /* NewDocWindowController.m in Sources */,
77156DB1137F0351005EF746 /* CCBSpriteSheetParser.m in Sources */,
@@ -7748,7 +7748,7 @@
files = (
4D0C1E7918F49A3700B028CA /* CCNode+PositionExtentions.m in Sources */,
E398C03B14FB8F850078E771 /* CCBXCocos2diPhone.m in Sources */,
- E3F2C21314FC157E007B660D /* CCBBinaryWriter.m in Sources */,
+ E3F2C21314FC157E007B660D /* CCSBBinaryWriter.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/SpriteBuilder/ccBuilder/AppDelegate.m b/SpriteBuilder/ccBuilder/AppDelegate.m
index f3380fdc8..5a5e0f073 100644
--- a/SpriteBuilder/ccBuilder/AppDelegate.m
+++ b/SpriteBuilder/ccBuilder/AppDelegate.m
@@ -30,7 +30,7 @@
#import "NSFlippedView.h"
#import "CCBGlobals.h"
#import "cocos2d.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "CCBDictionaryReader.h"
#import "CCBDocument.h"
#import "NewDocWindowController.h"
@@ -2512,7 +2512,7 @@ - (IBAction) copy:(id) sender
return;
// Serialize selected node
- NSMutableDictionary* clipDict = [CCBDictionaryWriter serializeNode:self.selectedNode];
+ NSMutableDictionary* clipDict = [CCSBDictionaryWriter serializeNode:self.selectedNode];
NSData* clipData = [NSKeyedArchiver archivedDataWithRootObject:clipDict];
NSPasteboard* cb = [NSPasteboard generalPasteboard];
diff --git a/SpriteBuilder/ccBuilder/CCBDictionaryReader.m b/SpriteBuilder/ccBuilder/CCBDictionaryReader.m
index 8603dbc70..ac75dd00b 100644
--- a/SpriteBuilder/ccBuilder/CCBDictionaryReader.m
+++ b/SpriteBuilder/ccBuilder/CCBDictionaryReader.m
@@ -26,7 +26,7 @@
#import "PlugInManager.h"
#import "PlugInNode.h"
#import "NodeInfo.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "TexturePropertySetter.h"
#import "CCBGlobals.h"
#import "AppDelegate.h"
diff --git a/SpriteBuilder/ccBuilder/CCBDocumentDataCreator.m b/SpriteBuilder/ccBuilder/CCBDocumentDataCreator.m
index d1975454f..f40fed3f8 100644
--- a/SpriteBuilder/ccBuilder/CCBDocumentDataCreator.m
+++ b/SpriteBuilder/ccBuilder/CCBDocumentDataCreator.m
@@ -2,7 +2,7 @@
#import "CCNode.h"
#import "SceneGraph.h"
#import "CCBDocument.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "CCBDictionaryReader.h"
#import "GuidesLayer.h"
#import "NotesLayer.h"
@@ -90,7 +90,7 @@ - (void)setMiscDataInDict:(NSMutableDictionary *)dict
- (void)setNodeGraphInDict:(NSMutableDictionary *)dict
{
- NSMutableDictionary* nodeGraph = [CCBDictionaryWriter serializeNode:_sceneGraph.rootNode];
+ NSMutableDictionary* nodeGraph = [CCSBDictionaryWriter serializeNode:_sceneGraph.rootNode];
dict[@"nodeGraph"] = nodeGraph;
}
@@ -123,7 +123,7 @@ - (void)setJointsDataInDictDict:(NSMutableDictionary *)dict
NSMutableArray * joints = [NSMutableArray array];
for (CCNode * joint in _sceneGraph.joints.all)
{
- [joints addObject:[CCBDictionaryWriter serializeNode:joint]];
+ [joints addObject:[CCSBDictionaryWriter serializeNode:joint]];
}
dict[@"joints"] = joints;
diff --git a/SpriteBuilder/ccBuilder/CCBPEffectColorChannelOffset.m b/SpriteBuilder/ccBuilder/CCBPEffectColorChannelOffset.m
index 442fefabf..824932e7c 100644
--- a/SpriteBuilder/ccBuilder/CCBPEffectColorChannelOffset.m
+++ b/SpriteBuilder/ccBuilder/CCBPEffectColorChannelOffset.m
@@ -8,7 +8,7 @@
#import "CCBPEffectColorChannelOffset.h"
#import "CCBDictionaryReader.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "EffectsUndoHelper.h"
@implementation CCBPEffectColorChannelOffset
@@ -22,9 +22,9 @@ @implementation CCBPEffectColorChannelOffset
- (id)serialize
{
- return @[@{@"name" : @"redOffsetWithPoint", @"type" : @"Point", @"value": [CCBDictionaryWriter serializePoint:self.redOffset] },
- @{@"name" : @"greenOffsetWithPoint", @"type" : @"Point", @"value": [CCBDictionaryWriter serializePoint:self.greenOffset] },
- @{@"name" : @"blueOffsetWithPoint", @"type" : @"Point", @"value": [CCBDictionaryWriter serializePoint:self.blueOffset] },
+ return @[@{@"name" : @"redOffsetWithPoint", @"type" : @"Point", @"value": [CCSBDictionaryWriter serializePoint:self.redOffset] },
+ @{@"name" : @"greenOffsetWithPoint", @"type" : @"Point", @"value": [CCSBDictionaryWriter serializePoint:self.greenOffset] },
+ @{@"name" : @"blueOffsetWithPoint", @"type" : @"Point", @"value": [CCSBDictionaryWriter serializePoint:self.blueOffset] },
];
}
diff --git a/SpriteBuilder/ccBuilder/CCBPEffectGlass.m b/SpriteBuilder/ccBuilder/CCBPEffectGlass.m
index 01fb41ece..9984a1a16 100644
--- a/SpriteBuilder/ccBuilder/CCBPEffectGlass.m
+++ b/SpriteBuilder/ccBuilder/CCBPEffectGlass.m
@@ -8,7 +8,7 @@
#import "CCBPEffectGlass.h"
#import "CCNode+NodeInfo.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "CCBDictionaryReader.h"
#import "AppDelegate.h"
#import "TexturePropertySetter.h"
@@ -43,7 +43,7 @@ -(id)serialize
SERIALIZE_PROPERTY(fresnelPower,Float),
@{@"name" : @"reflectionEnvironment", @"type" : @"NodeReference", @"value": @(self.reflectionEnvironment.UUID)},
@{@"name" : @"refractionEnvironment", @"type" : @"NodeReference", @"value": @(self.refractionEnvironment.UUID)},
- @{@"name" : @"normalMap", @"type" : @"SpriteFrame", @"value": [CCBDictionaryWriter serializeSpriteFrame:normalMapImageName sheet:normalMapSheet]}
+ @{@"name" : @"normalMap", @"type" : @"SpriteFrame", @"value": [CCSBDictionaryWriter serializeSpriteFrame:normalMapImageName sheet:normalMapSheet]}
];
}
diff --git a/SpriteBuilder/ccBuilder/CCBPEffectLighting.m b/SpriteBuilder/ccBuilder/CCBPEffectLighting.m
index e63306078..615ea3962 100644
--- a/SpriteBuilder/ccBuilder/CCBPEffectLighting.m
+++ b/SpriteBuilder/ccBuilder/CCBPEffectLighting.m
@@ -8,7 +8,7 @@
#import "CCBPEffectLighting.h"
#import "CCBDictionaryReader.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "EffectsManager.h"
#import "EffectsUndoHelper.h"
@@ -31,7 +31,7 @@ -(id)serialize
return @[SERIALIZE_PROPERTY(shininess,Float),
@{@"name" : @"groups", @"type" : @"TokenArray", @"value": groups },
- @{@"name" : @"specularColor", @"type" : @"Color4", @"value": [CCBDictionaryWriter serializeColor4:self.specularColor] },
+ @{@"name" : @"specularColor", @"type" : @"Color4", @"value": [CCSBDictionaryWriter serializeColor4:self.specularColor] },
];
}
diff --git a/SpriteBuilder/ccBuilder/CCBPEffectOutline.m b/SpriteBuilder/ccBuilder/CCBPEffectOutline.m
index 32eb1b1ee..9bd70bfb8 100644
--- a/SpriteBuilder/ccBuilder/CCBPEffectOutline.m
+++ b/SpriteBuilder/ccBuilder/CCBPEffectOutline.m
@@ -27,7 +27,7 @@ @implementation CCBPEffectOutline
-(id)serialize
{
return @[SERIALIZE_PROPERTY(outlineWidth,Integer),
- @{@"name" : @"outlineColor", @"type" : @"Color4", @"value": [CCBDictionaryWriter serializeColor4:self.outlineColor] },
+ @{@"name" : @"outlineColor", @"type" : @"Color4", @"value": [CCSBDictionaryWriter serializeColor4:self.outlineColor] },
];
}
diff --git a/SpriteBuilder/ccBuilder/CCBPEffectReflection.m b/SpriteBuilder/ccBuilder/CCBPEffectReflection.m
index 162a0609d..ef05ef3aa 100644
--- a/SpriteBuilder/ccBuilder/CCBPEffectReflection.m
+++ b/SpriteBuilder/ccBuilder/CCBPEffectReflection.m
@@ -10,11 +10,11 @@
#import "cocos2d.h"
#import "CCNode+NodeInfo.h"
#import "TexturePropertySetter.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "SceneGraph.h"
#import "EffectsUndoHelper.h"
-@interface CCBDictionaryWriter (Private)
+@interface CCSBDictionaryWriter (Private)
+ (id) serializeSpriteFrame:(NSString*)spriteFile sheet:(NSString*)spriteSheetFile;
@end
@@ -39,7 +39,7 @@ -(id)serialize
SERIALIZE_PROPERTY(fresnelPower,Float),
SERIALIZE_PROPERTY(shininess, Float),
@{@"name" : @"environment", @"type" : @"NodeReference", @"value": @(self.environment.UUID)},
- @{@"name" : @"normalMap", @"type" : @"SpriteFrame", @"value": [CCBDictionaryWriter serializeSpriteFrame:normalMapImageName sheet:normalMapSheet]}
+ @{@"name" : @"normalMap", @"type" : @"SpriteFrame", @"value": [CCSBDictionaryWriter serializeSpriteFrame:normalMapImageName sheet:normalMapSheet]}
];
}
diff --git a/SpriteBuilder/ccBuilder/CCBPEffectRefraction.m b/SpriteBuilder/ccBuilder/CCBPEffectRefraction.m
index 98692e5b4..9d28a8c7d 100644
--- a/SpriteBuilder/ccBuilder/CCBPEffectRefraction.m
+++ b/SpriteBuilder/ccBuilder/CCBPEffectRefraction.m
@@ -8,7 +8,7 @@
#import "CCBPEffectRefraction.h"
#import "CCNode+NodeInfo.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "CCBDictionaryReader.h"
#import "AppDelegate.h"
#import "TexturePropertySetter.h"
@@ -17,7 +17,7 @@
#import "EffectsUndoHelper.h"
#import "InspectorController.h"
-@interface CCBDictionaryWriter (Private)
+@interface CCSBDictionaryWriter (Private)
+ (id) serializeSpriteFrame:(NSString*)spriteFile sheet:(NSString*)spriteSheetFile;
@end
@@ -39,7 +39,7 @@ -(id)serialize
{
return @[SERIALIZE_PROPERTY(refraction,Float),
@{@"name" : @"environment", @"type" : @"NodeReference", @"value": @(self.environment.UUID)},
- @{@"name" : @"normalMap", @"type" : @"SpriteFrame", @"value": [CCBDictionaryWriter serializeSpriteFrame:normalMapImageName sheet:normalMapSheet]}
+ @{@"name" : @"normalMap", @"type" : @"SpriteFrame", @"value": [CCSBDictionaryWriter serializeSpriteFrame:normalMapImageName sheet:normalMapSheet]}
];
}
-(void)deserialize:(NSArray *)properties
diff --git a/SpriteBuilder/ccBuilder/CCNode+NodeInfo.m b/SpriteBuilder/ccBuilder/CCNode+NodeInfo.m
index 5e8d8840c..7b4c59a0e 100644
--- a/SpriteBuilder/ccBuilder/CCNode+NodeInfo.m
+++ b/SpriteBuilder/ccBuilder/CCNode+NodeInfo.m
@@ -33,7 +33,7 @@
#import "SequencerSequence.h"
#import "PositionPropertySetter.h"
#import "TexturePropertySetter.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "CCBDictionaryReader.h"
#import "CCBDocument.h"
#import "CustomPropSetting.h"
@@ -362,7 +362,7 @@ - (id) valueForProperty:(NSString*)name atTime:(float)time sequenceId:(int)seqId
else if (type == kCCBKeyframeTypeColor3)
{
CCColor* colorValue = [self valueForKey:name];
- return [CCBDictionaryWriter serializeColor4:colorValue];
+ return [CCSBDictionaryWriter serializeColor4:colorValue];
}
else if (type == kCCBKeyframeTypeSpriteFrame)
{
diff --git a/SpriteBuilder/ccBuilder/CCBDictionaryWriter.h b/SpriteBuilder/ccBuilder/CCSBDictionaryWriter.h
similarity index 97%
rename from SpriteBuilder/ccBuilder/CCBDictionaryWriter.h
rename to SpriteBuilder/ccBuilder/CCSBDictionaryWriter.h
index 6ad9b1703..9a742bb54 100644
--- a/SpriteBuilder/ccBuilder/CCBDictionaryWriter.h
+++ b/SpriteBuilder/ccBuilder/CCSBDictionaryWriter.h
@@ -27,7 +27,7 @@
#define kCCBUseRegularFile @"Use regular file"
-@interface CCBDictionaryWriter : NSObject
+@interface CCSBDictionaryWriter : NSObject
+ (id)serializePropertyOfNode:(CCNode *)node propInfo:(NSMutableDictionary *)propInfo excludeProps:(NSArray *)excludeProps;
diff --git a/SpriteBuilder/ccBuilder/CCBDictionaryWriter.m b/SpriteBuilder/ccBuilder/CCSBDictionaryWriter.m
similarity index 90%
rename from SpriteBuilder/ccBuilder/CCBDictionaryWriter.m
rename to SpriteBuilder/ccBuilder/CCSBDictionaryWriter.m
index 30dc32529..fbd95f3be 100644
--- a/SpriteBuilder/ccBuilder/CCBDictionaryWriter.m
+++ b/SpriteBuilder/ccBuilder/CCSBDictionaryWriter.m
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "NodeInfo.h"
#import "PlugInNode.h"
#import "TexturePropertySetter.h"
@@ -37,7 +37,7 @@ @protocol CCBWriterInternal_UndeclaredSelectors
- (NSArray*) ccbExcludePropertiesForSave;
@end
-@implementation CCBDictionaryWriter
+@implementation CCSBDictionaryWriter
@@ -202,26 +202,26 @@ + (id)serializePropertyOfNode:(CCNode *)node propInfo:(NSMutableDictionary *)pro
{
NSPoint pt = [PositionPropertySetter positionForNode:node prop:name];
CCPositionType aType = [PositionPropertySetter positionTypeForNode:node prop:name];
- serializedValue = [CCBDictionaryWriter serializePosition:pt type:aType];
+ serializedValue = [CCSBDictionaryWriter serializePosition:pt type:aType];
}
else if([type isEqualToString:@"Point"]
|| [type isEqualToString:@"PointLock"])
{
CGPoint pt = NSPointToCGPoint( [[node valueForKey:name] pointValue] );
- serializedValue = [CCBDictionaryWriter serializePoint:pt];
+ serializedValue = [CCSBDictionaryWriter serializePoint:pt];
}
else if ([type isEqualToString:@"Size"])
{
//CGSize size = NSSizeToCGSize( [[node valueForKey:name] sizeValue] );
NSSize size = [PositionPropertySetter sizeForNode:node prop:name];
CCSizeType aType = [PositionPropertySetter sizeTypeForNode:node prop:name];
- serializedValue = [CCBDictionaryWriter serializeSize:size type:aType];
+ serializedValue = [CCSBDictionaryWriter serializeSize:size type:aType];
}
else if ([type isEqualToString:@"FloatXY"])
{
float x = [[node valueForKey:[NSString stringWithFormat:@"%@X",name]] floatValue];
float y = [[node valueForKey:[NSString stringWithFormat:@"%@Y",name]] floatValue];
- serializedValue = [CCBDictionaryWriter serializePoint:ccp(x, y)];
+ serializedValue = [CCSBDictionaryWriter serializePoint:ccp(x, y)];
}
else if ([type isEqualToString:@"ScaleLock"])
{
@@ -230,63 +230,63 @@ + (id)serializePropertyOfNode:(CCNode *)node propInfo:(NSMutableDictionary *)pro
BOOL lock = [extraProps[[NSString stringWithFormat:@"%@Lock", name]] boolValue];
int scaleType = [PositionPropertySetter scaledFloatTypeForNode:node prop:name];
- serializedValue = [CCBDictionaryWriter serializePoint:ccp(x, y) lock:lock type:scaleType];
+ serializedValue = [CCSBDictionaryWriter serializePoint:ccp(x, y) lock:lock type:scaleType];
}
else if ([type isEqualToString:@"Float"]
|| [type isEqualToString:@"Degrees"])
{
float f = [[node valueForKey:name] floatValue];
- serializedValue = [CCBDictionaryWriter serializeFloat:f];
+ serializedValue = [CCSBDictionaryWriter serializeFloat:f];
}
else if([type isEqualToString:@"FloatCheck"] || [type isEqualToString:@"EnabledFloat"])
{
float f = [[node valueForKey:name] floatValue];
BOOL enabled = [[node valueForKey:[NSString stringWithFormat:@"%@Enabled",name]] boolValue];
- serializedValue = @[[CCBDictionaryWriter serializeFloat:f],
- [CCBDictionaryWriter serializeBool:enabled]];
+ serializedValue = @[[CCSBDictionaryWriter serializeFloat:f],
+ [CCSBDictionaryWriter serializeBool:enabled]];
}
else if ([type isEqualToString:@"FloatScale"])
{
float f = [PositionPropertySetter floatScaleForNode:node prop:name];
int aType = [PositionPropertySetter floatScaleTypeForNode:node prop:name];
- serializedValue = [CCBDictionaryWriter serializeFloatScale:f type:aType];
+ serializedValue = [CCSBDictionaryWriter serializeFloatScale:f type:aType];
}
else if ([type isEqualToString:@"FloatVar"])
{
float x = [[node valueForKey:name] floatValue];
float y = [[node valueForKey:[NSString stringWithFormat:@"%@Var",name]] floatValue];
- serializedValue = [CCBDictionaryWriter serializePoint:ccp(x, y)];
+ serializedValue = [CCSBDictionaryWriter serializePoint:ccp(x, y)];
}
else if ([type isEqualToString:@"Integer"]
|| [type isEqualToString:@"IntegerLabeled"]
|| [type isEqualToString:@"Byte"])
{
int d = [[node valueForKey:name] intValue];
- serializedValue = [CCBDictionaryWriter serializeInt:d];
+ serializedValue = [CCSBDictionaryWriter serializeInt:d];
}
else if ([type isEqualToString:@"Check"])
{
BOOL check = [[node valueForKey:name] boolValue];
- serializedValue = [CCBDictionaryWriter serializeBool:check];
+ serializedValue = [CCSBDictionaryWriter serializeBool:check];
}
else if ([type isEqualToString:@"Flip"])
{
BOOL x = [[node valueForKey:[NSString stringWithFormat:@"%@X",name]] boolValue];
BOOL y = [[node valueForKey:[NSString stringWithFormat:@"%@Y",name]] boolValue];
- serializedValue = [CCBDictionaryWriter serializeBoolPairX:x Y:y];
+ serializedValue = [CCSBDictionaryWriter serializeBoolPairX:x Y:y];
}
else if ([type isEqualToString:@"SpriteFrame"])
{
NSString* spriteFile = extraProps[name];
NSString* spriteSheetFile = extraProps[[NSString stringWithFormat:@"%@Sheet", name]];
- serializedValue = [CCBDictionaryWriter serializeSpriteFrame:spriteFile sheet:spriteSheetFile];
+ serializedValue = [CCSBDictionaryWriter serializeSpriteFrame:spriteFile sheet:spriteSheetFile];
}
else if ([type isEqualToString:@"Animation"])
{
NSString* animation = extraProps[name];
NSString* animationFile = extraProps[[NSString stringWithFormat:@"%@Animation", name]];
- serializedValue = [CCBDictionaryWriter serializeAnimation:animation file:animationFile];
+ serializedValue = [CCSBDictionaryWriter serializeAnimation:animation file:animationFile];
}
else if ([type isEqualToString:@"Texture"])
{
@@ -298,12 +298,12 @@ + (id)serializePropertyOfNode:(CCNode *)node propInfo:(NSMutableDictionary *)pro
else if ([type isEqualToString:@"Color3"])
{
CCColor* colorValue = [node valueForKey:name];
- serializedValue = [CCBDictionaryWriter serializeColor4:colorValue];
+ serializedValue = [CCSBDictionaryWriter serializeColor4:colorValue];
}
else if ([type isEqualToString:@"Color4"])
{
CCColor* colorValue = [node valueForKey:name];
- serializedValue = [CCBDictionaryWriter serializeColor4:colorValue];
+ serializedValue = [CCSBDictionaryWriter serializeColor4:colorValue];
}
else if ([type isEqualToString:@"Color4FVar"])
{
@@ -311,13 +311,13 @@ + (id)serializePropertyOfNode:(CCNode *)node propInfo:(NSMutableDictionary *)pro
CCColor* cValue = [node valueForKey:name];
CCColor* cVarValue = [node valueForKey:nameVar];
- serializedValue = @[[CCBDictionaryWriter serializeColor4:cValue],
- [CCBDictionaryWriter serializeColor4:cVarValue]];
+ serializedValue = @[[CCSBDictionaryWriter serializeColor4:cValue],
+ [CCSBDictionaryWriter serializeColor4:cVarValue]];
}
else if ([type isEqualToString:@"Blendmode"])
{
CCBlendMode *blendMode = [node valueForKey:name];;
- serializedValue = [CCBDictionaryWriter serializeBlendMode:blendMode];
+ serializedValue = [CCSBDictionaryWriter serializeBlendMode:blendMode];
}
else if ([type isEqualToString:@"FntFile"])
{
@@ -446,7 +446,7 @@ + (NSMutableDictionary*)serializeNode:(CCNode *)node
id serializedValue = NULL;
- serializedValue = [CCBDictionaryWriter serializePropertyOfNode:node propInfo:propInfo excludeProps:excludeProps];
+ serializedValue = [CCSBDictionaryWriter serializePropertyOfNode:node propInfo:propInfo excludeProps:excludeProps];
if (!serializedValue)
continue;
@@ -488,7 +488,7 @@ + (NSMutableDictionary*)serializeNode:(CCNode *)node
{
continue;
}
- NSDictionary * serializedChild = [CCBDictionaryWriter serializeNode:childNode];
+ NSDictionary * serializedChild = [CCSBDictionaryWriter serializeNode:childNode];
[children addObject:serializedChild];
}
}
diff --git a/SpriteBuilder/ccBuilder/InspectorColor3.m b/SpriteBuilder/ccBuilder/InspectorColor3.m
index 8fcf5cb0d..9fc83cf5b 100644
--- a/SpriteBuilder/ccBuilder/InspectorColor3.m
+++ b/SpriteBuilder/ccBuilder/InspectorColor3.m
@@ -23,7 +23,7 @@
*/
#import "InspectorColor3.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
@implementation InspectorColor3
@@ -36,7 +36,7 @@ - (void) setColor:(NSColor *)color
CCColor* colorValue = [CCColor colorWithRed:r green:g blue:b alpha:1];
[self setPropertyForSelection:colorValue];
- [self updateAnimateablePropertyValue: [CCBDictionaryWriter serializeColor4:colorValue]];
+ [self updateAnimateablePropertyValue: [CCSBDictionaryWriter serializeColor4:colorValue]];
}
diff --git a/SpriteBuilder/ccBuilder/InspectorColor4.m b/SpriteBuilder/ccBuilder/InspectorColor4.m
index 5fdd99f12..332130e2a 100644
--- a/SpriteBuilder/ccBuilder/InspectorColor4.m
+++ b/SpriteBuilder/ccBuilder/InspectorColor4.m
@@ -23,7 +23,7 @@
*/
#import "InspectorColor4.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
@implementation InspectorColor4
@@ -36,7 +36,7 @@ - (void) setColor:(NSColor *)color
CCColor* colorValue = [CCColor colorWithRed:r green:g blue:b alpha:a];
[self setPropertyForSelection:colorValue];
- [self updateAnimateablePropertyValue: [CCBDictionaryWriter serializeColor4:colorValue]];
+ [self updateAnimateablePropertyValue: [CCSBDictionaryWriter serializeColor4:colorValue]];
}
diff --git a/SpriteBuilder/ccBuilder/InspectorSpriteFrame.m b/SpriteBuilder/ccBuilder/InspectorSpriteFrame.m
index 944d52d06..595a787b0 100644
--- a/SpriteBuilder/ccBuilder/InspectorSpriteFrame.m
+++ b/SpriteBuilder/ccBuilder/InspectorSpriteFrame.m
@@ -28,7 +28,7 @@
#import "CocosScene.h"
#import "AppDelegate.h"
#import "TexturePropertySetter.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "CCBSpriteSheetParser.h"
#import "ResourceManagerUtil.h"
#import "ResourceManager.h"
diff --git a/SpriteBuilder/ccBuilder/PropertyInspectorTemplate.m b/SpriteBuilder/ccBuilder/PropertyInspectorTemplate.m
index add9b328c..849378f0e 100644
--- a/SpriteBuilder/ccBuilder/PropertyInspectorTemplate.m
+++ b/SpriteBuilder/ccBuilder/PropertyInspectorTemplate.m
@@ -10,7 +10,7 @@
#import "CCNode+NodeInfo.h"
#import "PlugInNode.h"
#import "HashValue.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "CCBDictionaryReader.h"
@implementation PropertyInspectorTemplate
@@ -43,7 +43,7 @@ - (id) initWithNode:(CCNode*)node name:(NSString*)n bgColor:(NSColor*)c
{
if ([[propInfo objectForKey:@"saveInTemplate"] boolValue])
{
- id serializedValue = [CCBDictionaryWriter serializePropertyOfNode:node propInfo:propInfo excludeProps:NULL];
+ id serializedValue = [CCSBDictionaryWriter serializePropertyOfNode:node propInfo:propInfo excludeProps:NULL];
NSMutableDictionary* serProp = [NSMutableDictionary dictionary];
[serProp setObject:serializedValue forKey:@"value"];
diff --git a/SpriteBuilder/ccBuilder/SequencerHandler.m b/SpriteBuilder/ccBuilder/SequencerHandler.m
index 9c9e1f1e1..81e8506de 100644
--- a/SpriteBuilder/ccBuilder/SequencerHandler.m
+++ b/SpriteBuilder/ccBuilder/SequencerHandler.m
@@ -28,7 +28,7 @@
#import "NodeInfo.h"
#import "CCNode+NodeInfo.h"
#import "PlugInNode.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "CCBDictionaryReader.h"
#import "SequencerExpandBtnCell.h"
#import "SequencerStructureCell.h"
@@ -564,7 +564,7 @@ - (NSData *)serializeDraggedItemsForClipboard:(NSArray *)items
NSMutableArray *array = [NSMutableArray array];
for (CCNode *node in items)
{
- NSMutableDictionary *clipDict = [CCBDictionaryWriter serializeNode:node];
+ NSMutableDictionary *clipDict = [CCSBDictionaryWriter serializeNode:node];
[clipDict setObject:@((long long) node) forKey:ORIGINAL_NODE_POINTER_KEY];
[array addObject:clipDict];
diff --git a/SpriteBuilder/ccBuilder/SequencerUtil.m b/SpriteBuilder/ccBuilder/SequencerUtil.m
index 42eb5605f..96ffca4f4 100644
--- a/SpriteBuilder/ccBuilder/SequencerUtil.m
+++ b/SpriteBuilder/ccBuilder/SequencerUtil.m
@@ -33,7 +33,7 @@
#import "SequencerKeyframe.h"
#import "SequencerKeyframeEasing.h"
#import "SequencerNodeProperty.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "RMSpriteFrame.h"
#import "ResourceTypes.h"
#import "RMResource.h"
diff --git a/SpriteBuilder/ccBuilder/TexturePropertySetter.m b/SpriteBuilder/ccBuilder/TexturePropertySetter.m
index 0579c8630..c28174a96 100644
--- a/SpriteBuilder/ccBuilder/TexturePropertySetter.m
+++ b/SpriteBuilder/ccBuilder/TexturePropertySetter.m
@@ -25,7 +25,7 @@
#import "TexturePropertySetter.h"
#import "AppDelegate.h"
#import "CCBGlobals.h"
-#import "CCBDictionaryWriter.h"
+#import "CCSBDictionaryWriter.h"
#import "ResourceManager.h"
#import "CCBFileUtil.h"
#import "CCNode+NodeInfo.h"
diff --git a/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERSetup.m b/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERSetup.m
index 167767aee..083d532ef 100644
--- a/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERSetup.m
+++ b/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERSetup.m
@@ -34,7 +34,7 @@ - (void)setupCommon
-(CCScene *)createFirstScene
{
// This method is responsible for creating and returning the initial scene when the app starts up.
- return [CCBReader loadAsScene:@"MainScene"];
+ return [CCSBReader loadAsScene:@"MainScene"];
}
#if __CC_PLATFORM_IOS
@@ -76,4 +76,4 @@ -(void)setupApplication
#endif
-@end
\ No newline at end of file
+@end