add axmol_ext.h (#1117)

extensions/ExtensionExport.h

@@ -22,8 +22,8 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#ifndef __CCEXTENSIONEXPORT_H__
+#ifndef __EXTENSIONEXPORT_H__
-#define __CCEXTENSIONEXPORT_H__
+#define __EXTENSIONEXPORT_H__
 
 #if (defined(WIN32) && defined(_WINDOWS)) || defined(WINRT) || defined(WP8)
 #    ifdef __MINGW32__
@@ -54,4 +54,4 @@
 #    define AX_EX_DLL
 #endif
 
-#endif /* __CCEXTENSIONEXPORT_H__*/
+#endif /* __EXTENSIONEXPORT_H__*/

extensions/axmol-ext.h

@@ -0,0 +1,49 @@
+/****************************************************************************
+ Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+
+ https://axmolengine.github.io/
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+#ifndef __AXMOL_EXT_H__
+#define __AXMOL_EXT_H__
+
+#include "ExtensionMacros.h"
+
+// Physics integration
+#include "physics-nodes/CCPhysicsDebugNode.h"
+#include "physics-nodes/CCPhysicsDebugNodeBox2D.h"
+#include "physics-nodes/CCPhysicsDebugNodeChipmunk2D.h"
+#include "physics-nodes/CCPhysicsSprite.h"
+#include "physics-nodes/CCPhysicsSpriteBox2D.h"
+#include "physics-nodes/CCPhysicsSpriteChipmunk2D.h"
+
+#include "assets-manager/AssetsManager.h"
+#include "assets-manager/AssetsManagerEx.h"
+#include "assets-manager/CCEventAssetsManagerEx.h"
+#include "assets-manager/CCEventListenerAssetsManagerEx.h"
+#include "assets-manager/Manifest.h"
+
+// Particle System, include Particle Universe Particle System
+#include "Particle3D/CCParticle3DRender.h"
+#include "Particle3D/CCParticleSystem3D.h"
+#include "Particle3D/PU/CCPUParticleSystem3D.h"
+
+#endif /* __AXMOL_EXT_H__ */

extensions/cocos-ext.h

@@ -25,25 +25,6 @@
 #ifndef __COCOS2D_EXT_H__
 #define __COCOS2D_EXT_H__
 
-#include "ExtensionMacros.h"
+#include "axmol-ext.h"
-
-// Physics integration
-#include "physics-nodes/CCPhysicsDebugNode.h"
-#include "physics-nodes/CCPhysicsDebugNodeBox2D.h"
-#include "physics-nodes/CCPhysicsDebugNodeChipmunk2D.h"
-#include "physics-nodes/CCPhysicsSprite.h"
-#include "physics-nodes/CCPhysicsSpriteBox2D.h"
-#include "physics-nodes/CCPhysicsSpriteChipmunk2D.h"
-
-#include "assets-manager/AssetsManager.h"
-#include "assets-manager/AssetsManagerEx.h"
-#include "assets-manager/CCEventAssetsManagerEx.h"
-#include "assets-manager/CCEventListenerAssetsManagerEx.h"
-#include "assets-manager/Manifest.h"
-
-// Particle System, include Particle Universe Particle System
-#include "Particle3D/CCParticle3DRender.h"
-#include "Particle3D/CCParticleSystem3D.h"
-#include "Particle3D/PU/CCPUParticleSystem3D.h"
 
 #endif /* __COCOS2D_EXT_H__ */

extensions/scripting/lua-bindings/auto/axlua_extension_auto.cpp

@@ -1,5 +1,5 @@
 #include "scripting/lua-bindings/auto/axlua_extension_auto.hpp"
-#include "cocos-ext.h"
+#include "axmol-ext.h"
 #include "scripting/lua-bindings/manual/tolua_fix.h"
 #include "scripting/lua-bindings/manual/LuaBasicConversions.h"
 

extensions/scripting/lua-bindings/manual/extension/axlua_extension_manual.cpp

@@ -28,7 +28,7 @@
 #include "scripting/lua-bindings/manual/tolua_fix.h"
 #include "scripting/lua-bindings/manual/LuaBasicConversions.h"
 #include "scripting/lua-bindings/manual/CCLuaValue.h"
-#include "cocos-ext.h"
+#include "axmol-ext.h"
 #include "scripting/lua-bindings/manual/CCLuaEngine.h"
 #include "scripting/lua-bindings/manual/base/LuaScriptHandlerMgr.h"
 

tests/cpp-tests/Source/AppDelegate.cpp

@@ -30,7 +30,7 @@
 #include "axmol.h"
 #include "controller.h"
 #include "BaseTest.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 
 USING_NS_AX;
 

tests/cpp-tests/Source/BaseTest.h

@@ -27,7 +27,7 @@
 #define _CPPTESTS_BASETEST_H__
 
 #include "axmol.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 #include "GUI/CCControlExtension/CCControlExtensions.h"
 #include "GUI/CCScrollView/CCScrollView.h"
 #include "GUI/CCScrollView/CCTableView.h"

tests/cpp-tests/Source/Box2DTest/Box2dTest.cpp

@@ -25,7 +25,7 @@
 
 #include "Box2dTest.h"
 #include "../testResource.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 #include "renderer/CCRenderer.h"
 #include "renderer/CCCustomCommand.h"
 

tests/cpp-tests/Source/Box2DTest/Box2dTest.h

@@ -29,7 +29,7 @@
 #include "axmol.h"
 #include "box2d/box2d.h"
 #include "../BaseTest.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 
 DEFINE_TEST_SUITE(Box2DTests);
 

tests/cpp-tests/Source/Box2DTestBed/Box2DTestBed.cpp

@@ -23,7 +23,7 @@
  ****************************************************************************/
 
 #include "platform/CCPlatformConfig.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 #include "ImGui/ImGuiPresenter.h"
 #include "axmol.h"
 

tests/cpp-tests/Source/Box2DTestBed/test.cpp

@@ -19,7 +19,7 @@
 #include "tests/test.h"
 #include "tests/settings.h"
 
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 #include "axmol.h"
 
 #include <stdio.h>

tests/cpp-tests/Source/Box2DTestBed/tests/car.cpp

@@ -22,7 +22,7 @@
 // SOFTWARE.
 
 #include "test.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 
 USING_NS_AX_EXT;
 

tests/cpp-tests/Source/Box2DTestBed/tests/test.h

@@ -20,7 +20,7 @@
 #define TEST_H
 
 #include "box2d/box2d.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 
 #include <cstdlib>
 

tests/cpp-tests/Source/ChipmunkTest/ChipmunkTest.h

@@ -32,7 +32,7 @@
 #include "axmol.h"
 #include "chipmunk/chipmunk.h"
 #include "../BaseTest.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 
 class ChipmunkTest : public TestCase
 {
@@ -58,6 +58,7 @@ private:
 
     cpSpace* _space;  // strong ref
     cpShape* _walls[4];
+    ax::DrawNode* drawNode;
 };
 
 DEFINE_TEST_SUITE(ChipmunkTests);

tests/cpp-tests/Source/ChipmunkTestBed/ChipmunkTestBed.h

@@ -29,7 +29,7 @@
 #include "axmol.h"
 #include "chipmunk/chipmunk.h"
 #include "../BaseTest.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 
 #include "demo/ChipmunkDemo.h"
 

tests/cpp-tests/Source/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.h

@@ -25,7 +25,7 @@
 #ifndef __AssetsManagerEx_Test_H__
 #define __AssetsManagerEx_Test_H__
 
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 #include "../../BaseTest.h"
 
 DEFINE_TEST_SUITE(AssetsManagerExTests);

tests/cpp-tests/Source/ExtensionsTest/TableViewTest/CustomTableViewCell.h

@@ -26,7 +26,7 @@
 #define __CUSTOMTABELVIEWCELL_H__
 
 #include "axmol.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 #include "GUI/CCControlExtension/CCControlExtensions.h"
 #include "GUI/CCScrollView/CCScrollView.h"
 #include "GUI/CCScrollView/CCTableView.h"

tests/cpp-tests/Source/ExtensionsTest/TableViewTest/TableViewTestScene.h

@@ -26,7 +26,7 @@
 #define __TABLEVIEWTESTSCENE_H__
 
 #include "axmol.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 #include "BaseTest.h"
 
 DEFINE_TEST_SUITE(TableViewTests);

tests/cpp-tests/Source/LabelTest/LabelTestNew.h

@@ -28,7 +28,7 @@
 #include "../BaseTest.h"
 #include "renderer/CCCustomCommand.h"
 #include "ui/CocosGUI.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 #include "cocostudio/LocalizationManager.h"
 
 DEFINE_TEST_SUITE(NewLabelTests);

tests/cpp-tests/Source/NetworkTest/HttpClientTest/HttpClientTest.h

@@ -26,7 +26,7 @@
 #define __HTTP_CLIENT_H__
 
 #include "axmol.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 #include "network/HttpClient.h"
 #include "BaseTest.h"
 

tests/cpp-tests/Source/SchedulerTest/SchedulerTest.h

@@ -26,7 +26,7 @@
 #define _SCHEDULER_TEST_H_
 
 #include "axmol.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 #include "../BaseTest.h"
 
 DEFINE_TEST_SUITE(SchedulerTests);

tests/cpp-tests/Source/ShaderTest/ShaderTest.h

@@ -26,7 +26,7 @@
 
 #include "ui/CocosGUI.h"
 
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 #include "../BaseTest.h"
 
 DEFINE_TEST_SUITE(ShaderTests);

tests/cpp-tests/Source/ShaderTest/ShaderTest2.h

@@ -25,7 +25,7 @@
 #ifndef _SHADER_TEST2_H_
 #define _SHADER_TEST2_H_
 
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 #include "../BaseTest.h"
 
 DEFINE_TEST_SUITE(Shader2Tests);

tests/cpp-tests/Source/UITest/CocoStudioGUITest/UIScene.cpp

@@ -22,7 +22,7 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 #include "UIScene.h"
 #include "UISceneManager.h"
 #include "cocostudio/CCSGUIReader.h"

tests/cpp-tests/Source/UITest/CocoStudioGUITest/UIScene.h

@@ -27,7 +27,7 @@
 #define __TestCpp__UIScene__
 
 #include "axmol.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 #include "ui/CocosGUI.h"
 #include "BaseTest.h"
 

tests/lua-tests/Source/lua_assetsmanager_test_sample.cpp

@@ -27,7 +27,7 @@
 #include "scripting/lua-bindings/manual/tolua_fix.h"
 
 #include "cocos2d.h"
-#include "extensions/cocos-ext.h"
+#include "extensions/axmol-ext.h"
 
 #if !defined(_WIN32)
 #    include <dirent.h>