Skip to content

Commit 75ae19f

Browse files
xiaofeng11xiaofeng11
committed
Merge pull request #4 from pipu/cocostudio_destroyCocosStudio
Add method destroyCocosStudio() for CocoStudio
2 parents d8659d7 + bc7d8f0 commit 75ae19f

File tree

19 files changed

+107
-45
lines changed

19 files changed

+107
-45
lines changed

‎build/cocos2d_libs.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,6 +1282,8 @@
12821282
38B8E2E219E671D2002D7CE7 /* UILayoutComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38B8E2DF19E671D2002D7CE7 /* UILayoutComponent.cpp */; };
12831283
38B8E2E319E671D2002D7CE7 /* UILayoutComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 38B8E2E019E671D2002D7CE7 /* UILayoutComponent.h */; };
12841284
38B8E2E419E671D2002D7CE7 /* UILayoutComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 38B8E2E019E671D2002D7CE7 /* UILayoutComponent.h */; };
1285+
38D9629D1ACA9721007C6FAF /* CocoStudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38D9629C1ACA9721007C6FAF /* CocoStudio.cpp */; };
1286+
38D9629E1ACA9721007C6FAF /* CocoStudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38D9629C1ACA9721007C6FAF /* CocoStudio.cpp */; };
12851287
38F5263E1A48363B000DB7F7 /* ArmatureNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38F5263B1A48363B000DB7F7 /* ArmatureNodeReader.cpp */; };
12861288
38F5263F1A48363B000DB7F7 /* ArmatureNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38F5263B1A48363B000DB7F7 /* ArmatureNodeReader.cpp */; };
12871289
38F526401A48363B000DB7F7 /* ArmatureNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 38F5263C1A48363B000DB7F7 /* ArmatureNodeReader.h */; };
@@ -3109,6 +3111,7 @@
31093111
38B8E2D419E66581002D7CE7 /* CSLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSLoader.h; sourceTree = "<group>"; };
31103112
38B8E2DF19E671D2002D7CE7 /* UILayoutComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayoutComponent.cpp; sourceTree = "<group>"; };
31113113
38B8E2E019E671D2002D7CE7 /* UILayoutComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayoutComponent.h; sourceTree = "<group>"; };
3114+
38D9629C1ACA9721007C6FAF /* CocoStudio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CocoStudio.cpp; sourceTree = "<group>"; };
31123115
38F5263B1A48363B000DB7F7 /* ArmatureNodeReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArmatureNodeReader.cpp; sourceTree = "<group>"; };
31133116
38F5263C1A48363B000DB7F7 /* ArmatureNodeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArmatureNodeReader.h; sourceTree = "<group>"; };
31143117
38F5263D1A48363B000DB7F7 /* CSArmatureNode_generated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSArmatureNode_generated.h; sourceTree = "<group>"; };
@@ -4868,6 +4871,7 @@
48684871
1A8C5984180E930E00EF57C3 /* CCUtilMath.cpp */,
48694872
1A8C5985180E930E00EF57C3 /* CCUtilMath.h */,
48704873
1A8C5986180E930E00EF57C3 /* CocoStudio.h */,
4874+
38D9629C1ACA9721007C6FAF /* CocoStudio.cpp */,
48714875
1A8C5989180E930E00EF57C3 /* DictionaryHelper.cpp */,
48724876
1A8C598A180E930E00EF57C3 /* DictionaryHelper.h */,
48734877
);
@@ -8602,6 +8606,7 @@
86028606
B665E2561AA80A6500DDB1C5 /* CCPUDoAffectorEventHandlerTranslator.cpp in Sources */,
86038607
15AE18A419AAD33D00C27E9E /* CCScale9SpriteLoader.cpp in Sources */,
86048608
182C5CD61A98F30500C30D34 /* Sprite3DReader.cpp in Sources */,
8609+
38D9629D1ACA9721007C6FAF /* CocoStudio.cpp in Sources */,
86058610
B665E3D61AA80A6600DDB1C5 /* CCPUScriptParser.cpp in Sources */,
86068611
15AE1B5719AADA9900C27E9E /* UISlider.cpp in Sources */,
86078612
B665E2F61AA80A6500DDB1C5 /* CCPUListener.cpp in Sources */,
@@ -9044,6 +9049,7 @@
90449049
B665E3AF1AA80A6500DDB1C5 /* CCPURender.cpp in Sources */,
90459050
382383FB1A258FA7002C4610 /* idl_gen_go.cpp in Sources */,
90469051
B665E2EF1AA80A6500DDB1C5 /* CCPULineEmitter.cpp in Sources */,
9052+
38D9629E1ACA9721007C6FAF /* CocoStudio.cpp in Sources */,
90479053
50ABBDBA1925AB4100A911A9 /* CCTextureAtlas.cpp in Sources */,
90489054
1A5702FB180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */,
90499055
B665E40B1AA80A6600DDB1C5 /* CCPUSphereSurfaceEmitterTranslator.cpp in Sources */,

