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

change armature codes files path

This commit is contained in:
yusheng.lu 2014-12-22 18:26:50 +08:00
parent 6de7fae114
commit b0bfc2906a
7 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/2d/libcocos2d.vcxproj
View File

@ -325,7 +325,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCNodeReader.cpp" /> <ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCNodeReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCTimeLine.cpp" /> <ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCTimeLine.cpp" />
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CSLoader.cpp" /> <ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CSLoader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\ArmatureNodeReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCActionFrame.cpp" /> <ClCompile Include="..\editor-support\cocostudio\CCActionFrame.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCActionFrameEasing.cpp" /> <ClCompile Include="..\editor-support\cocostudio\CCActionFrameEasing.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCActionManagerEx.cpp" /> <ClCompile Include="..\editor-support\cocostudio\CCActionManagerEx.cpp" />
@ -363,6 +362,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClCompile Include="..\editor-support\cocostudio\TriggerMng.cpp" /> <ClCompile Include="..\editor-support\cocostudio\TriggerMng.cpp" />
<ClCompile Include="..\editor-support\cocostudio\TriggerObj.cpp" /> <ClCompile Include="..\editor-support\cocostudio\TriggerObj.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.cpp" /> <ClCompile Include="..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ArmatureNode\ArmatureNodeReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.cpp" /> <ClCompile Include="..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.cpp" /> <ClCompile Include="..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\ComAudioReader\ComAudioReader.cpp" /> <ClCompile Include="..\editor-support\cocostudio\WidgetReader\ComAudioReader\ComAudioReader.cpp" />
@ -725,7 +725,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCTimeLine.h" /> <ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCTimeLine.h" />
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCTimelineMacro.h" /> <ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCTimelineMacro.h" />
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CSLoader.h" /> <ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CSLoader.h" />
<ClInclude Include="..\editor-support\cocostudio\ArmatureNodeReader.h" />
<ClInclude Include="..\editor-support\cocostudio\CCActionFrame.h" /> <ClInclude Include="..\editor-support\cocostudio\CCActionFrame.h" />
<ClInclude Include="..\editor-support\cocostudio\CCActionFrameEasing.h" /> <ClInclude Include="..\editor-support\cocostudio\CCActionFrameEasing.h" />
<ClInclude Include="..\editor-support\cocostudio\CCActionManagerEx.h" /> <ClInclude Include="..\editor-support\cocostudio\CCActionManagerEx.h" />
@ -760,7 +759,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClInclude Include="..\editor-support\cocostudio\CocoLoader.h" /> <ClInclude Include="..\editor-support\cocostudio\CocoLoader.h" />
<ClInclude Include="..\editor-support\cocostudio\CocosStudioExport.h" /> <ClInclude Include="..\editor-support\cocostudio\CocosStudioExport.h" />
<ClInclude Include="..\editor-support\cocostudio\CocoStudio.h" /> <ClInclude Include="..\editor-support\cocostudio\CocoStudio.h" />
<ClInclude Include="..\editor-support\cocostudio\CSArmatureNode_generated.h" />
<ClInclude Include="..\editor-support\cocostudio\CSParseBinary_generated.h" /> <ClInclude Include="..\editor-support\cocostudio\CSParseBinary_generated.h" />
<ClInclude Include="..\editor-support\cocostudio\DictionaryHelper.h" /> <ClInclude Include="..\editor-support\cocostudio\DictionaryHelper.h" />
<ClInclude Include="..\editor-support\cocostudio\FlatBuffersSerialize.h" /> <ClInclude Include="..\editor-support\cocostudio\FlatBuffersSerialize.h" />
@ -768,6 +766,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClInclude Include="..\editor-support\cocostudio\TriggerMng.h" /> <ClInclude Include="..\editor-support\cocostudio\TriggerMng.h" />
<ClInclude Include="..\editor-support\cocostudio\TriggerObj.h" /> <ClInclude Include="..\editor-support\cocostudio\TriggerObj.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.h" /> <ClInclude Include="..\editor-support\cocostudio\WidgetCallBackHandlerProtocol.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ArmatureNode\ArmatureNodeReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ArmatureNode\CSArmatureNode_generated.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.h" /> <ClInclude Include="..\editor-support\cocostudio\WidgetReader\ButtonReader\ButtonReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.h" /> <ClInclude Include="..\editor-support\cocostudio\WidgetReader\CheckBoxReader\CheckBoxReader.h" />
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\ComAudioReader\ComAudioReader.h" /> <ClInclude Include="..\editor-support\cocostudio\WidgetReader\ComAudioReader\ComAudioReader.h" />

