Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add destroyCocosStudio()

This commit is contained in:
pipu 2015-03-30 16:46:33 +08:00
parent d437ce3e59
commit 6f20da4444
54 changed files with 137 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
View File

@ -218,6 +218,36 @@ void CSLoader::purge()
{ {
} }
void CSLoader::destroyCocosStudio()
{
NodeReader::destroyInstance();
SingleNodeReader::destroyInstance();
SpriteReader::destroyInstance();
ParticleReader::destroyInstance();
ButtonReader::destroyInstance();
CheckBoxReader::destroyInstance();
ImageViewReader::destroyInstance();
TextBMFontReader::destroyInstance();
TextReader::destroyInstance();
TextFieldReader::destroyInstance();
TextAtlasReader::destroyInstance();
LoadingBarReader::destroyInstance();
SliderReader::destroyInstance();
LayoutReader::destroyInstance();
ScrollViewReader::destroyInstance();
PageViewReader::destroyInstance();
ListViewReader::destroyInstance();
ArmatureNodeReader::destroyInstance();
Node3DReader::destroyInstance();
Sprite3DReader::destroyInstance();
UserCameraReader::destroyInstance();
Particle3DReader::destroyInstance();
destroyInstance();
}
void CSLoader::init() void CSLoader::init()
{ {
using namespace std::placeholders; using namespace std::placeholders;

2
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.h
View File

@ -74,6 +74,8 @@ public:
CSLoader(); CSLoader();
void purge(); void purge();
static void destroyCocosStudio();
void init(); void init();
static cocos2d::Node* createNode(const std::string& filename); static cocos2d::Node* createNode(const std::string& filename);

4
cocos/editor-support/cocostudio/FlatBuffersSerialize.cpp
View File

@ -111,7 +111,7 @@ FlatBuffersSerialize::FlatBuffersSerialize()
FlatBuffersSerialize::~FlatBuffersSerialize() FlatBuffersSerialize::~FlatBuffersSerialize()
{ {
purge();
} }
FlatBuffersSerialize* FlatBuffersSerialize::getInstance() FlatBuffersSerialize* FlatBuffersSerialize::getInstance()
@ -124,7 +124,7 @@ FlatBuffersSerialize* FlatBuffersSerialize::getInstance()
return _instanceFlatBuffersSerialize; return _instanceFlatBuffersSerialize;
} }
void FlatBuffersSerialize::purge() void FlatBuffersSerialize::destroyInstance()
{ {
CC_SAFE_DELETE(_instanceFlatBuffersSerialize); CC_SAFE_DELETE(_instanceFlatBuffersSerialize);

2
cocos/editor-support/cocostudio/FlatBuffersSerialize.h
View File

@ -91,7 +91,7 @@ class CC_STUDIO_DLL FlatBuffersSerialize
public: public:
static FlatBuffersSerialize* getInstance(); static FlatBuffersSerialize* getInstance();
static void purge(); static void destroyInstance();
FlatBuffersSerialize(); FlatBuffersSerialize();
~FlatBuffersSerialize(); ~FlatBuffersSerialize();

5
cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp
View File

@ -34,6 +34,11 @@ ArmatureNodeReader* ArmatureNodeReader::getInstance()
return _instanceArmatureNodeReader; return _instanceArmatureNodeReader;
} }
void ArmatureNodeReader::destroyInstance()
{
CC_SAFE_DELETE(_instanceArmatureNodeReader);
}
Offset<Table> ArmatureNodeReader::createOptionsWithFlatBuffers(const tinyxml2::XMLElement *objectData, Offset<Table> ArmatureNodeReader::createOptionsWithFlatBuffers(const tinyxml2::XMLElement *objectData,
flatbuffers::FlatBufferBuilder *builder) flatbuffers::FlatBufferBuilder *builder)
{ {

2
cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.h
View File

@ -50,7 +50,7 @@ public:
~ArmatureNodeReader(); ~ArmatureNodeReader();
static ArmatureNodeReader* getInstance(); static ArmatureNodeReader* getInstance();
static void purge(); static void destroyInstance();
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData, flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder) override; flatbuffers::FlatBufferBuilder* builder) override;

2
cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
View File

@ -59,7 +59,7 @@ namespace cocostudio
return instanceButtonReader; return instanceButtonReader;
} }
void ButtonReader::purge() void ButtonReader::destroyInstance()
{ {
CC_SAFE_DELETE(instanceButtonReader); CC_SAFE_DELETE(instanceButtonReader);
} }

2
cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h
View File

