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

rename cocos2d to axmol (#920) 

* rename cocos2d to axmol

* rename cocos2d.h to axmol.h

* Update Physics3DTest.cpp

replace Sprite3D -> MeshRenderer
This commit is contained in:
aismann 2022-10-11 18:15:09 +02:00 committed by GitHub
parent fb227f352f
commit 3ef8ac63f2
57 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/2d/CCPlistSpriteSheetLoader.cpp
View File

@ -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

4
core/base/CCConfiguration.cpp
View File

@ -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

2
core/base/SimpleTimer.cpp
View File

@ -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: \

2
core/ui/LayoutHelper.h
View File

@ -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

4
extensions/physics-nodes/CCPhysicsDebugNodeBox2D.h
View File

@ -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__
#endif //__PHYSICSNODES_DEBUGNODE_BOX2D_H__

2
templates/cpp-template-default/proj.win32/main.cpp
View File

@ -24,7 +24,7 @@
#include "main.h"
#include "AppDelegate.h"
#include "cocos2d.h"
#include "axmol.h"
USING_NS_AX;

2
tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp
View File

@ -24,7 +24,7 @@
#include "ActionManagerTest.h"
#include "../testResource.h"
#include "cocos2d.h"
#include "axmol.h"
USING_NS_AX;

2
tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp
View File

@ -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"

2
tests/cpp-tests/Classes/AppDelegate.cpp
View File

@ -27,7 +27,7 @@
#include <string>
#include "AppDelegate.h"
#include "cocos2d.h"
#include "axmol.h"
#include "controller.h"
// #include "extensions/cocostudio/CocoStudio.h"
#include "extensions/cocos-ext.h"

2
tests/cpp-tests/Classes/AppDelegate.h
View File

@ -27,7 +27,7 @@
#ifndef _APP_DELEGATE_H_
#define _APP_DELEGATE_H_
#include "cocos2d.h"
#include "axmol.h"
class TestController;
/**

2
tests/cpp-tests/Classes/BaseTest.h
View File

@ -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"

4
tests/cpp-tests/Classes/Box2DTest/Box2dTest.h
View File

@ -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
#endif

4
tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.cpp
View File

@ -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();
}
}

2
tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.h
View File

@ -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"

4
tests/cpp-tests/Classes/Box2DTestBed/Test.cpp
View File

@ -20,7 +20,7 @@
#include "tests/settings.h"
#include "extensions/cocos-ext.h"
#include "cocos2d.h"
#include "axmol.h"
#include <stdio.h>
@ -503,4 +503,4 @@ void Test::DrawAABB(b2AABB* aabb, const b2Color& color)
void Test::Flush()
{
// Flush is unsupported
}
}

2
tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h
View File

@ -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
{

2
tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h
View File

@ -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"

2
tests/cpp-tests/Classes/ChipmunkTestBed/ChipmunkTestBed.h
View File

@ -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"

2
tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp
View File

@ -24,7 +24,7 @@
#include "ConfigurationTest.h"
#include "../testResource.h"
#include "cocos2d.h"
#include "axmol.h"
USING_NS_AX;

2
tests/cpp-tests/Classes/CurlTest/CurlTest.h
View File

@ -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);

2
tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h
View File

@ -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);

2
tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h
View File

@ -23,7 +23,7 @@
****************************************************************************/
#pragma once
#include "cocos2d.h"
#include "axmol.h"
#include "../BaseTest.h"
#include <string>

2
tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h
View File

@ -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);

2
tests/cpp-tests/Classes/ExtensionsTest/AssetsManagerExTest/AssetsManagerExTest.cpp
View File

@ -24,7 +24,7 @@
#include "AssetsManagerExTest.h"
#include "../../testResource.h"
#include "cocos2d.h"
#include "axmol.h"
USING_NS_AX;
USING_NS_AX_EXT;

2
tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h
View File

@ -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"

2
tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h
View File

@ -25,7 +25,7 @@
#ifndef __TABLEVIEWTESTSCENE_H__
#define __TABLEVIEWTESTSCENE_H__
#include "cocos2d.h"
#include "axmol.h"
#include "extensions/cocos-ext.h"
#include "BaseTest.h"

2
tests/cpp-tests/Classes/FontTest/FontTest.h
View File

@ -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);

2
tests/cpp-tests/Classes/ImGuiTest/ImGuiTest.h
View File

@ -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)

2
tests/cpp-tests/Classes/InputTest/MouseTest.h
View File

@ -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);

2
tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp
View File

@ -30,7 +30,7 @@
#include <spine/spine-cocos2dx.h>
#include "../testResource.h"
#include "cocos2d.h"
#include "axmol.h"
#include "ui/CocosGUI.h"
USING_NS_AX;

2
tests/cpp-tests/Classes/MenuTest/MenuTest.h
View File

