From 3ef8ac63f2122dbca7e35dd1f55bb9f76b730ba5 Mon Sep 17 00:00:00 2001 From: aismann Date: Tue, 11 Oct 2022 18:15:09 +0200 Subject: [PATCH] rename cocos2d to axmol (#920) * rename cocos2d to axmol * rename cocos2d.h to axmol.h * Update Physics3DTest.cpp replace Sprite3D -> MeshRenderer --- core/2d/CCPlistSpriteSheetLoader.cpp | 2 +- core/base/CCConfiguration.cpp | 4 ++-- core/base/SimpleTimer.cpp | 2 +- core/ui/LayoutHelper.h | 2 +- extensions/physics-nodes/CCPhysicsDebugNodeBox2D.h | 4 ++-- templates/cpp-template-default/proj.win32/main.cpp | 2 +- .../Classes/ActionManagerTest/ActionManagerTest.cpp | 2 +- tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp | 2 +- tests/cpp-tests/Classes/AppDelegate.cpp | 2 +- tests/cpp-tests/Classes/AppDelegate.h | 2 +- tests/cpp-tests/Classes/BaseTest.h | 2 +- tests/cpp-tests/Classes/Box2DTest/Box2dTest.h | 4 ++-- tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.cpp | 4 ++-- tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.h | 2 +- tests/cpp-tests/Classes/Box2DTestBed/Test.cpp | 4 ++-- .../Classes/BugsTest/Bug-458/QuestionContainerSprite.h | 2 +- tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h | 2 +- tests/cpp-tests/Classes/ChipmunkTestBed/ChipmunkTestBed.h | 2 +- .../Classes/ConfigurationTest/ConfigurationTest.cpp | 2 +- tests/cpp-tests/Classes/CurlTest/CurlTest.h | 2 +- .../Classes/CurrentLanguageTest/CurrentLanguageTest.h | 2 +- .../Classes/DrawPrimitivesTest/DrawPrimitivesTest.h | 2 +- .../Classes/EffectsAdvancedTest/EffectsAdvancedTest.h | 2 +- .../AssetsManagerExTest/AssetsManagerExTest.cpp | 2 +- .../ExtensionsTest/TableViewTest/CustomTableViewCell.h | 2 +- .../ExtensionsTest/TableViewTest/TableViewTestScene.h | 2 +- tests/cpp-tests/Classes/FontTest/FontTest.h | 2 +- tests/cpp-tests/Classes/ImGuiTest/ImGuiTest.h | 2 +- tests/cpp-tests/Classes/InputTest/MouseTest.h | 2 +- .../Classes/MaterialSystemTest/MaterialSystemTest.cpp | 2 +- tests/cpp-tests/Classes/MenuTest/MenuTest.h | 2 +- tests/cpp-tests/Classes/MeshRendererTest/DrawNode3D.h | 2 +- .../Classes/NetworkTest/HttpClientTest/HttpClientTest.h | 2 +- .../Classes/NewAudioEngineTest/NewAudioEngineTest.h | 2 +- .../Classes/NewEventDispatcherTest/NewEventDispatcherTest.h | 2 +- tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h | 2 +- tests/cpp-tests/Classes/NodeTest/NodeTest.h | 2 +- tests/cpp-tests/Classes/OpenURLTest/OpenURLTest.h | 2 +- tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp | 6 +++--- .../cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h | 2 +- tests/cpp-tests/Classes/SceneTest/SceneTest.h | 2 +- tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h | 2 +- tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp | 2 +- tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp | 2 +- tests/cpp-tests/Classes/SpineTest/SpineTest.h | 2 +- .../Classes/SpriteFrameCacheTest/SpriteFrameCacheTest.h | 2 +- tests/cpp-tests/Classes/SpriteTest/SpriteTest.h | 2 +- tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h | 2 +- .../TextureAtlasEncryptionTest.h | 2 +- tests/cpp-tests/Classes/TouchesTest/Ball.h | 2 +- tests/cpp-tests/Classes/TouchesTest/Paddle.h | 2 +- .../CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp | 2 +- tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.h | 2 +- tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h | 2 +- tests/cpp-tests/Classes/VibrateTest/VibrateTest.h | 2 +- tests/cpp-tests/Classes/VisibleRect.h | 2 +- tests/cpp-tests/Classes/testBasic.h | 2 +- 57 files changed, 64 insertions(+), 64 deletions(-) diff --git a/core/2d/CCPlistSpriteSheetLoader.cpp b/core/2d/CCPlistSpriteSheetLoader.cpp index d0079d3485..fe4d5254f5 100644 --- a/core/2d/CCPlistSpriteSheetLoader.cpp +++ b/core/2d/CCPlistSpriteSheetLoader.cpp @@ -220,7 +220,7 @@ void PlistSpriteSheetLoader::addSpriteFramesWithDictionary(ValueMap& dictionary, if (!ow || !oh) { AXLOGWARN( - "cocos2d: WARNING: originalWidth/Height not found on the SpriteFrame. AnchorPoint won't work as " + "axmol: WARNING: originalWidth/Height not found on the SpriteFrame. AnchorPoint won't work as " "expected. Regenerate the .plist"); } // abs ow/oh diff --git a/core/base/CCConfiguration.cpp b/core/base/CCConfiguration.cpp index fcbd36c887..cd6aab9a19 100644 --- a/core/base/CCConfiguration.cpp +++ b/core/base/CCConfiguration.cpp @@ -99,13 +99,13 @@ std::string Configuration::getInfo() const // And Dump some warnings as well #if AX_ENABLE_PROFILERS AXLOG( - "cocos2d: **** WARNING **** AX_ENABLE_PROFILERS is defined. Disable it when you finish profiling (from " + "axmol: **** WARNING **** AX_ENABLE_PROFILERS is defined. Disable it when you finish profiling (from " "ccConfig.h)\n"); #endif #if AX_ENABLE_GL_STATE_CACHE == 0 AXLOG( - "cocos2d: **** WARNING **** AX_ENABLE_GL_STATE_CACHE is disabled. To improve performance, enable it (from " + "axmol: **** WARNING **** AX_ENABLE_GL_STATE_CACHE is disabled. To improve performance, enable it (from " "ccConfig.h)\n"); #endif diff --git a/core/base/SimpleTimer.cpp b/core/base/SimpleTimer.cpp index f7c3ec37bb..aa31f9eed4 100644 --- a/core/base/SimpleTimer.cpp +++ b/core/base/SimpleTimer.cpp @@ -1,7 +1,7 @@ #include "SimpleTimer.h" #include "yasio/detail/object_pool.hpp" #include "yasio/detail/ref_ptr.hpp" -#include "cocos2d.h" +#include "axmol.h" #define STIMER_DEFINE_REFERENCE_CLASS \ private: \ diff --git a/core/ui/LayoutHelper.h b/core/ui/LayoutHelper.h index b39070ce8b..9381b1f79d 100644 --- a/core/ui/LayoutHelper.h +++ b/core/ui/LayoutHelper.h @@ -12,7 +12,7 @@ #ifndef _LAYOUTHELPER_H_ # define _LAYOUTHELPER_H_ -# include "cocos2d.h" +# include "axmol.h" # include "base/ccMacros.h" // f(x) = s * a + x diff --git a/extensions/physics-nodes/CCPhysicsDebugNodeBox2D.h b/extensions/physics-nodes/CCPhysicsDebugNodeBox2D.h index 41bfe82fb0..698e82ca57 100644 --- a/extensions/physics-nodes/CCPhysicsDebugNodeBox2D.h +++ b/extensions/physics-nodes/CCPhysicsDebugNodeBox2D.h @@ -24,7 +24,7 @@ #include "extensions/ExtensionExport.h" #include "2d/CCDrawNode.h" #include "box2d/box2d.h" -#include "cocos2d.h" +#include "axmol.h" NS_AX_EXT_BEGIN @@ -66,4 +66,4 @@ private: NS_AX_EXT_END -#endif //__PHYSICSNODES_DEBUGNODE_BOX2D_H__ \ No newline at end of file +#endif //__PHYSICSNODES_DEBUGNODE_BOX2D_H__ diff --git a/templates/cpp-template-default/proj.win32/main.cpp b/templates/cpp-template-default/proj.win32/main.cpp index 1fdf40a681..09df3c0489 100644 --- a/templates/cpp-template-default/proj.win32/main.cpp +++ b/templates/cpp-template-default/proj.win32/main.cpp @@ -24,7 +24,7 @@ #include "main.h" #include "AppDelegate.h" -#include "cocos2d.h" +#include "axmol.h" USING_NS_AX; diff --git a/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp b/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp index f88b0b5d61..e78fb48cca 100644 --- a/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp +++ b/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp @@ -24,7 +24,7 @@ #include "ActionManagerTest.h" #include "../testResource.h" -#include "cocos2d.h" +#include "axmol.h" USING_NS_AX; diff --git a/tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp b/tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp index 906067f203..e772b08907 100644 --- a/tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp +++ b/tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "ActionsTest.h" #include "../testResource.h" -#include "cocos2d.h" +#include "axmol.h" #include "ui/CocosGUI.h" #include "renderer/CCRenderer.h" diff --git a/tests/cpp-tests/Classes/AppDelegate.cpp b/tests/cpp-tests/Classes/AppDelegate.cpp index fe970e8a69..a2a5b032e2 100644 --- a/tests/cpp-tests/Classes/AppDelegate.cpp +++ b/tests/cpp-tests/Classes/AppDelegate.cpp @@ -27,7 +27,7 @@ #include #include "AppDelegate.h" -#include "cocos2d.h" +#include "axmol.h" #include "controller.h" // #include "extensions/cocostudio/CocoStudio.h" #include "extensions/cocos-ext.h" diff --git a/tests/cpp-tests/Classes/AppDelegate.h b/tests/cpp-tests/Classes/AppDelegate.h index 70f97df35c..d2df13cf9b 100644 --- a/tests/cpp-tests/Classes/AppDelegate.h +++ b/tests/cpp-tests/Classes/AppDelegate.h @@ -27,7 +27,7 @@ #ifndef _APP_DELEGATE_H_ #define _APP_DELEGATE_H_ -#include "cocos2d.h" +#include "axmol.h" class TestController; /** diff --git a/tests/cpp-tests/Classes/BaseTest.h b/tests/cpp-tests/Classes/BaseTest.h index 71e33c7c7f..d6821e89cf 100644 --- a/tests/cpp-tests/Classes/BaseTest.h +++ b/tests/cpp-tests/Classes/BaseTest.h @@ -26,7 +26,7 @@ #ifndef _CPPTESTS_BASETEST_H__ #define _CPPTESTS_BASETEST_H__ -#include "cocos2d.h" +#include "axmol.h" #include "extensions/cocos-ext.h" #include "GUI/CCControlExtension/CCControlExtensions.h" #include "GUI/CCScrollView/CCScrollView.h" diff --git a/tests/cpp-tests/Classes/Box2DTest/Box2dTest.h b/tests/cpp-tests/Classes/Box2DTest/Box2dTest.h index 346c727953..5b79551f87 100644 --- a/tests/cpp-tests/Classes/Box2DTest/Box2dTest.h +++ b/tests/cpp-tests/Classes/Box2DTest/Box2dTest.h @@ -26,7 +26,7 @@ #ifndef _BOX2D_TEST_H_ #define _BOX2D_TEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "box2d/box2d.h" #include "../BaseTest.h" #include "extensions/cocos-ext.h" @@ -62,4 +62,4 @@ private: bool showDebugDraw = true; }; -#endif \ No newline at end of file +#endif diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.cpp b/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.cpp index 1e3d66a131..c0ab3ccb9e 100644 --- a/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.cpp +++ b/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.cpp @@ -25,7 +25,7 @@ #include "platform/CCPlatformConfig.h" #include "extensions/cocos-ext.h" #include "ImGui/ImGuiPresenter.h" -#include "cocos2d.h" +#include "axmol.h" #include "Box2DTestBed.h" #include "tests/test.h" @@ -275,4 +275,4 @@ void Box2DTestBed::initPhysics() void Box2DTestBed::onDrawImGui() { m_test->UpdateUI(); -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.h b/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.h index ad41330423..ff5f9bcee2 100644 --- a/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.h +++ b/tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.h @@ -25,7 +25,7 @@ #ifndef _BOX2D_TESTBED_H_ #define _BOX2D_TESTBED_H_ -#include "cocos2d.h" +#include "axmol.h" #include "box2d/box2d.h" #include "../BaseTest.h" diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Test.cpp b/tests/cpp-tests/Classes/Box2DTestBed/Test.cpp index 5ca3c4105d..6b6dfcb704 100644 --- a/tests/cpp-tests/Classes/Box2DTestBed/Test.cpp +++ b/tests/cpp-tests/Classes/Box2DTestBed/Test.cpp @@ -20,7 +20,7 @@ #include "tests/settings.h" #include "extensions/cocos-ext.h" -#include "cocos2d.h" +#include "axmol.h" #include @@ -503,4 +503,4 @@ void Test::DrawAABB(b2AABB* aabb, const b2Color& color) void Test::Flush() { // Flush is unsupported -} \ No newline at end of file +} diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h b/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h index 6be0f66a5a..f97c732664 100644 --- a/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h +++ b/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h @@ -25,7 +25,7 @@ #ifndef __QUESTION_CONTAINER_SPRITE_H__ #define __QUESTION_CONTAINER_SPRITE_H__ -#include "cocos2d.h" +#include "axmol.h" class QuestionContainerSprite : public axis::Sprite { diff --git a/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h b/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h index ef7b77008a..8984a6f11f 100644 --- a/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h +++ b/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h @@ -29,7 +29,7 @@ #ifndef __CHIPMUNKTEST_H__ #define __CHIPMUNKTEST_H__ -#include "cocos2d.h" +#include "axmol.h" #include "chipmunk/chipmunk.h" #include "../BaseTest.h" #include "extensions/cocos-ext.h" diff --git a/tests/cpp-tests/Classes/ChipmunkTestBed/ChipmunkTestBed.h b/tests/cpp-tests/Classes/ChipmunkTestBed/ChipmunkTestBed.h index 89c2a6a2a0..19bb9840ed 100644 --- a/tests/cpp-tests/Classes/ChipmunkTestBed/ChipmunkTestBed.h +++ b/tests/cpp-tests/Classes/ChipmunkTestBed/ChipmunkTestBed.h @@ -26,7 +26,7 @@ #ifndef __CHIPMUNKTESTBED_H__ #define __CHIPMUNKTESTBED_H__ -#include "cocos2d.h" +#include "axmol.h" #include "chipmunk/chipmunk.h" #include "../BaseTest.h" #include "extensions/cocos-ext.h" diff --git a/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp b/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp index 346b3143f2..030db7e521 100644 --- a/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp +++ b/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp @@ -24,7 +24,7 @@ #include "ConfigurationTest.h" #include "../testResource.h" -#include "cocos2d.h" +#include "axmol.h" USING_NS_AX; diff --git a/tests/cpp-tests/Classes/CurlTest/CurlTest.h b/tests/cpp-tests/Classes/CurlTest/CurlTest.h index 9b4ce12494..2755ea63d8 100644 --- a/tests/cpp-tests/Classes/CurlTest/CurlTest.h +++ b/tests/cpp-tests/Classes/CurlTest/CurlTest.h @@ -25,7 +25,7 @@ #ifndef _CURL_TEST_H_ #define _CURL_TEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" DEFINE_TEST_SUITE(CurlTests); diff --git a/tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h b/tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h index b6bb716ef7..75f52c9ae6 100644 --- a/tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h +++ b/tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h @@ -25,7 +25,7 @@ #ifndef _CURRENT_LANGUAGE_TEST_H_ #define _CURRENT_LANGUAGE_TEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" DEFINE_TEST_SUITE(CurrentLanguageTests); diff --git a/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h b/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h index 9602c8fcdd..82366c45bf 100644 --- a/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h +++ b/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h @@ -23,7 +23,7 @@ ****************************************************************************/ #pragma once -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" #include diff --git a/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h b/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h index 019cfa7e68..ec089874b6 100644 --- a/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h +++ b/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h @@ -25,7 +25,7 @@ #ifndef _EFFECT_ADVANCED_TEST_H_ #define _EFFECT_ADVANCED_TEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" DEFINE_TEST_SUITE(EffectAdvanceTests); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.cpp index bdc74eb7e0..16f58565bb 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.cpp @@ -24,7 +24,7 @@ #include "AssetsManagerExTest.h" #include "../../testResource.h" -#include "cocos2d.h" +#include "axmol.h" USING_NS_AX; USING_NS_AX_EXT; diff --git a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h index 9bf1f26130..c975681196 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h @@ -25,7 +25,7 @@ #ifndef __CUSTOMTABELVIEWCELL_H__ #define __CUSTOMTABELVIEWCELL_H__ -#include "cocos2d.h" +#include "axmol.h" #include "extensions/cocos-ext.h" #include "GUI/CCControlExtension/CCControlExtensions.h" #include "GUI/CCScrollView/CCScrollView.h" diff --git a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h index 73636868e8..e47d075b2e 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h @@ -25,7 +25,7 @@ #ifndef __TABLEVIEWTESTSCENE_H__ #define __TABLEVIEWTESTSCENE_H__ -#include "cocos2d.h" +#include "axmol.h" #include "extensions/cocos-ext.h" #include "BaseTest.h" diff --git a/tests/cpp-tests/Classes/FontTest/FontTest.h b/tests/cpp-tests/Classes/FontTest/FontTest.h index e7faad776e..f9ccf2fea1 100644 --- a/tests/cpp-tests/Classes/FontTest/FontTest.h +++ b/tests/cpp-tests/Classes/FontTest/FontTest.h @@ -25,7 +25,7 @@ #ifndef _FONT_TEST_H_ #define _FONT_TEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" DEFINE_TEST_SUITE(FontTests); diff --git a/tests/cpp-tests/Classes/ImGuiTest/ImGuiTest.h b/tests/cpp-tests/Classes/ImGuiTest/ImGuiTest.h index 8bfb701ccf..4aea460801 100644 --- a/tests/cpp-tests/Classes/ImGuiTest/ImGuiTest.h +++ b/tests/cpp-tests/Classes/ImGuiTest/ImGuiTest.h @@ -27,7 +27,7 @@ #ifndef _IMGUIEXT_TEST_H_ #define _IMGUIEXT_TEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" #if defined(AX_PLATFORM_PC) || (AX_TARGET_PLATFORM == AX_PLATFORM_ANDROID) diff --git a/tests/cpp-tests/Classes/InputTest/MouseTest.h b/tests/cpp-tests/Classes/InputTest/MouseTest.h index 274d836593..eedba010ac 100644 --- a/tests/cpp-tests/Classes/InputTest/MouseTest.h +++ b/tests/cpp-tests/Classes/InputTest/MouseTest.h @@ -25,7 +25,7 @@ #ifndef __MOUSE_TEST_H_ #define __MOUSE_TEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" DEFINE_TEST_SUITE(MouseTests); diff --git a/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp b/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp index 3fc4908e68..3b38eec15a 100644 --- a/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp +++ b/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp @@ -30,7 +30,7 @@ #include #include "../testResource.h" -#include "cocos2d.h" +#include "axmol.h" #include "ui/CocosGUI.h" USING_NS_AX; diff --git a/tests/cpp-tests/Classes/MenuTest/MenuTest.h b/tests/cpp-tests/Classes/MenuTest/MenuTest.h index 3089718777..5f41fd1e34 100644 --- a/tests/cpp-tests/Classes/MenuTest/MenuTest.h +++ b/tests/cpp-tests/Classes/MenuTest/MenuTest.h @@ -27,7 +27,7 @@ #ifndef _MENU_TEST_H_ #define _MENU_TEST_H_ -////----#include "cocos2d.h" +////----#include "axmol.h" #include "../BaseTest.h" DEFINE_TEST_SUITE(MenuTests); diff --git a/tests/cpp-tests/Classes/MeshRendererTest/DrawNode3D.h b/tests/cpp-tests/Classes/MeshRendererTest/DrawNode3D.h index 8f9308ea50..3b59a38175 100644 --- a/tests/cpp-tests/Classes/MeshRendererTest/DrawNode3D.h +++ b/tests/cpp-tests/Classes/MeshRendererTest/DrawNode3D.h @@ -26,7 +26,7 @@ #ifndef __DRAW_NODE_3D_H__ #define __DRAW_NODE_3D_H__ -#include "cocos2d.h" +#include "axmol.h" NS_AX_BEGIN diff --git a/tests/cpp-tests/Classes/NetworkTest/HttpClientTest/HttpClientTest.h b/tests/cpp-tests/Classes/NetworkTest/HttpClientTest/HttpClientTest.h index 1ac04b3049..1de57b107a 100644 --- a/tests/cpp-tests/Classes/NetworkTest/HttpClientTest/HttpClientTest.h +++ b/tests/cpp-tests/Classes/NetworkTest/HttpClientTest/HttpClientTest.h @@ -25,7 +25,7 @@ #ifndef __HTTP_CLIENT_H__ #define __HTTP_CLIENT_H__ -#include "cocos2d.h" +#include "axmol.h" #include "extensions/cocos-ext.h" #include "network/HttpClient.h" #include "BaseTest.h" diff --git a/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h b/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h index 4f9b39b513..130da878aa 100644 --- a/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h +++ b/tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h @@ -29,7 +29,7 @@ #ifndef __NEWAUDIOENGINE_TEST_H_ # define __NEWAUDIOENGINE_TEST_H_ -# include "cocos2d.h" +# include "axmol.h" # include "../BaseTest.h" # include "audio/AudioEngine.h" diff --git a/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h b/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h index a4c40c6a6e..ed2617e338 100644 --- a/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h +++ b/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h @@ -33,7 +33,7 @@ #ifndef __samples__NewEventDispatcherTest__ #define __samples__NewEventDispatcherTest__ -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" DEFINE_TEST_SUITE(EventDispatcherTests); diff --git a/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h b/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h index cf1990ef7e..e449c8a543 100644 --- a/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h +++ b/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h @@ -25,7 +25,7 @@ #ifndef __NewRendererTest_H_ #define __NewRendererTest_H_ -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" #define kTagSpriteBatchNode 100 diff --git a/tests/cpp-tests/Classes/NodeTest/NodeTest.h b/tests/cpp-tests/Classes/NodeTest/NodeTest.h index 07f2aa7c6e..37055e2f6b 100644 --- a/tests/cpp-tests/Classes/NodeTest/NodeTest.h +++ b/tests/cpp-tests/Classes/NodeTest/NodeTest.h @@ -27,7 +27,7 @@ #ifndef _NODE_TEST_H_ #define _NODE_TEST_H_ -////----#include "cocos2d.h" +////----#include "axmol.h" #include "../BaseTest.h" DEFINE_TEST_SUITE(CocosNodeTests); diff --git a/tests/cpp-tests/Classes/OpenURLTest/OpenURLTest.h b/tests/cpp-tests/Classes/OpenURLTest/OpenURLTest.h index a1ff03e03a..dbe716bfe6 100644 --- a/tests/cpp-tests/Classes/OpenURLTest/OpenURLTest.h +++ b/tests/cpp-tests/Classes/OpenURLTest/OpenURLTest.h @@ -25,7 +25,7 @@ #ifndef _OPEN_URL_TEST_H_ #define _OPEN_URL_TEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" DEFINE_TEST_SUITE(OpenURLTests); diff --git a/tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp b/tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp index 6bca59e686..168f183495 100644 --- a/tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp +++ b/tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp @@ -325,10 +325,10 @@ bool Physics3DKinematicDemo::init() rbDes.shape = Physics3DShape::createMesh(&trianglesList[0], (int)trianglesList.size() / 3); auto rigidBody = Physics3DRigidBody::create(&rbDes); auto component = Physics3DComponent::create(rigidBody); - auto sprite = Sprite3D::create(tree1); + auto sprite = MeshRenderer::create(tree1); sprite->addComponent(component); - static_cast(sprite->getChildren().at(1))->getMaterial(0)->setTransparent(true); - static_cast(sprite->getChildren().at(1))->getMaterial(0)->getStateBlock().setCullFaceSide(CullFaceSide::NONE); + static_cast(sprite->getChildren().at(1))->getMaterial(0)->setTransparent(true); + static_cast(sprite->getChildren().at(1))->getMaterial(0)->getStateBlock().setCullFaceSide(CullFaceSide::NONE); sprite->setCameraMask((unsigned short)CameraFlag::USER1 | (unsigned short)CameraFlag::USER2 | (unsigned short)CameraFlag::USER3); sprite->setPosition3D(Vec3(20.0f, 0.0f, 0.0f)); sprite->setScale(scale); diff --git a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h index 81d194f9e2..5bd99f563c 100644 --- a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h +++ b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h @@ -25,7 +25,7 @@ #ifndef _RENDERTEXTURE_TEST_H_ #define _RENDERTEXTURE_TEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "renderer/backend/DepthStencilState.h" #include "../BaseTest.h" diff --git a/tests/cpp-tests/Classes/SceneTest/SceneTest.h b/tests/cpp-tests/Classes/SceneTest/SceneTest.h index f46b854151..d995455f44 100644 --- a/tests/cpp-tests/Classes/SceneTest/SceneTest.h +++ b/tests/cpp-tests/Classes/SceneTest/SceneTest.h @@ -25,7 +25,7 @@ #ifndef _SCENE_TEST_H_ #define _SCENE_TEST_H_ -////----#include "cocos2d.h" +////----#include "axmol.h" #include "../BaseTest.h" DEFINE_TEST_SUITE(SceneTests); diff --git a/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h b/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h index 2ad24dcb6e..6c7f33e758 100644 --- a/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h +++ b/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h @@ -25,7 +25,7 @@ #ifndef _SCHEDULER_TEST_H_ #define _SCHEDULER_TEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "extensions/cocos-ext.h" #include "../BaseTest.h" diff --git a/tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp b/tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp index 6dabc7eaea..aeaa6d4052 100644 --- a/tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp +++ b/tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp @@ -24,7 +24,7 @@ #include "ShaderTest.h" #include "../testResource.h" -#include "cocos2d.h" +#include "axmol.h" #include "renderer/ccShaders.h" #include "renderer/backend/Device.h" diff --git a/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp b/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp index 56dcbfeb12..db02129cb6 100644 --- a/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp +++ b/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp @@ -26,7 +26,7 @@ #include "ShaderTest2.h" #include "ShaderTest.h" #include "../testResource.h" -#include "cocos2d.h" +#include "axmol.h" #include "renderer/backend/Device.h" #include diff --git a/tests/cpp-tests/Classes/SpineTest/SpineTest.h b/tests/cpp-tests/Classes/SpineTest/SpineTest.h index bd35e0fc84..bd2436515e 100644 --- a/tests/cpp-tests/Classes/SpineTest/SpineTest.h +++ b/tests/cpp-tests/Classes/SpineTest/SpineTest.h @@ -26,7 +26,7 @@ #ifndef _SPINETEST_H_ #define _SPINETEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" #include diff --git a/tests/cpp-tests/Classes/SpriteFrameCacheTest/SpriteFrameCacheTest.h b/tests/cpp-tests/Classes/SpriteFrameCacheTest/SpriteFrameCacheTest.h index 1bc73b1524..7d72d865ef 100644 --- a/tests/cpp-tests/Classes/SpriteFrameCacheTest/SpriteFrameCacheTest.h +++ b/tests/cpp-tests/Classes/SpriteFrameCacheTest/SpriteFrameCacheTest.h @@ -25,7 +25,7 @@ #pragma once -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" DEFINE_TEST_SUITE(SpriteFrameCacheTests); diff --git a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h index c2e6f5495b..335f32ede3 100644 --- a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h +++ b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h @@ -26,7 +26,7 @@ #ifndef _SPRITE_TEST_H_ #define _SPRITE_TEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" #include diff --git a/tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h b/tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h index 834d77e260..92ae43399c 100644 --- a/tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h +++ b/tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h @@ -25,7 +25,7 @@ #ifndef _TEXTURECACHE_TEST_H_ #define _TEXTURECACHE_TEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" DEFINE_TEST_SUITE(TextureCacheTests); diff --git a/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h b/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h index 976d60dcae..cbce9c4579 100644 --- a/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h +++ b/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h @@ -25,7 +25,7 @@ #ifndef _TextureAtlasEncryption_TEST_H_ #define _TextureAtlasEncryption_TEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" #include diff --git a/tests/cpp-tests/Classes/TouchesTest/Ball.h b/tests/cpp-tests/Classes/TouchesTest/Ball.h index 73adf8c8b8..9a1bc64443 100644 --- a/tests/cpp-tests/Classes/TouchesTest/Ball.h +++ b/tests/cpp-tests/Classes/TouchesTest/Ball.h @@ -25,7 +25,7 @@ #ifndef _BALL_H_ #define _BALL_H_ -#include "cocos2d.h" +#include "axmol.h" class Paddle; diff --git a/tests/cpp-tests/Classes/TouchesTest/Paddle.h b/tests/cpp-tests/Classes/TouchesTest/Paddle.h index 750ea599bc..1ba14e8a62 100644 --- a/tests/cpp-tests/Classes/TouchesTest/Paddle.h +++ b/tests/cpp-tests/Classes/TouchesTest/Paddle.h @@ -25,7 +25,7 @@ #ifndef _PADDLE_H_ #define _PADDLE_H_ -#include "cocos2d.h" +#include "axmol.h" typedef enum tagPaddleState { diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp index d061f7456e..00f382958d 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ #include "UIPageViewTest.h" -#include "cocos2d.h" +#include "axmol.h" USING_NS_AX; using namespace ax::ui; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.h index 52f32c279b..626f3446a5 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.h @@ -26,7 +26,7 @@ #ifndef __TestCpp__UIScene__ #define __TestCpp__UIScene__ -#include "cocos2d.h" +#include "axmol.h" #include "extensions/cocos-ext.h" #include "ui/CocosGUI.h" #include "BaseTest.h" diff --git a/tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h b/tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h index 476429d832..b88928edfe 100644 --- a/tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h +++ b/tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h @@ -25,7 +25,7 @@ #ifndef _USERDEFAULT_TEST_H_ #define _USERDEFAULT_TEST_H_ -#include "cocos2d.h" +#include "axmol.h" #include "../BaseTest.h" #include "2d/CCLabel.h" diff --git a/tests/cpp-tests/Classes/VibrateTest/VibrateTest.h b/tests/cpp-tests/Classes/VibrateTest/VibrateTest.h index 59d3ec295b..1522f736b8 100644 --- a/tests/cpp-tests/Classes/VibrateTest/VibrateTest.h +++ b/tests/cpp-tests/Classes/VibrateTest/VibrateTest.h @@ -28,7 +28,7 @@ #ifndef __VIBRATE_TEST_H_ # define __VIBRATE_TEST_H_ -# include "cocos2d.h" +# include "axmol.h" # include "../BaseTest.h" DEFINE_TEST_SUITE(VibrateTests); diff --git a/tests/cpp-tests/Classes/VisibleRect.h b/tests/cpp-tests/Classes/VisibleRect.h index 96f116090e..a587747c7e 100644 --- a/tests/cpp-tests/Classes/VisibleRect.h +++ b/tests/cpp-tests/Classes/VisibleRect.h @@ -25,7 +25,7 @@ #ifndef __VISIBLERECT_H__ #define __VISIBLERECT_H__ -#include "cocos2d.h" +#include "axmol.h" class VisibleRect { diff --git a/tests/cpp-tests/Classes/testBasic.h b/tests/cpp-tests/Classes/testBasic.h index 30880b9535..97d7486e36 100644 --- a/tests/cpp-tests/Classes/testBasic.h +++ b/tests/cpp-tests/Classes/testBasic.h @@ -25,7 +25,7 @@ #ifndef _TEST_BASIC_H_ #define _TEST_BASIC_H_ -#include "cocos2d.h" +#include "axmol.h" #include "VisibleRect.h" /**