@ -39,7 +39,7 @@ namespace cocostudio
virtual ~ButtonReader(); virtual ~ButtonReader();
static ButtonReader* getInstance(); static ButtonReader* getInstance();
static void purge(); static void destroyInstance();
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget,
const rapidjson::Value& options); const rapidjson::Value& options);

5
cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.cpp
View File

@ -45,6 +45,11 @@ namespace cocostudio
return instanceCheckBoxReader; return instanceCheckBoxReader;
} }
void CheckBoxReader::destroyInstance()
{
CC_SAFE_DELETE(instanceCheckBoxReader);
}
void CheckBoxReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode) void CheckBoxReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode)
{ {

2
cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h
View File

@ -39,7 +39,7 @@ namespace cocostudio
virtual ~CheckBoxReader(); virtual ~CheckBoxReader();
static CheckBoxReader* getInstance(); static CheckBoxReader* getInstance();
static void purge(); static void destroyInstance();
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options); virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options);
virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode); virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode);

2
cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.cpp
View File

@ -58,7 +58,7 @@ namespace cocostudio
return _instanceComAudioReader; return _instanceComAudioReader;
} }
void ComAudioReader::purge() void ComAudioReader::destroyInstance()
{ {
CC_SAFE_DELETE(_instanceComAudioReader); CC_SAFE_DELETE(_instanceComAudioReader);
} }

2
cocos/editor-support/cocostudio/WidgetReader/ComAudioReader/ComAudioReader.h
View File

@ -40,7 +40,7 @@ namespace cocostudio
~ComAudioReader(); ~ComAudioReader();
static ComAudioReader* getInstance(); static ComAudioReader* getInstance();
static void purge(); static void destroyInstance();
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData, flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder); flatbuffers::FlatBufferBuilder* builder);

5
cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
View File

@ -49,6 +49,11 @@ namespace cocostudio
return instanceImageViewReader; return instanceImageViewReader;
} }
void ImageViewReader::destroyInstance()
{
CC_SAFE_DELETE(instanceImageViewReader);
}
void ImageViewReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode) void ImageViewReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode)
{ {
WidgetReader::setPropsFromBinary(widget, cocoLoader, cocoNode); WidgetReader::setPropsFromBinary(widget, cocoLoader, cocoNode);

2
cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h
View File

@ -41,7 +41,7 @@ namespace cocostudio
virtual ~ImageViewReader(); virtual ~ImageViewReader();
static ImageViewReader* getInstance(); static ImageViewReader* getInstance();
static void purge(); static void destroyInstance();
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options); virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options);
virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode); virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode);

5
cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp
View File

@ -64,6 +64,11 @@ namespace cocostudio
return instanceLayoutReader; return instanceLayoutReader;
} }
void LayoutReader::destroyInstance()
{
CC_SAFE_DELETE(instanceLayoutReader);
}
void LayoutReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode) void LayoutReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode)
{ {
WidgetReader::setPropsFromBinary(widget, cocoLoader, cocoNode); WidgetReader::setPropsFromBinary(widget, cocoLoader, cocoNode);

2
cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h
View File

@ -40,7 +40,7 @@ namespace cocostudio
virtual ~LayoutReader(); virtual ~LayoutReader();
static LayoutReader* getInstance(); static LayoutReader* getInstance();
static void purge(); static void destroyInstance();
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options); virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options);
virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ; virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ;

5
cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.cpp
View File

@ -42,6 +42,11 @@ namespace cocostudio
return instanceListViewReader; return instanceListViewReader;
} }
void ListViewReader::destroyInstance()
{
CC_SAFE_DELETE(instanceListViewReader);
}
void ListViewReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode* cocoNode) void ListViewReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode* cocoNode)
{ {
ScrollViewReader::setPropsFromBinary(widget, cocoLoader, cocoNode); ScrollViewReader::setPropsFromBinary(widget, cocoLoader, cocoNode);

2
cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h
View File

@ -39,7 +39,7 @@ namespace cocostudio
virtual ~ListViewReader(); virtual ~ListViewReader();
static ListViewReader* getInstance(); static ListViewReader* getInstance();
static void purge(); static void destroyInstance();
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options); virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options);
virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ; virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ;

5
cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
View File

@ -48,6 +48,11 @@ namespace cocostudio
return instanceLoadingBar; return instanceLoadingBar;
} }
void LoadingBarReader::destroyInstance()
{
CC_SAFE_DELETE(instanceLoadingBar);
}
void LoadingBarReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode) void LoadingBarReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode)
{ {
WidgetReader::setPropsFromBinary(widget, cocoLoader, cocoNode); WidgetReader::setPropsFromBinary(widget, cocoLoader, cocoNode);

2
cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h
View File

@ -39,7 +39,7 @@ namespace cocostudio
virtual ~LoadingBarReader(); virtual ~LoadingBarReader();
static LoadingBarReader* getInstance(); static LoadingBarReader* getInstance();
static void purge(); static void destroyInstance();
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options); virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options);
virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ; virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ;

