diff --git a/extensions/Android.mk b/extensions/Android.mk index f46b1a85e5..5e186de9f9 100644 --- a/extensions/Android.mk +++ b/extensions/Android.mk @@ -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 \ diff --git a/extensions/CocoStudio/Action/ActionFrame.cpp b/extensions/CocoStudio/Action/CCActionFrame.cpp similarity index 94% rename from extensions/CocoStudio/Action/ActionFrame.cpp rename to extensions/CocoStudio/Action/CCActionFrame.cpp index 295ec79aec..32305f4a8a 100644 --- a/extensions/CocoStudio/Action/ActionFrame.cpp +++ b/extensions/CocoStudio/Action/CCActionFrame.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "ActionFrame.h" +#include "CCActionFrame.h" NS_CC_EXT_BEGIN diff --git a/extensions/CocoStudio/Action/ActionFrame.h b/extensions/CocoStudio/Action/CCActionFrame.h similarity index 100% rename from extensions/CocoStudio/Action/ActionFrame.h rename to extensions/CocoStudio/Action/CCActionFrame.h diff --git a/extensions/CocoStudio/Action/ActionFrameEasing.h b/extensions/CocoStudio/Action/CCActionFrameEasing.h similarity index 100% rename from extensions/CocoStudio/Action/ActionFrameEasing.h rename to extensions/CocoStudio/Action/CCActionFrameEasing.h diff --git a/extensions/CocoStudio/Action/ActionManagerEx.cpp b/extensions/CocoStudio/Action/CCActionManagerEx.cpp similarity index 95% rename from extensions/CocoStudio/Action/ActionManagerEx.cpp rename to extensions/CocoStudio/Action/CCActionManagerEx.cpp index e099ba2859..d567557cf7 100644 --- a/extensions/CocoStudio/Action/ActionManagerEx.cpp +++ b/extensions/CocoStudio/Action/CCActionManagerEx.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "ActionManagerEx.h" +#include "CCActionManagerEx.h" #include "../Json/DictionaryHelper.h" NS_CC_EXT_BEGIN diff --git a/extensions/CocoStudio/Action/ActionManagerEx.h b/extensions/CocoStudio/Action/CCActionManagerEx.h similarity index 95% rename from extensions/CocoStudio/Action/ActionManagerEx.h rename to extensions/CocoStudio/Action/CCActionManagerEx.h index 46e40df1cc..5b6fc35052 100644 --- a/extensions/CocoStudio/Action/ActionManagerEx.h +++ b/extensions/CocoStudio/Action/CCActionManagerEx.h @@ -27,7 +27,7 @@ #include "cocos2d.h" #include "ExtensionMacros.h" -#include "ActionObject.h" +#include "CCActionObject.h" #include "../Json/CSContentJsonDictionary.h" NS_CC_EXT_BEGIN diff --git a/extensions/CocoStudio/Action/ActionNode.cpp b/extensions/CocoStudio/Action/CCActionNode.cpp similarity index 95% rename from extensions/CocoStudio/Action/ActionNode.cpp rename to extensions/CocoStudio/Action/CCActionNode.cpp index 2d3a5eace5..b2b2baad60 100644 --- a/extensions/CocoStudio/Action/ActionNode.cpp +++ b/extensions/CocoStudio/Action/CCActionNode.cpp @@ -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; } diff --git a/extensions/CocoStudio/Action/ActionNode.h b/extensions/CocoStudio/Action/CCActionNode.h similarity index 95% rename from extensions/CocoStudio/Action/ActionNode.h rename to extensions/CocoStudio/Action/CCActionNode.h index 31063d895b..2c88a5a8cd 100644 --- a/extensions/CocoStudio/Action/ActionNode.h +++ b/extensions/CocoStudio/Action/CCActionNode.h @@ -27,7 +27,7 @@ #include "cocos2d.h" #include "ExtensionMacros.h" -#include "ActionFrame.h" +#include "CCActionFrame.h" #include "../Json/CSContentJsonDictionary.h" NS_CC_EXT_BEGIN diff --git a/extensions/CocoStudio/Action/ActionObject.cpp b/extensions/CocoStudio/Action/CCActionObject.cpp similarity index 95% rename from extensions/CocoStudio/Action/ActionObject.cpp rename to extensions/CocoStudio/Action/CCActionObject.cpp index 6bf9d579ba..f834cfc126 100644 --- a/extensions/CocoStudio/Action/ActionObject.cpp +++ b/extensions/CocoStudio/Action/CCActionObject.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "ActionObject.h" +#include "CCActionObject.h" #include "../Json//DictionaryHelper.h" NS_CC_EXT_BEGIN diff --git a/extensions/CocoStudio/Action/ActionObject.h b/extensions/CocoStudio/Action/CCActionObject.h similarity index 95% rename from extensions/CocoStudio/Action/ActionObject.h rename to extensions/CocoStudio/Action/CCActionObject.h index 36ff305062..ed4d06cd31 100644 --- a/extensions/CocoStudio/Action/ActionObject.h +++ b/extensions/CocoStudio/Action/CCActionObject.h @@ -27,7 +27,7 @@ #include "cocos2d.h" #include "ExtensionMacros.h" -#include "ActionNode.h" +#include "CCActionNode.h" #include "../Json/CSContentJsonDictionary.h" NS_CC_EXT_BEGIN diff --git a/extensions/CocoStudio/Action/ActionFrameEasing.cpp b/extensions/CocoStudio/Action/CCCActionFrameEasing.cpp similarity index 95% rename from extensions/CocoStudio/Action/ActionFrameEasing.cpp rename to extensions/CocoStudio/Action/CCCActionFrameEasing.cpp index 70aa2cd7cd..187adb8e8d 100644 --- a/extensions/CocoStudio/Action/ActionFrameEasing.cpp +++ b/extensions/CocoStudio/Action/CCCActionFrameEasing.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ #include -#include "ActionFrameEasing.h" +#include "CCActionFrameEasing.h" #include "../Json/DictionaryHelper.h" NS_CC_EXT_BEGIN diff --git a/extensions/CocoStudio/Reader/CCSGUIReader.cpp b/extensions/CocoStudio/Reader/CCSGUIReader.cpp index 153c1abd5d..57778d758a 100755 --- a/extensions/CocoStudio/Reader/CCSGUIReader.cpp +++ b/extensions/CocoStudio/Reader/CCSGUIReader.cpp @@ -24,7 +24,7 @@ #include "../GUI/System/CocosGUI.h" #include "../Json/DictionaryHelper.h" -#include "../Action/ActionManagerEx.h" +#include "../Action/CCActionManagerEx.h" #include #include diff --git a/extensions/cocos-ext.h b/extensions/cocos-ext.h index e83e4d903f..64b302fdb6 100644 --- a/extensions/cocos-ext.h +++ b/extensions/cocos-ext.h @@ -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" diff --git a/extensions/proj.emscripten/Makefile b/extensions/proj.emscripten/Makefile index ddf8bb1cff..fdd3cef72c 100644 --- a/extensions/proj.emscripten/Makefile +++ b/extensions/proj.emscripten/Makefile @@ -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 diff --git a/extensions/proj.linux/Makefile b/extensions/proj.linux/Makefile index 4d4b87f141..372c23b68b 100644 --- a/extensions/proj.linux/Makefile +++ b/extensions/proj.linux/Makefile @@ -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 \ diff --git a/extensions/proj.nacl/Makefile b/extensions/proj.nacl/Makefile index 0cc2a35f79..36b2b42edb 100644 --- a/extensions/proj.nacl/Makefile +++ b/extensions/proj.nacl/Makefile @@ -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 \ diff --git a/extensions/proj.win32/libExtensions.vcxproj b/extensions/proj.win32/libExtensions.vcxproj index 4d50a71f31..7fc5eae155 100644 --- a/extensions/proj.win32/libExtensions.vcxproj +++ b/extensions/proj.win32/libExtensions.vcxproj @@ -117,11 +117,11 @@ - - - - - + + + + + @@ -252,11 +252,11 @@ - - - - - + + + + + diff --git a/extensions/proj.win32/libExtensions.vcxproj.filters b/extensions/proj.win32/libExtensions.vcxproj.filters index e6b74eb225..5e72384aff 100644 --- a/extensions/proj.win32/libExtensions.vcxproj.filters +++ b/extensions/proj.win32/libExtensions.vcxproj.filters @@ -532,19 +532,19 @@ CocoStudio\Reader - + CocoStudio\Action - + CocoStudio\Action - + CocoStudio\Action - + CocoStudio\Action - + CocoStudio\Action @@ -974,19 +974,19 @@ CocoStudio\Reader - + CocoStudio\Action - + CocoStudio\Action - + CocoStudio\Action - + CocoStudio\Action - + CocoStudio\Action