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

1.rename cocoaction system files

This commit is contained in:
zhangcheng 2013-09-17 22:39:42 +08:00
parent cf1f054012
commit a1d2045793
18 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/Android.mk
View File

@ -89,11 +89,11 @@ CocoStudio/Json/lib_json/json_value.cpp \
CocoStudio/Json/lib_json/json_writer.cpp \
CocoStudio/Reader/CCSGUIReader.cpp \
CocoStudio/Reader/CCSSceneReader.cpp \
CocoStudio/Action/ActionFrame.cpp \
CocoStudio/Action/ActionFrameEasing.cpp \
CocoStudio/Action/ActionManagerEx.cpp \
CocoStudio/Action/ActionNode.cpp \
CocoStudio/Action/ActionObject.cpp \
CocoStudio/Action/CCActionFrame.cpp \
CocoStudio/Action/CCActionFrameEasing.cpp \
CocoStudio/Action/CCActionManagerEx.cpp \
CocoStudio/Action/CCActionNode.cpp \
CocoStudio/Action/CCActionObject.cpp \
GUI/CCControlExtension/CCControl.cpp \
GUI/CCControlExtension/CCControlButton.cpp \
GUI/CCControlExtension/CCControlColourPicker.cpp \

2
extensions/CocoStudio/Action/ActionFrame.cpp → extensions/CocoStudio/Action/CCActionFrame.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "ActionFrame.h"
#include "CCActionFrame.h"
NS_CC_EXT_BEGIN

0
extensions/CocoStudio/Action/ActionFrame.h → extensions/CocoStudio/Action/CCActionFrame.h
View File

0
extensions/CocoStudio/Action/ActionFrameEasing.h → extensions/CocoStudio/Action/CCActionFrameEasing.h
View File

2
extensions/CocoStudio/Action/ActionManagerEx.cpp → extensions/CocoStudio/Action/CCActionManagerEx.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "ActionManagerEx.h"
#include "CCActionManagerEx.h"
#include "../Json/DictionaryHelper.h"
NS_CC_EXT_BEGIN

2
extensions/CocoStudio/Action/ActionManagerEx.h → extensions/CocoStudio/Action/CCActionManagerEx.h
View File

@ -27,7 +27,7 @@
#include "cocos2d.h"
#include "ExtensionMacros.h"
#include "ActionObject.h"
#include "CCActionObject.h"
#include "../Json/CSContentJsonDictionary.h"
NS_CC_EXT_BEGIN

6
extensions/CocoStudio/Action/ActionNode.cpp → extensions/CocoStudio/Action/CCActionNode.cpp
View File