‎cocos/2d/libcocos2d.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
514514
<ClCompile Include="..\editor-support\cocostudio\CCTween.cpp" />
515515
<ClCompile Include="..\editor-support\cocostudio\CCUtilMath.cpp" />
516516
<ClCompile Include="..\editor-support\cocostudio\CocoLoader.cpp" />
517+
<ClCompile Include="..\editor-support\cocostudio\CocoStudio.cpp" />
517518
<ClCompile Include="..\editor-support\cocostudio\DictionaryHelper.cpp" />
518519
<ClCompile Include="..\editor-support\cocostudio\FlatBuffersSerialize.cpp" />
519520
<ClCompile Include="..\editor-support\cocostudio\TriggerBase.cpp" />

‎cocos/2d/libcocos2d.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,6 +1795,9 @@
17951795
<ClCompile Include="..\editor-support\cocostudio\CCObjectExtensionData.cpp">
17961796
<Filter>cocostudio\json</Filter>
17971797
</ClCompile>
1798+
<ClCompile Include="..\editor-support\cocostudio\CocoStudio.cpp">
1799+
<Filter>cocostudio\json</Filter>
1800+
</ClCompile>
17981801
</ItemGroup>
17991802
<ItemGroup>
18001803
<ClInclude Include="..\physics\CCPhysicsBody.h">

‎cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,7 @@
947947
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\CCTween.cpp" />
948948
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\CCUtilMath.cpp" />
949949
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\CocoLoader.cpp" />
950+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\CocoStudio.cpp" />
950951
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\DictionaryHelper.cpp" />
951952
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\FlatBuffersSerialize.cpp" />
952953
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\TriggerBase.cpp" />

‎cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<ClInclude Include="$(MSBuildThisFileDirectory)targetver.h" />
@@ -3312,6 +3312,9 @@
33123312
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCTextureCube.cpp">
33133313
<Filter>3d</Filter>
33143314
</ClCompile>
3315+
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\CocoStudio.cpp">
3316+
<Filter>cocostudio\json</Filter>
3317+
</ClCompile>
33153318
</ItemGroup>
33163319
<ItemGroup>
33173320
<Filter Include="2d">

‎cocos/2d/libcocos2d_wp8.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,7 @@
538538
<ClInclude Include="..\editor-support\cocostudio\CCTween.h" />
539539
<ClInclude Include="..\editor-support\cocostudio\CCUtilMath.h" />
540540
<ClInclude Include="..\editor-support\cocostudio\CocoLoader.h" />
541+
<ClInclude Include="..\editor-support\cocostudio\CocoStudio.h" />
541542
<ClInclude Include="..\editor-support\cocostudio\CSParseBinary_generated.h" />
542543
<ClInclude Include="..\editor-support\cocostudio\CSParse3DBinary_generated.h" />
543544
<ClInclude Include="..\editor-support\cocostudio\DictionaryHelper.h" />
@@ -1179,6 +1180,7 @@
11791180
<ClCompile Include="..\editor-support\cocostudio\CCTween.cpp" />
11801181
<ClCompile Include="..\editor-support\cocostudio\CCUtilMath.cpp" />
11811182
<ClCompile Include="..\editor-support\cocostudio\CocoLoader.cpp" />
1183+
<ClCompile Include="..\editor-support\cocostudio\CocoStudio.cpp" />
11821184
<ClCompile Include="..\editor-support\cocostudio\DictionaryHelper.cpp" />
11831185
<ClCompile Include="..\editor-support\cocostudio\FlatBuffersSerialize.cpp" />
11841186
<ClCompile Include="..\editor-support\cocostudio\TriggerBase.cpp" />