6
cocos/2d/libcocos2d.vcxproj.filters
View File

@ -1304,7 +1304,7 @@
<ClCompile Include="..\base\allocator\CCAllocatorGlobalNewDelete.cpp"> <ClCompile Include="..\base\allocator\CCAllocatorGlobalNewDelete.cpp">
<Filter>base\allocator</Filter> <Filter>base\allocator</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\editor-support\cocostudio\ArmatureNodeReader.cpp"> <ClCompile Include="..\editor-support\cocostudio\WidgetReader\ArmatureNode\ArmatureNodeReader.cpp">
<Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter> <Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
@ -2550,10 +2550,10 @@
<ClInclude Include="..\base\allocator\CCAllocatorStrategyPool.h"> <ClInclude Include="..\base\allocator\CCAllocatorStrategyPool.h">
<Filter>base\allocator</Filter> <Filter>base\allocator</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\editor-support\cocostudio\ArmatureNodeReader.h"> <ClInclude Include="..\editor-support\cocostudio\WidgetReader\ArmatureNode\ArmatureNodeReader.h">
<Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter> <Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CSArmatureNode_generated.h"> <ClInclude Include="..\editor-support\cocostudio\WidgetReader\ArmatureNode\CSArmatureNode_generated.h">
<Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter> <Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>

3
cocos/2d/libcocos2d_wp8.vcxproj
View File

@ -336,6 +336,7 @@
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCTimeLine.h" /> <ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCTimeLine.h" />
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCTimelineMacro.h" /> <ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CCTimelineMacro.h" />
<ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CSLoader.h" /> <ClInclude Include="..\editor-support\cocostudio\ActionTimeline\CSLoader.h" />
<ClInclude Include="..\editor-support\cocostudio\ArmatureNodeReader.h" />
<ClInclude Include="..\editor-support\cocostudio\CCActionFrame.h" /> <ClInclude Include="..\editor-support\cocostudio\CCActionFrame.h" />
<ClInclude Include="..\editor-support\cocostudio\CCActionFrameEasing.h" /> <ClInclude Include="..\editor-support\cocostudio\CCActionFrameEasing.h" />
<ClInclude Include="..\editor-support\cocostudio\CCActionManagerEx.h" /> <ClInclude Include="..\editor-support\cocostudio\CCActionManagerEx.h" />
@ -368,6 +369,7 @@
<ClInclude Include="..\editor-support\cocostudio\CCTween.h" /> <ClInclude Include="..\editor-support\cocostudio\CCTween.h" />
<ClInclude Include="..\editor-support\cocostudio\CCUtilMath.h" /> <ClInclude Include="..\editor-support\cocostudio\CCUtilMath.h" />
<ClInclude Include="..\editor-support\cocostudio\CocoLoader.h" /> <ClInclude Include="..\editor-support\cocostudio\CocoLoader.h" />
<ClInclude Include="..\editor-support\cocostudio\CSArmatureNode_generated.h" />
<ClInclude Include="..\editor-support\cocostudio\CSParseBinary.pb.h" /> <ClInclude Include="..\editor-support\cocostudio\CSParseBinary.pb.h" />
<ClInclude Include="..\editor-support\cocostudio\CSParseBinary_generated.h" /> <ClInclude Include="..\editor-support\cocostudio\CSParseBinary_generated.h" />
<ClInclude Include="..\editor-support\cocostudio\DictionaryHelper.h" /> <ClInclude Include="..\editor-support\cocostudio\DictionaryHelper.h" />
@ -814,6 +816,7 @@
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCNodeReader.cpp" /> <ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCNodeReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCTimeLine.cpp" /> <ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CCTimeLine.cpp" />
<ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CSLoader.cpp" /> <ClCompile Include="..\editor-support\cocostudio\ActionTimeline\CSLoader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\ArmatureNodeReader.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCActionFrame.cpp" /> <ClCompile Include="..\editor-support\cocostudio\CCActionFrame.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCActionFrameEasing.cpp" /> <ClCompile Include="..\editor-support\cocostudio\CCActionFrameEasing.cpp" />
<ClCompile Include="..\editor-support\cocostudio\CCActionManagerEx.cpp" /> <ClCompile Include="..\editor-support\cocostudio\CCActionManagerEx.cpp" />