@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "ActionNode.h"
#include "ActionFrameEasing.h"
#include "CCActionNode.h"
#include "CCActionFrameEasing.h"
#include "../GUI/BaseClasses/UIWidget.h"
#include "../GUI/System/UIHelper.h"
#include "../Json/DictionaryHelper.h"
@ -318,7 +318,7 @@ Spawn * ActionNode::refreshActionProperty()
void ActionNode::playAction(bool bloop)
{
if ( _object == NULL )
if ( _object == NULL || _actionSpawn == NULL)
{
return;
}

2
extensions/CocoStudio/Action/ActionNode.h → extensions/CocoStudio/Action/CCActionNode.h
View File

@ -27,7 +27,7 @@
#include "cocos2d.h"
#include "ExtensionMacros.h"
#include "ActionFrame.h"
#include "CCActionFrame.h"
#include "../Json/CSContentJsonDictionary.h"
NS_CC_EXT_BEGIN

2
extensions/CocoStudio/Action/ActionObject.cpp → extensions/CocoStudio/Action/CCActionObject.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#include "ActionObject.h"
#include "CCActionObject.h"
#include "../Json//DictionaryHelper.h"
NS_CC_EXT_BEGIN

2
extensions/CocoStudio/Action/ActionObject.h → extensions/CocoStudio/Action/CCActionObject.h
View File

@ -27,7 +27,7 @@
#include "cocos2d.h"
#include "ExtensionMacros.h"
#include "ActionNode.h"
#include "CCActionNode.h"
#include "../Json/CSContentJsonDictionary.h"
NS_CC_EXT_BEGIN

2
extensions/CocoStudio/Action/ActionFrameEasing.cpp → extensions/CocoStudio/Action/CCCActionFrameEasing.cpp
View File

@ -23,7 +23,7 @@
****************************************************************************/
#include <math.h>
#include "ActionFrameEasing.h"
#include "CCActionFrameEasing.h"
#include "../Json/DictionaryHelper.h"
NS_CC_EXT_BEGIN

2
extensions/CocoStudio/Reader/CCSGUIReader.cpp
View File

@ -24,7 +24,7 @@
#include "../GUI/System/CocosGUI.h"
#include "../Json/DictionaryHelper.h"
#include "../Action/ActionManagerEx.h"
#include "../Action/CCActionManagerEx.h"
#include <fstream>
#include <iostream>

2
extensions/cocos-ext.h
View File

@ -77,7 +77,7 @@
#include "CocoStudio/Reader/CCSSceneReader.h"
#include "CocoStudio/Reader/CCSGUIReader.h"
#include "CocoStudio/Action/ActionManagerEx.h"
#include "CocoStudio/Action/CCActionManagerEx.h"
#include "CCDeprecated-ext.h"

12
extensions/proj.emscripten/Makefile
View File

@ -59,7 +59,7 @@ SOURCES = ../CCBReader/CCBFileLoader.cpp \
../GUI/CCEditBox/CCEditBoxImplNone.cpp \
../physics_nodes/CCPhysicsDebugNode.cpp \
../physics_nodes/CCPhysicsSprite.cpp \
./CocoStudio/Armature/CCArmature.cpp \
../CocoStudio/Armature/CCArmature.cpp \
../CocoStudio/Armature/CCBone.cpp \
../CocoStudio/Armature/animation/CCArmatureAnimation.cpp \
../CocoStudio/Armature/animation/CCProcessBase.cpp \
@ -117,11 +117,11 @@ SOURCES = ../CCBReader/CCBFileLoader.cpp \
../CocoStudio/Json/lib_json/json_writer.cpp \
../CocoStudio/Reader/CCSGUIReader.cpp \
../CocoStudio/Reader/CCSSceneReader.cpp \
../CocoStudio/Action/ActionFrame.cpp \
../CocoStudio/Action/ActionFrameEasing.cpp \
../CocoStudio/Action/ActionManagerEx.cpp \
../CocoStudio/Action/ActionNode.cpp \
../CocoStudio/Action/ActionObject.cpp \
../CocoStudio/Action/CCActionFrame.cpp \
../CocoStudio/Action/CCActionFrameEasing.cpp \
../CocoStudio/Action/CCActionManagerEx.cpp \
../CocoStudio/Action/CCActionNode.cpp \
../CocoStudio/Action/CCActionObject.cpp \
../CCDeprecated-ext.cpp
include $(COCOS_ROOT)/cocos2dx/proj.emscripten/cocos2dx.mk

10
extensions/proj.linux/Makefile
View File

@ -115,11 +115,11 @@ SOURCES = ../CCBReader/CCBFileLoader.cpp \
../CocoStudio/Json/lib_json/json_writer.cpp \
../CocoStudio/Reader/CCSGUIReader.cpp \
../CocoStudio/Reader/CCSSceneReader.cpp \
../CocoStudio/Action/ActionFrame.cpp \
../CocoStudio/Action/ActionFrameEasing.cpp \
../CocoStudio/Action/ActionManagerEx.cpp \
../CocoStudio/Action/ActionNode.cpp \
../CocoStudio/Action/ActionObject.cpp \
../CocoStudio/Action/CCActionFrame.cpp \
../CocoStudio/Action/CCActionFrameEasing.cpp \
../CocoStudio/Action/CCActionManagerEx.cpp \
../CocoStudio/Action/CCActionNode.cpp \
../CocoStudio/Action/CCActionObject.cpp \
../spine/Animation.cpp \
../spine/AnimationState.cpp \
../spine/AnimationStateData.cpp \

10
extensions/proj.nacl/Makefile
View File

@ -74,11 +74,11 @@ EXTENSIONS_SOURCES = ../CCBReader/CCBFileLoader.cpp \
../CocoStudio/Json/lib_json/json_reader.cpp \
../CocoStudio/Json/lib_json/json_writer.cpp \
../CocoStudio/Reader/CCSSceneReader.cpp \
../CocoStudio/Action/ActionFrame.cpp \
../CocoStudio/Action/ActionFrameEasing.cpp \
../CocoStudio/Action/ActionManagerEx.cpp \
../CocoStudio/Action/ActionNode.cpp \
../CocoStudio/Action/ActionObject.cpp \
../CocoStudio/Action/CCActionFrame.cpp \
../CocoStudio/Action/CCActionFrameEasing.cpp \
../CocoStudio/Action/CCActionManagerEx.cpp \
../CocoStudio/Action/CCActionNode.cpp \
../CocoStudio/Action/CCActionObject.cpp \
../spine/Animation.cpp \
../spine/AnimationState.cpp \
../spine/AnimationStateData.cpp \

20
extensions/proj.win32/libExtensions.vcxproj
View File

@ -117,11 +117,11 @@
<ClCompile Include="..\CCBReader\CCScrollViewLoader.cpp" />
<ClCompile Include="..\CCBReader\CCSpriteLoader.cpp" />
<ClCompile Include="..\CCDeprecated-ext.cpp" />
<ClCompile Include="..\CocoStudio\Action\ActionFrame.cpp" />
<ClCompile Include="..\CocoStudio\Action\ActionFrameEasing.cpp" />
<ClCompile Include="..\CocoStudio\Action\ActionManagerEx.cpp" />
<ClCompile Include="..\CocoStudio\Action\ActionNode.cpp" />
<ClCompile Include="..\CocoStudio\Action\ActionObject.cpp" />
<ClCompile Include="..\CocoStudio\Action\CCActionFrame.cpp" />
<ClCompile Include="..\CocoStudio\Action\CCCActionFrameEasing.cpp" />
<ClCompile Include="..\CocoStudio\Action\CCActionManagerEx.cpp" />
<ClCompile Include="..\CocoStudio\Action\CCActionNode.cpp" />
<ClCompile Include="..\CocoStudio\Action\CCActionObject.cpp" />
<ClCompile Include="..\CocoStudio\Armature\animation\CCArmatureAnimation.cpp" />
<ClCompile Include="..\CocoStudio\Armature\animation\CCProcessBase.cpp" />
<ClCompile Include="..\CocoStudio\Armature\animation\CCTween.cpp" />
@ -252,11 +252,11 @@
<ClInclude Include="..\CCBReader\CCScale9SpriteLoader.h" />
<ClInclude Include="..\CCBReader\CCScrollViewLoader.h" />
<ClInclude Include="..\CCBReader\CCSpriteLoader.h" />
<ClInclude Include="..\CocoStudio\Action\ActionFrame.h" />
<ClInclude Include="..\CocoStudio\Action\ActionFrameEasing.h" />
<ClInclude Include="..\CocoStudio\Action\ActionManagerEx.h" />
<ClInclude Include="..\CocoStudio\Action\ActionNode.h" />
<ClInclude Include="..\CocoStudio\Action\ActionObject.h" />
<ClInclude Include="..\CocoStudio\Action\CCActionFrame.h" />
<ClInclude Include="..\CocoStudio\Action\CCActionFrameEasing.h" />
<ClInclude Include="..\CocoStudio\Action\CCActionManagerEx.h" />
<ClInclude Include="..\CocoStudio\Action\CCActionNode.h" />
<ClInclude Include="..\CocoStudio\Action\CCActionObject.h" />
<ClInclude Include="..\CocoStudio\Armature\animation\CCArmatureAnimation.h" />
<ClInclude Include="..\CocoStudio\Armature\animation\CCProcessBase.h" />
<ClInclude Include="..\CocoStudio\Armature\animation\CCTween.h" />

20
extensions/proj.win32/libExtensions.vcxproj.filters
View File

@ -532,19 +532,19 @@
<ClCompile Include="..\CocoStudio\Reader\CCSGUIReader.cpp">
<Filter>CocoStudio\Reader</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\Action\ActionFrame.cpp">
<ClCompile Include="..\CocoStudio\Action\CCActionFrame.cpp">
<Filter>CocoStudio\Action</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\Action\ActionFrameEasing.cpp">
<ClCompile Include="..\CocoStudio\Action\CCCActionFrameEasing.cpp">
<Filter>CocoStudio\Action</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\Action\ActionNode.cpp">
<ClCompile Include="..\CocoStudio\Action\CCActionManagerEx.cpp">
<Filter>CocoStudio\Action</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\Action\ActionObject.cpp">
<ClCompile Include="..\CocoStudio\Action\CCActionNode.cpp">
<Filter>CocoStudio\Action</Filter>
</ClCompile>
<ClCompile Include="..\CocoStudio\Action\ActionManagerEx.cpp">
<ClCompile Include="..\CocoStudio\Action\CCActionObject.cpp">
<Filter>CocoStudio\Action</Filter>
</ClCompile>
</ItemGroup>
@ -974,19 +974,19 @@
<ClInclude Include="..\CocoStudio\Reader\CCSGUIReader.h">
<Filter>CocoStudio\Reader</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\Action\ActionFrame.h">
<ClInclude Include="..\CocoStudio\Action\CCActionFrame.h">
<Filter>CocoStudio\Action</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\Action\ActionFrameEasing.h">
<ClInclude Include="..\CocoStudio\Action\CCActionFrameEasing.h">
<Filter>CocoStudio\Action</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\Action\ActionNode.h">
<ClInclude Include="..\CocoStudio\Action\CCActionManagerEx.h">
<Filter>CocoStudio\Action</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\Action\ActionObject.h">
<ClInclude Include="..\CocoStudio\Action\CCActionNode.h">
<Filter>CocoStudio\Action</Filter>
</ClInclude>
<ClInclude Include="..\CocoStudio\Action\ActionManagerEx.h">
<ClInclude Include="..\CocoStudio\Action\CCActionObject.h">
<Filter>CocoStudio\Action</Filter>
</ClInclude>
</ItemGroup>