‎cocos/2d/libcocos2d_wp8.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,6 +1815,9 @@
18151815
<ClCompile Include="..\3d\CCTextureCube.cpp">
18161816
<Filter>3d</Filter>
18171817
</ClCompile>
1818+
<ClCompile Include="..\editor-support\cocostudio\CocoStudio.cpp">
1819+
<Filter>cocostudio\json</Filter>
1820+
</ClCompile>
18181821
</ItemGroup>
18191822
<ItemGroup>
18201823
<ClInclude Include="CCAction.h">
@@ -3528,6 +3531,9 @@
35283531
<ClInclude Include="..\3d\CCTextureCube.h">
35293532
<Filter>3d</Filter>
35303533
</ClInclude>
3534+
<ClInclude Include="..\editor-support\cocostudio\CocoStudio.h">
3535+
<Filter>cocostudio\json</Filter>
3536+
</ClInclude>
35313537
</ItemGroup>
35323538
<ItemGroup>
35333539
<None Include="..\math\Mat4.inl">

‎cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -218,40 +218,6 @@ void CSLoader::purge()
218218
{
219219
}
220220

221-
void CSLoader::destroyCocosStudio()
222-
{
223-
NodeReader::destroyInstance();
224-
SingleNodeReader::destroyInstance();
225-
SpriteReader::destroyInstance();
226-
ParticleReader::destroyInstance();
227-
GameMapReader::destroyInstance();
228-
ProjectNodeReader::destroyInstance();
229-
ComAudioReader::destroyInstance();
230-
231-
WidgetReader::destroyInstance();
232-
ButtonReader::destroyInstance();
233-
CheckBoxReader::destroyInstance();
234-
ImageViewReader::destroyInstance();
235-
TextBMFontReader::destroyInstance();
236-
TextReader::destroyInstance();
237-
TextFieldReader::destroyInstance();
238-
TextAtlasReader::destroyInstance();
239-
LoadingBarReader::destroyInstance();
240-
SliderReader::destroyInstance();
241-
LayoutReader::destroyInstance();
242-
ScrollViewReader::destroyInstance();
243-
PageViewReader::destroyInstance();
244-
ListViewReader::destroyInstance();
245-
246-
ArmatureNodeReader::destroyInstance();
247-
Node3DReader::destroyInstance();
248-
Sprite3DReader::destroyInstance();
249-
UserCameraReader::destroyInstance();
250-
Particle3DReader::destroyInstance();
251-
252-
destroyInstance();
253-
}
254-
255221
void CSLoader::init()
256222
{
257223
using namespace std::placeholders;

‎cocos/editor-support/cocostudio/ActionTimeline/CSLoader.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ class CC_STUDIO_DLL CSLoader
7373

7474
CSLoader();
7575
/** @deprecated Use method destroyInstance() instead */
76-
CC_DEPRECATED_ATTRIBUTE void purge();
77-
78-
static void destroyCocosStudio();
76+
CC_DEPRECATED_ATTRIBUTE void purge();
7977

8078
void init();
8179

‎cocos/editor-support/cocostudio/Android.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ ActionTimeline/CSLoader.cpp \
7575
FlatBuffersSerialize.cpp \
7676
WidgetCallBackHandlerProtocol.cpp \
7777
WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp \
78-
CCObjectExtensionData.cpp
78+
CCObjectExtensionData.cpp \
79+
CocoStudio.cpp
7980

8081

8182
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..

0 commit comments

Comments
 (0)