@ -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);

2
tests/cpp-tests/Classes/MeshRendererTest/DrawNode3D.h
View File

@ -26,7 +26,7 @@
#ifndef __DRAW_NODE_3D_H__
#define __DRAW_NODE_3D_H__
#include "cocos2d.h"
#include "axmol.h"
NS_AX_BEGIN

2
tests/cpp-tests/Classes/NetworkTest/HttpClientTest/HttpClientTest.h
View File

@ -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"

2
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
View File

@ -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"

2
tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h
View File

@ -33,7 +33,7 @@
#ifndef __samples__NewEventDispatcherTest__
#define __samples__NewEventDispatcherTest__
#include "cocos2d.h"
#include "axmol.h"
#include "../BaseTest.h"
DEFINE_TEST_SUITE(EventDispatcherTests);

2
tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h
View File

@ -25,7 +25,7 @@
#ifndef __NewRendererTest_H_
#define __NewRendererTest_H_
#include "cocos2d.h"
#include "axmol.h"
#include "../BaseTest.h"
#define kTagSpriteBatchNode 100

2
tests/cpp-tests/Classes/NodeTest/NodeTest.h
View File

@ -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);

2
tests/cpp-tests/Classes/OpenURLTest/OpenURLTest.h
View File

@ -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);

6
tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp
View File

@ -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<Sprite3D*>(sprite->getChildren().at(1))->getMaterial(0)->setTransparent(true);
static_cast<Sprite3D*>(sprite->getChildren().at(1))->getMaterial(0)->getStateBlock().setCullFaceSide(CullFaceSide::NONE);
static_cast<MeshRenderer*>(sprite->getChildren().at(1))->getMaterial(0)->setTransparent(true);
static_cast<MeshRenderer*>(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);

2
tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
View File

@ -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"

2
tests/cpp-tests/Classes/SceneTest/SceneTest.h
View File

@ -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);

2
tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h
View File

@ -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"

2
tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp
View File

@ -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"

2
tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp
View File

@ -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 <tuple>

2
tests/cpp-tests/Classes/SpineTest/SpineTest.h
View File

@ -26,7 +26,7 @@
#ifndef _SPINETEST_H_
#define _SPINETEST_H_
#include "cocos2d.h"
#include "axmol.h"
#include "../BaseTest.h"
#include <spine/spine-cocos2dx.h>

2
tests/cpp-tests/Classes/SpriteFrameCacheTest/SpriteFrameCacheTest.h
View File

@ -25,7 +25,7 @@
#pragma once
#include "cocos2d.h"
#include "axmol.h"
#include "../BaseTest.h"
DEFINE_TEST_SUITE(SpriteFrameCacheTests);

2
tests/cpp-tests/Classes/SpriteTest/SpriteTest.h
View File

@ -26,7 +26,7 @@
#ifndef _SPRITE_TEST_H_
#define _SPRITE_TEST_H_
#include "cocos2d.h"
#include "axmol.h"
#include "../BaseTest.h"
#include <string>

2
tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h
View File

@ -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);

2
tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h
View File

@ -25,7 +25,7 @@
#ifndef _TextureAtlasEncryption_TEST_H_
#define _TextureAtlasEncryption_TEST_H_
#include "cocos2d.h"
#include "axmol.h"
#include "../BaseTest.h"
#include <string>

2
tests/cpp-tests/Classes/TouchesTest/Ball.h
View File

@ -25,7 +25,7 @@
#ifndef _BALL_H_
#define _BALL_H_
#include "cocos2d.h"
#include "axmol.h"
class Paddle;

2
tests/cpp-tests/Classes/TouchesTest/Paddle.h
View File

@ -25,7 +25,7 @@
#ifndef _PADDLE_H_
#define _PADDLE_H_
#include "cocos2d.h"
#include "axmol.h"
typedef enum tagPaddleState
{

2
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp
View File

@ -23,7 +23,7 @@
****************************************************************************/
#include "UIPageViewTest.h"
#include "cocos2d.h"
#include "axmol.h"
USING_NS_AX;
using namespace ax::ui;

2
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScene.h
View File

@ -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"

2
tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h
View File

@ -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"

2
tests/cpp-tests/Classes/VibrateTest/VibrateTest.h
View File

@ -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);

2
tests/cpp-tests/Classes/VisibleRect.h
View File

@ -25,7 +25,7 @@
#ifndef __VISIBLERECT_H__
#define __VISIBLERECT_H__
#include "cocos2d.h"
#include "axmol.h"
class VisibleRect
{

2
tests/cpp-tests/Classes/testBasic.h
View File

@ -25,7 +25,7 @@
#ifndef _TEST_BASIC_H_
#define _TEST_BASIC_H_
#include "cocos2d.h"
#include "axmol.h"
#include "VisibleRect.h"
/**