15
cocos/2d/libcocos2d_wp8.vcxproj.filters
View File

@ -242,6 +242,9 @@
<Filter Include="cocostudio\reader\WidgetReader\GameMapReader"> <Filter Include="cocostudio\reader\WidgetReader\GameMapReader">
<UniqueIdentifier>{02d389d5-8f57-4bd6-b12a-95af86c5b356}</UniqueIdentifier> <UniqueIdentifier>{02d389d5-8f57-4bd6-b12a-95af86c5b356}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="cocostudio\reader\WidgetReader\ArmatureNode">
<UniqueIdentifier>{1dfee771-33de-4702-b4a2-a11c9446371f}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="CCAction.cpp"> <ClCompile Include="CCAction.cpp">
@ -1299,9 +1302,6 @@
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\NodeReaderProtocol.cpp"> <ClCompile Include="..\editor-support\cocostudio\WidgetReader\NodeReaderProtocol.cpp">
<Filter>cocostudio\reader\WidgetReader</Filter> <Filter>cocostudio\reader\WidgetReader</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\editor-support\cocostudio\CSParseBinary.pb.cc">
<Filter>cocostudio\json</Filter>
</ClCompile>
<ClCompile Include="..\editor-support\cocostudio\FlatBuffersSerialize.cpp"> <ClCompile Include="..\editor-support\cocostudio\FlatBuffersSerialize.cpp">
<Filter>cocostudio\json</Filter> <Filter>cocostudio\json</Filter>
</ClCompile> </ClCompile>
@ -1311,6 +1311,9 @@
<ClCompile Include="..\editor-support\cocostudio\WidgetReader\GameMapReader\GameMapReader.cpp"> <ClCompile Include="..\editor-support\cocostudio\WidgetReader\GameMapReader\GameMapReader.cpp">
<Filter>cocostudio\reader\WidgetReader\GameMapReader</Filter> <Filter>cocostudio\reader\WidgetReader\GameMapReader</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\editor-support\cocostudio\ArmatureNodeReader.cpp">
<Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="CCAction.h"> <ClInclude Include="CCAction.h">
@ -2541,6 +2544,12 @@
<ClInclude Include="..\editor-support\cocostudio\WidgetReader\GameMapReader\GameMapReader.h"> <ClInclude Include="..\editor-support\cocostudio\WidgetReader\GameMapReader\GameMapReader.h">
<Filter>cocostudio\reader\WidgetReader\GameMapReader</Filter> <Filter>cocostudio\reader\WidgetReader\GameMapReader</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\editor-support\cocostudio\CSArmatureNode_generated.h">
<Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter>
</ClInclude>
<ClInclude Include="..\editor-support\cocostudio\ArmatureNodeReader.h">
<Filter>cocostudio\reader\WidgetReader\ArmatureNode</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\math\Mat4.inl"> <None Include="..\math\Mat4.inl">

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

@ -3,7 +3,7 @@
#include "cocostudio/WidgetReader/NodeReader/NodeReader.h" #include "cocostudio/WidgetReader/NodeReader/NodeReader.h"
#include "cocostudio/CSParseBinary_generated.h" #include "cocostudio/CSParseBinary_generated.h"
#include "CSArmatureNode_generated.h" #include "CSArmatureNode_generated.h"
#include "cocostudio/ArmatureNodeReader.h" #include "cocostudio/WidgetReader/ArmatureNode/ArmatureNodeReader.h"
#include "cocostudio/CCArmature.h" #include "cocostudio/CCArmature.h"

0
cocos/editor-support/cocostudio/ArmatureNodeReader.h → cocos/editor-support/cocostudio/WidgetReader/ArmatureNode/ArmatureNodeReader.h
View File

0
cocos/editor-support/cocostudio/CSArmatureNode_generated.h → cocos/editor-support/cocostudio/WidgetReader/ArmatureNode/CSArmatureNode_generated.h
View File