2
cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp
View File

@ -62,7 +62,7 @@ namespace cocostudio
return _instanceNode3DReader; return _instanceNode3DReader;
} }
void Node3DReader::purge() void Node3DReader::destroyInstance()
{ {
CC_SAFE_DELETE(_instanceNode3DReader); CC_SAFE_DELETE(_instanceNode3DReader);
} }

2
cocos/editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.h
View File

@ -46,7 +46,7 @@ namespace cocostudio
~Node3DReader(); ~Node3DReader();
static Node3DReader* getInstance(); static Node3DReader* getInstance();
static void purge(); static void destroyInstance();
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData, flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder); flatbuffers::FlatBufferBuilder* builder);

2
cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp
View File

@ -79,7 +79,7 @@ namespace cocostudio
return _instanceNodeReader; return _instanceNodeReader;
} }
void NodeReader::purge() void NodeReader::destroyInstance()
{ {
CC_SAFE_DELETE(_instanceNodeReader); CC_SAFE_DELETE(_instanceNodeReader);
} }

2
cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.h
View File

@ -41,7 +41,7 @@ namespace cocostudio
~NodeReader(); ~NodeReader();
static NodeReader* getInstance(); static NodeReader* getInstance();
static void purge(); static void destroyInstance();
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData, flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder); flatbuffers::FlatBufferBuilder* builder);

5
cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp
View File

@ -40,6 +40,11 @@ namespace cocostudio
return instancePageViewReader; return instancePageViewReader;
} }
void PageViewReader::destroyInstance()
{
CC_SAFE_DELETE(instancePageViewReader);
}
void PageViewReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode) void PageViewReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode)
{ {
LayoutReader::setPropsFromBinary(widget, cocoLoader, cocoNode); LayoutReader::setPropsFromBinary(widget, cocoLoader, cocoNode);

2
cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h
View File

@ -39,7 +39,7 @@ namespace cocostudio
virtual ~PageViewReader(); virtual ~PageViewReader();
static PageViewReader* getInstance(); static PageViewReader* getInstance();
static void purge(); static void destroyInstance();
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options); virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options);
virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* cocoNode) ; virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* cocoNode) ;

2
cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.cpp
View File

@ -63,7 +63,7 @@ namespace cocostudio
return _instanceParticle3DReader; return _instanceParticle3DReader;
} }
void Particle3DReader::purge() void Particle3DReader::destroyInstance()
{ {
CC_SAFE_DELETE(_instanceParticle3DReader); CC_SAFE_DELETE(_instanceParticle3DReader);
} }

2
cocos/editor-support/cocostudio/WidgetReader/Particle3DReader/Particle3DReader.h
View File

@ -41,7 +41,7 @@ namespace cocostudio
~Particle3DReader(); ~Particle3DReader();
static Particle3DReader* getInstance(); static Particle3DReader* getInstance();
static void purge(); static void destroyInstance();
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData, flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder); flatbuffers::FlatBufferBuilder* builder);

2
cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.cpp
View File

@ -59,7 +59,7 @@ namespace cocostudio
return _instanceParticleReader; return _instanceParticleReader;
} }
void ParticleReader::purge() void ParticleReader::destroyInstance()
{ {
CC_SAFE_DELETE(_instanceParticleReader); CC_SAFE_DELETE(_instanceParticleReader);
} }

2
cocos/editor-support/cocostudio/WidgetReader/ParticleReader/ParticleReader.h
View File

@ -42,7 +42,7 @@ namespace cocostudio
~ParticleReader(); ~ParticleReader();
static ParticleReader* getInstance(); static ParticleReader* getInstance();
static void purge(); static void destroyInstance();
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData, flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder); flatbuffers::FlatBufferBuilder* builder);

2
cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.cpp
View File

@ -57,7 +57,7 @@ namespace cocostudio
return _instanceProjectNodeReader; return _instanceProjectNodeReader;
} }
void ProjectNodeReader::purge() void ProjectNodeReader::destroyInstance()
{ {
CC_SAFE_DELETE(_instanceProjectNodeReader); CC_SAFE_DELETE(_instanceProjectNodeReader);
} }

2
cocos/editor-support/cocostudio/WidgetReader/ProjectNodeReader/ProjectNodeReader.h
View File

@ -40,7 +40,7 @@ namespace cocostudio
~ProjectNodeReader(); ~ProjectNodeReader();
static ProjectNodeReader* getInstance(); static ProjectNodeReader* getInstance();
static void purge(); static void destroyInstance();
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData, flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder); flatbuffers::FlatBufferBuilder* builder);

5
cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.cpp
View File

@ -44,6 +44,11 @@ namespace cocostudio
return instanceScrollViewReader; return instanceScrollViewReader;
} }
void ScrollViewReader::destroyInstance()
{
CC_SAFE_DELETE(instanceScrollViewReader);
}
void ScrollViewReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode* cocoNode) void ScrollViewReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode* cocoNode)
{ {
//TODO: need to refactor... //TODO: need to refactor...

2
cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h
View File

@ -39,7 +39,7 @@ namespace cocostudio
virtual ~ScrollViewReader(); virtual ~ScrollViewReader();
static ScrollViewReader* getInstance(); static ScrollViewReader* getInstance();
static void purge(); static void destroyInstance();
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options); virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options);
virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ; virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ;

2
cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.cpp
View File

@ -62,7 +62,7 @@ namespace cocostudio
return _instanceSingleNodeReader; return _instanceSingleNodeReader;
} }
void SingleNodeReader::purge() void SingleNodeReader::destroyInstance()
{ {
CC_SAFE_DELETE(_instanceSingleNodeReader); CC_SAFE_DELETE(_instanceSingleNodeReader);
} }

2
cocos/editor-support/cocostudio/WidgetReader/SingleNodeReader/SingleNodeReader.h
View File

@ -42,7 +42,7 @@ namespace cocostudio
~SingleNodeReader(); ~SingleNodeReader();
static SingleNodeReader* getInstance(); static SingleNodeReader* getInstance();
static void purge(); static void destroyInstance();
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData, flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder); flatbuffers::FlatBufferBuilder* builder);

5
cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp
View File

@ -48,6 +48,11 @@ namespace cocostudio
return instanceSliderReader; return instanceSliderReader;
} }
void SliderReader::destroyInstance()
{
CC_SAFE_DELETE(instanceSliderReader);
}
void SliderReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode* cocoNode) void SliderReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode* cocoNode)
{ {
this->beginSetBasicProperties(widget); this->beginSetBasicProperties(widget);

2
cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h
View File

@ -39,7 +39,7 @@ namespace cocostudio
virtual ~SliderReader(); virtual ~SliderReader();
static SliderReader* getInstance(); static SliderReader* getInstance();
static void purge(); static void destroyInstance();
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options); virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options);
virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ; virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ;

2
cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp
View File

@ -62,7 +62,7 @@ namespace cocostudio
return _instanceSprite3DReader; return _instanceSprite3DReader;
} }
void Sprite3DReader::purge() void Sprite3DReader::destroyInstance()
{ {
CC_SAFE_DELETE(_instanceSprite3DReader); CC_SAFE_DELETE(_instanceSprite3DReader);
} }

2
cocos/editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.h
View File

@ -46,7 +46,7 @@ namespace cocostudio
~Sprite3DReader(); ~Sprite3DReader();
static Sprite3DReader* getInstance(); static Sprite3DReader* getInstance();
static void purge(); static void destroyInstance();
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData, flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder); flatbuffers::FlatBufferBuilder* builder);

2
cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.cpp
View File

@ -60,7 +60,7 @@ namespace cocostudio
return _instanceSpriteReader; return _instanceSpriteReader;
} }
void SpriteReader::purge() void SpriteReader::destroyInstance()
{ {
CC_SAFE_DELETE(_instanceSpriteReader); CC_SAFE_DELETE(_instanceSpriteReader);
} }

2
cocos/editor-support/cocostudio/WidgetReader/SpriteReader/SpriteReader.h
View File

@ -42,7 +42,7 @@ namespace cocostudio
~SpriteReader(); ~SpriteReader();
static SpriteReader* getInstance(); static SpriteReader* getInstance();
static void purge(); static void destroyInstance();
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData, flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder); flatbuffers::FlatBufferBuilder* builder);

5
cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp
View File

@ -45,6 +45,11 @@ namespace cocostudio
return instanceTextAtalsReader; return instanceTextAtalsReader;
} }
void TextAtlasReader::destroyInstance()
{
CC_SAFE_DELETE(instanceTextAtalsReader);
}
void TextAtlasReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode) void TextAtlasReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode)
{ {
this->beginSetBasicProperties(widget); this->beginSetBasicProperties(widget);

1
cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h
View File

@ -39,6 +39,7 @@ namespace cocostudio
virtual ~TextAtlasReader(); virtual ~TextAtlasReader();
static TextAtlasReader* getInstance(); static TextAtlasReader* getInstance();
static void destroyInstance();
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options); virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options);
virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ; virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ;

5
cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp
View File

@ -42,6 +42,11 @@ namespace cocostudio
return instanceTextBMFontReader; return instanceTextBMFontReader;
} }
void TextBMFontReader::destroyInstance()
{
CC_SAFE_DELETE(instanceTextBMFontReader);
}
void TextBMFontReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode) void TextBMFontReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode)
{ {
this->beginSetBasicProperties(widget); this->beginSetBasicProperties(widget);

2
cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h
View File

@ -39,7 +39,7 @@ namespace cocostudio
virtual ~TextBMFontReader(); virtual ~TextBMFontReader();
static TextBMFontReader* getInstance(); static TextBMFontReader* getInstance();
static void purge(); static void destroyInstance();
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options); virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options);
virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ; virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ;

5
cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.cpp
View File

@ -49,6 +49,11 @@ namespace cocostudio
return instanceTextFieldReader; return instanceTextFieldReader;
} }
void TextFieldReader::destroyInstance()
{
CC_SAFE_DELETE(instanceTextFieldReader);
}
void TextFieldReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode* cocoNode) void TextFieldReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode* cocoNode)
{ {
this->beginSetBasicProperties(widget); this->beginSetBasicProperties(widget);

2
cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h
View File

@ -39,7 +39,7 @@ namespace cocostudio
virtual ~TextFieldReader(); virtual ~TextFieldReader();
static TextFieldReader* getInstance(); static TextFieldReader* getInstance();
static void purge(); static void destroyInstance();
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options); virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options);
virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ; virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode) ;

5
cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
View File

@ -47,6 +47,11 @@ namespace cocostudio
return instanceTextReader; return instanceTextReader;
} }
void TextReader::destroyInstance()
{
CC_SAFE_DELETE(instanceTextReader);
}
void TextReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode) void TextReader::setPropsFromBinary(cocos2d::ui::Widget *widget, CocoLoader *cocoLoader, stExpCocoNode *cocoNode)
{ {
this->beginSetBasicProperties(widget); this->beginSetBasicProperties(widget);

2
cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h
View File

@ -39,7 +39,7 @@ namespace cocostudio
virtual ~TextReader(); virtual ~TextReader();
static TextReader* getInstance(); static TextReader* getInstance();
static void purge(); static void destroyInstance();
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options); virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, const rapidjson::Value& options);
virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode); virtual void setPropsFromBinary(cocos2d::ui::Widget* widget, CocoLoader* cocoLoader, stExpCocoNode* pCocoNode);

2
cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.cpp
View File

@ -61,7 +61,7 @@ namespace cocostudio
return _instanceUserCameraReader; return _instanceUserCameraReader;
} }
void UserCameraReader::purge() void UserCameraReader::destroyInstance()
{ {
CC_SAFE_DELETE(_instanceUserCameraReader); CC_SAFE_DELETE(_instanceUserCameraReader);
} }

2
cocos/editor-support/cocostudio/WidgetReader/UserCameraReader/UserCameraReader.h
View File

@ -46,7 +46,7 @@ namespace cocostudio
~UserCameraReader(); ~UserCameraReader();
static UserCameraReader* getInstance(); static UserCameraReader* getInstance();
static void purge(); static void destroyInstance();
flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData, flatbuffers::Offset<flatbuffers::Table> createOptionsWithFlatBuffers(const tinyxml2::XMLElement* objectData,
flatbuffers::FlatBufferBuilder* builder); flatbuffers::FlatBufferBuilder* builder);

2
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
View File

@ -134,7 +134,7 @@ namespace cocostudio
return instanceWidgetReader; return instanceWidgetReader;
} }
void WidgetReader::purge() void WidgetReader::destroyInstance()
{ {
CC_SAFE_DELETE(instanceWidgetReader); CC_SAFE_DELETE(instanceWidgetReader);
} }

2
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h
View File

@ -46,7 +46,7 @@ namespace cocostudio
virtual ~WidgetReader(); virtual ~WidgetReader();
static WidgetReader* getInstance(); static WidgetReader* getInstance();
static void purge(); static void destroyInstance();
virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget, virtual void setPropsFromJsonDictionary(cocos2d::ui::Widget* widget,
const rapidjson::Value& options); const rapidjson::Value& options);