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

Migrate engine namespace to `axis`(abbv: `ax`) (#743)

This commit is contained in:
涓€绾跨伒 2022-07-11 17:50:21 +08:00 committed by GitHub
parent cb45692a0d
commit bf77f46dce
1727 changed files with 19734 additions and 19736 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/2d/CCAction.cpp
View File

@ -32,7 +32,7 @@ THE SOFTWARE.
#include "base/CCDirector.h"
#include "base/ccUTF8.h"
NS_CC_BEGIN
NS_AX_BEGIN
//
// Action Base Class
//
@ -296,4 +296,4 @@ void Follow::stop()
Action::stop();
}
NS_CC_END
NS_AX_END

4
core/2d/CCAction.h
View File

@ -33,7 +33,7 @@ THE SOFTWARE.
#include "math/CCMath.h"
#include "base/CCScriptSupport.h"
NS_CC_BEGIN
NS_AX_BEGIN
class Node;
@ -445,6 +445,6 @@ private:
// end of actions group
/// @}
NS_CC_END
NS_AX_END
#endif // __ACTIONS_CCACTION_H__

4
core/2d/CCActionCamera.cpp
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "2d/CCNode.h"
#include "platform/CCStdC.h"
NS_CC_BEGIN
NS_AX_BEGIN
//
// CameraAction
//
@ -242,4 +242,4 @@ void OrbitCamera::sphericalRadius(float* newRadius, float* zenith, float* azimut
*newRadius = r / FLT_EPSILON;
}
NS_CC_END
NS_AX_END

4
core/2d/CCActionCamera.h
View File

@ -32,7 +32,7 @@ THE SOFTWARE.
#include "2d/CCActionInterval.h"
#include "math/CCMath.h"
NS_CC_BEGIN
NS_AX_BEGIN
class Camera;
@ -183,6 +183,6 @@ protected:
// end of actions group
/// @}
NS_CC_END
NS_AX_END
#endif //__CCCAMERA_ACTION_H__

4
core/2d/CCActionCatmullRom.cpp
View File

@ -39,7 +39,7 @@
using namespace std;
NS_CC_BEGIN;
NS_AX_BEGIN;
/*
* Implementation of PointArray
@ -507,4 +507,4 @@ CatmullRomBy* CatmullRomBy::reverse() const
return CatmullRomBy::create(_duration, reverse);
}
NS_CC_END;
NS_AX_END;

4
core/2d/CCActionCatmullRom.h
View File

@ -41,7 +41,7 @@
#include "2d/CCActionInterval.h"
#include "math/CCMath.h"
NS_CC_BEGIN;
NS_AX_BEGIN;
class Node;
@ -340,6 +340,6 @@ ccCardinalSplineAt(const Vec2& p0, const Vec2& p1, const Vec2& p2, const Vec2& p
// end of actions group
/// @}
NS_CC_END;
NS_AX_END;
#endif // __CCACTION_CATMULLROM_H__

14
core/2d/CCActionEase.cpp
View File

@ -35,7 +35,7 @@ THE SOFTWARE.
#include "2d/CCActionEase.h"
#include "2d/CCTweenFunction.h"
NS_CC_BEGIN
NS_AX_BEGIN
#ifndef M_PI_X_2
# define M_PI_X_2 (float)M_PI * 2.0f
@ -78,7 +78,7 @@ void ActionEase::startWithTarget(Node* target)
}
else
{
cocos2d::log("ActionEase::startWithTarget error: target or _inner is nullptr!");
axis::log("ActionEase::startWithTarget error: target or _inner is nullptr!");
}
}
@ -135,7 +135,7 @@ bool EaseRateAction::initWithAction(ActionInterval* action, float rate)
// issue #16159 [https://github.com/cocos2d/cocos2d-x/pull/16159] for further info
//
#define EASE_TEMPLATE_IMPL(CLASSNAME, TWEEN_FUNC, REVERSE_CLASSNAME) \
CLASSNAME* CLASSNAME::create(cocos2d::ActionInterval* action) \
CLASSNAME* CLASSNAME::create(axis::ActionInterval* action) \
{ \
CLASSNAME* ease = new CLASSNAME(); \
if (ease->initWithAction(action)) \
@ -186,7 +186,7 @@ EASE_TEMPLATE_IMPL(EaseCubicActionInOut, tweenfunc::cubicEaseInOut, EaseCubicAct
// issue #16159 [https://github.com/cocos2d/cocos2d-x/pull/16159] for further info
//
#define EASERATE_TEMPLATE_IMPL(CLASSNAME, TWEEN_FUNC) \
CLASSNAME* CLASSNAME::create(cocos2d::ActionInterval* action, float rate) \
CLASSNAME* CLASSNAME::create(axis::ActionInterval* action, float rate) \
{ \
CLASSNAME* ease = new CLASSNAME(); \
if (ease->initWithAction(action, rate)) \
@ -229,7 +229,7 @@ bool EaseElastic::initWithAction(ActionInterval* action, float period /* = 0.3f*
// issue #16159 [https://github.com/cocos2d/cocos2d-x/pull/16159] for further info
//
#define EASEELASTIC_TEMPLATE_IMPL(CLASSNAME, TWEEN_FUNC, REVERSE_CLASSNAME) \
CLASSNAME* CLASSNAME::create(cocos2d::ActionInterval* action, float period /* = 0.3f*/) \
CLASSNAME* CLASSNAME::create(axis::ActionInterval* action, float period /* = 0.3f*/) \
{ \
CLASSNAME* ease = new CLASSNAME(); \
if (ease->initWithAction(action, period)) \
@ -255,7 +255,7 @@ EASEELASTIC_TEMPLATE_IMPL(EaseElasticInOut, tweenfunc::elasticEaseInOut, EaseEla
// EaseBezierAction
//
EaseBezierAction* EaseBezierAction::create(cocos2d::ActionInterval* action)
EaseBezierAction* EaseBezierAction::create(axis::ActionInterval* action)
{
EaseBezierAction* ret = new EaseBezierAction();
if (ret->initWithAction(action))
@ -304,4 +304,4 @@ EaseBezierAction* EaseBezierAction::reverse() const
return reverseAction;
}
NS_CC_END
NS_AX_END

8
core/2d/CCActionEase.h
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "2d/CCActionInterval.h"
#include "2d/CCTweenFunction.h"
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup actions
@ -516,7 +516,7 @@ EASEELASTIC_TEMPLATE_DECL_CLASS(EaseElasticInOut);
@brief Ease Bezier
@ingroup Actions
*/
class CC_DLL EaseBezierAction : public cocos2d::ActionEase
class CC_DLL EaseBezierAction : public axis::ActionEase
{
public:
/**
@ -524,7 +524,7 @@ public:
@param action The pointer of the inner action.
@return A pointer of EaseBezierAction action. If creation failed, return nil.
*/
static EaseBezierAction* create(cocos2d::ActionInterval* action);
static EaseBezierAction* create(axis::ActionInterval* action);
virtual void update(float time) override;
virtual EaseBezierAction* clone() const override;
@ -551,6 +551,6 @@ private:
// end of actions group
/// @}
NS_CC_END
NS_AX_END
#endif // __ACTION_CCEASE_ACTION_H__

4
core/2d/CCActionGrid.cpp
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "2d/CCNodeGrid.h"
#include "base/CCDirector.h"
NS_CC_BEGIN
NS_AX_BEGIN
// implementation of GridAction
bool GridAction::initWithDuration(float duration, const Vec2& gridSize)
@ -446,4 +446,4 @@ ReuseGrid* ReuseGrid::reverse() const
return this->clone();
}
NS_CC_END
NS_AX_END

4
core/2d/CCActionGrid.h
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "2d/CCActionInterval.h"
#include "2d/CCActionInstant.h"
NS_CC_BEGIN
NS_AX_BEGIN
class GridBase;
class NodeGrid;
@ -408,6 +408,6 @@ private:
// end of actions group
/// @}
NS_CC_END
NS_AX_END
#endif // __ACTION_CCGRID_ACTION_H__

4
core/2d/CCActionGrid3D.cpp
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#include "2d/CCActionGrid3D.h"
#include "base/CCDirector.h"
NS_CC_BEGIN
NS_AX_BEGIN
// implementation of Waves3D
Waves3D* Waves3D::create(float duration, const Vec2& gridSize, unsigned int waves, float amplitude)
@ -735,4 +735,4 @@ void Twirl::update(float time)
}
}
NS_CC_END
NS_AX_END

4
core/2d/CCActionGrid3D.h
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "2d/CCActionGrid.h"
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup actions
@ -634,6 +634,6 @@ private:
// end of actions group
/// @}
NS_CC_END
NS_AX_END
#endif // __ACTION_CCGRID3D_ACTION_H__

4
core/2d/CCActionInstant.cpp
View File

@ -30,7 +30,7 @@
#include "2d/CCNode.h"
#include "2d/CCSprite.h"
NS_CC_BEGIN
NS_AX_BEGIN
//
// InstantAction
//
@ -399,4 +399,4 @@ CallFuncN* CallFuncN::clone() const
return a;
}
NS_CC_END
NS_AX_END

4
core/2d/CCActionInstant.h
View File

@ -32,7 +32,7 @@ THE SOFTWARE.
#include <functional>
#include "2d/CCAction.h"
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup actions
@ -395,6 +395,6 @@ private:
// end of actions group
/// @}
NS_CC_END
NS_AX_END
#endif //__CCINSTANT_ACTION_H__

18
core/2d/CCActionInterval.cpp
View File

@ -40,7 +40,7 @@ THE SOFTWARE.
#include "platform/CCStdC.h"
#include "base/CCScriptSupport.h"
NS_CC_BEGIN
NS_AX_BEGIN
// Extra action for making a Sequence or Spawn when only adding one action to it.
class ExtraAction : public FiniteTimeAction
@ -1433,7 +1433,7 @@ ResizeTo* ResizeTo::clone() const
return a;
}
void ResizeTo::startWithTarget(cocos2d::Node* target)
void ResizeTo::startWithTarget(axis::Node* target)
{
ActionInterval::startWithTarget(target);
_initialSize = target->getContentSize();
@ -1451,7 +1451,7 @@ void ResizeTo::update(float time)
bool ResizeTo::initWithDuration(float duration, const Vec2& final_size)
{
if (cocos2d::ActionInterval::initWithDuration(duration))
if (axis::ActionInterval::initWithDuration(duration))
{
_finalSize = final_size;
return true;
@ -2072,7 +2072,7 @@ FadeIn* FadeIn::clone() const
return FadeIn::create(_duration);
}
void FadeIn::setReverseAction(cocos2d::FadeTo* ac)
void FadeIn::setReverseAction(axis::FadeTo* ac)
{
_reverseAction = ac;
}
@ -2084,7 +2084,7 @@ FadeTo* FadeIn::reverse() const
return action;
}
void FadeIn::startWithTarget(cocos2d::Node* target)
void FadeIn::startWithTarget(axis::Node* target)
{
ActionInterval::startWithTarget(target);
@ -2120,7 +2120,7 @@ FadeOut* FadeOut::clone() const
return FadeOut::create(_duration);
}
void FadeOut::startWithTarget(cocos2d::Node* target)
void FadeOut::startWithTarget(axis::Node* target)
{
ActionInterval::startWithTarget(target);
@ -2133,7 +2133,7 @@ void FadeOut::startWithTarget(cocos2d::Node* target)
_fromOpacity = target->getOpacity();
}
void FadeOut::setReverseAction(cocos2d::FadeTo* ac)
void FadeOut::setReverseAction(axis::FadeTo* ac)
{
_reverseAction = ac;
}
@ -2506,7 +2506,7 @@ bool Animate::initWithAnimation(Animation* animation)
return false;
}
void Animate::setAnimation(cocos2d::Animation* animation)
void Animate::setAnimation(axis::Animation* animation)
{
if (_animation != animation)
{
@ -2764,4 +2764,4 @@ ActionFloat* ActionFloat::reverse() const
return ActionFloat::create(_duration, _to, _from, _callback);
}
NS_CC_END
NS_AX_END

6
core/2d/CCActionInterval.h
View File

@ -37,7 +37,7 @@ THE SOFTWARE.
#include "base/CCProtocols.h"
#include "base/CCVector.h"
NS_CC_BEGIN
NS_AX_BEGIN
class Node;
class SpriteFrame;
@ -737,7 +737,7 @@ public:
// Overrides
//
virtual ResizeTo* clone() const override;
void startWithTarget(cocos2d::Node* target) override;
void startWithTarget(axis::Node* target) override;
void update(float time) override;
ResizeTo() {}
@ -1615,6 +1615,6 @@ private:
// end of actions group
/// @}
NS_CC_END
NS_AX_END
#endif //__ACTION_CCINTERVAL_ACTION_H__

4
core/2d/CCActionManager.cpp
View File

@ -35,7 +35,7 @@ THE SOFTWARE.
#include "base/ccCArray.h"
#include "uthash/uthash.h"
NS_CC_BEGIN
NS_AX_BEGIN
//
// singleton stuff
//
@ -491,4 +491,4 @@ void ActionManager::update(float dt)
_currentTarget = nullptr;
}
NS_CC_END
NS_AX_END

4
core/2d/CCActionManager.h
View File

@ -34,7 +34,7 @@ THE SOFTWARE.
#include "base/CCVector.h"
#include "base/CCRef.h"
NS_CC_BEGIN
NS_AX_BEGIN
class Action;
@ -209,6 +209,6 @@ protected:
// end of actions group
/// @}
NS_CC_END
NS_AX_END
#endif // __ACTION_CCACTION_MANAGER_H__

4
core/2d/CCActionPageTurn3D.cpp
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#include "2d/CCGrid.h"
#include "2d/CCNodeGrid.h"
NS_CC_BEGIN
NS_AX_BEGIN
PageTurn3D* PageTurn3D::create(float duration, const Vec2& gridSize)
{
@ -130,4 +130,4 @@ void PageTurn3D::update(float time)
}
}
NS_CC_END
NS_AX_END

4
core/2d/CCActionPageTurn3D.h
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "2d/CCActionGrid3D.h"
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup actions
@ -69,6 +69,6 @@ public:
// end of actions group
/// @}
NS_CC_END
NS_AX_END
#endif // __ACTION_CCPAGETURN3D_ACTION_H__

4
core/2d/CCActionProgressTimer.cpp
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#include "2d/CCActionProgressTimer.h"
#include "2d/CCProgressTimer.h"
NS_CC_BEGIN
NS_AX_BEGIN
#define kProgressTimerCast ProgressTimer*
@ -130,4 +130,4 @@ void ProgressFromTo::update(float time)
((kProgressTimerCast)(_target))->setPercentage(_from + (_to - _from) * time);
}
NS_CC_END
NS_AX_END

4
core/2d/CCActionProgressTimer.h
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "2d/CCActionInterval.h"
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup actions
@ -127,6 +127,6 @@ private:
// end of actions group
/// @}
NS_CC_END
NS_AX_END
#endif // __ACTION_CCPROGRESS_TIMER_H__

4
core/2d/CCActionTiledGrid.cpp
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "base/CCDirector.h"
#include "base/ccMacros.h"
NS_CC_BEGIN
NS_AX_BEGIN
struct Tile
{
@ -876,4 +876,4 @@ void SplitCols::update(float time)
}
}
NS_CC_END
NS_AX_END

4
core/2d/CCActionTiledGrid.h
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "2d/CCActionGrid.h"
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup actions
@ -592,6 +592,6 @@ private:
// end of actions group
/// @}
NS_CC_END
NS_AX_END
#endif // __ACTION_CCTILEDGRID_ACTION_H__

4
core/2d/CCActionTween.cpp
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#include "2d/CCActionTween.h"
NS_CC_BEGIN
NS_AX_BEGIN
ActionTween* ActionTween::create(float duration, std::string_view key, float from, float to)
{
@ -77,4 +77,4 @@ ActionTween* ActionTween::reverse() const
return ActionTween::create(_duration, _key, _to, _from);
}
NS_CC_END
NS_AX_END

4
core/2d/CCActionTween.h
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "2d/CCActionInterval.h"
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup actions
@ -120,6 +120,6 @@ protected:
// end of actions group
/// @}
NS_CC_END
NS_AX_END
#endif /* __CCACTIONTWEEN_H__ */

4
core/2d/CCAnimation.cpp
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "renderer/CCTexture2D.h"
#include "base/CCDirector.h"
NS_CC_BEGIN
NS_AX_BEGIN
AnimationFrame* AnimationFrame::create(SpriteFrame* spriteFrame, float delayUnits, const ValueMap& userInfo)
{
@ -195,4 +195,4 @@ Animation* Animation::clone() const
return a;
}
NS_CC_END
NS_AX_END

4
core/2d/CCAnimation.h
View File

@ -36,7 +36,7 @@ THE SOFTWARE.
#include <string>
NS_CC_BEGIN
NS_AX_BEGIN
class Texture2D;
class SpriteFrame;
@ -320,6 +320,6 @@ private:
// end of sprite_nodes group
/// @}
NS_CC_END
NS_AX_END
#endif // __CC_ANIMATION_H__

4
core/2d/CCAnimationCache.cpp
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
using namespace std;
NS_CC_BEGIN
NS_AX_BEGIN
AnimationCache* AnimationCache::s_sharedAnimationCache = nullptr;
@ -265,4 +265,4 @@ void AnimationCache::addAnimationsWithFile(std::string_view plist)
addAnimationsWithDictionary(dict, plist);
}
NS_CC_END
NS_AX_END

4
core/2d/CCAnimationCache.h
View File

@ -35,7 +35,7 @@ THE SOFTWARE.
#include <string>
NS_CC_BEGIN
NS_AX_BEGIN
class Animation;
@ -127,6 +127,6 @@ private:
// end of sprite_nodes group
/// @}
NS_CC_END
NS_AX_END
#endif // __CC_ANIMATION_CACHE_H__

4
core/2d/CCAtlasNode.cpp
View File

@ -36,7 +36,7 @@ THE SOFTWARE.
#include "renderer/CCRenderer.h"
#include "renderer/backend/ProgramState.h"
NS_CC_BEGIN
NS_AX_BEGIN
// implementation AtlasNode
@ -290,4 +290,4 @@ void AtlasNode::setQuadsToDraw(ssize_t quadsToDraw)
_quadsToDraw = quadsToDraw;
}
NS_CC_END
NS_AX_END

4
core/2d/CCAtlasNode.h
View File

@ -32,7 +32,7 @@ THE SOFTWARE.
#include "base/ccTypes.h"
#include "renderer/CCQuadCommand.h"
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup _2d
@ -153,4 +153,4 @@ private:
// end of base_node group
/// @}
NS_CC_END
NS_AX_END

12
core/2d/CCAutoPolygon.cpp
View File

@ -34,7 +34,7 @@ THE SOFTWARE.
#include <algorithm>
#include <math.h>
USING_NS_CC;
USING_NS_AX;
static unsigned short quadIndices9[] = {
0 + 4 * 0, 1 + 4 * 0, 2 + 4 * 0, 3 + 4 * 0, 2 + 4 * 0, 1 + 4 * 0, 0 + 4 * 1, 1 + 4 * 1, 2 + 4 * 1,
@ -250,7 +250,7 @@ unsigned int AutoPolygon::getSquareValue(unsigned int x, unsigned int y, const R
return sv;
}
std::vector<cocos2d::Vec2> AutoPolygon::marchSquare(const Rect& rect, const Vec2& start, float threshold)
std::vector<axis::Vec2> AutoPolygon::marchSquare(const Rect& rect, const Vec2& start, float threshold)
{
int stepx = 0;
int stepy = 0;
@ -265,7 +265,7 @@ std::vector<cocos2d::Vec2> AutoPolygon::marchSquare(const Rect& rect, const Vec2
std::vector<int> case6s;
int i;
std::vector<int>::iterator it;
std::vector<cocos2d::Vec2> _points;
std::vector<axis::Vec2> _points;
do
{
int sv = getSquareValue(curx, cury, rect, threshold);
@ -416,7 +416,7 @@ std::vector<cocos2d::Vec2> AutoPolygon::marchSquare(const Rect& rect, const Vec2
return _points;
}
float AutoPolygon::perpendicularDistance(const cocos2d::Vec2& i, const cocos2d::Vec2& start, const cocos2d::Vec2& end)
float AutoPolygon::perpendicularDistance(const axis::Vec2& i, const axis::Vec2& start, const axis::Vec2& end)
{
float res;
float slope;
@ -438,7 +438,7 @@ float AutoPolygon::perpendicularDistance(const cocos2d::Vec2& i, const cocos2d::
}
return res;
}
std::vector<cocos2d::Vec2> AutoPolygon::rdp(const std::vector<cocos2d::Vec2>& v, float optimization)
std::vector<axis::Vec2> AutoPolygon::rdp(const std::vector<axis::Vec2>& v, float optimization)
{
if (v.size() < 3)
return v;
@ -505,7 +505,7 @@ std::vector<Vec2> AutoPolygon::reduce(const std::vector<Vec2>& points, const Rec
return result;
}
std::vector<Vec2> AutoPolygon::expand(const std::vector<Vec2>& points, const cocos2d::Rect& rect, float epsilon)
std::vector<Vec2> AutoPolygon::expand(const std::vector<Vec2>& points, const axis::Rect& rect, float epsilon)
{
auto size = points.size();
// if there are less than 3 points, then we have nothing

16
core/2d/CCAutoPolygon.h
View File

@ -34,7 +34,7 @@ THE SOFTWARE.
#include "platform/CCImage.h"
#include "renderer/CCTrianglesCommand.h"
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup _2d
@ -166,7 +166,7 @@ public:
* std::vector<Vec2> points = ap.trace(rect);//default threshold is 0.0
* @endcode
*/
std::vector<Vec2> trace(const cocos2d::Rect& rect, float threshold = 0.0f);
std::vector<Vec2> trace(const axis::Rect& rect, float threshold = 0.0f);
/**
* reduce the amount of points so its faster for GPU to process and draw
@ -261,20 +261,20 @@ public:
protected:
Vec2 findFirstNoneTransparentPixel(const Rect& rect, float threshold);
std::vector<cocos2d::Vec2> marchSquare(const Rect& rect, const Vec2& first, float threshold);
std::vector<axis::Vec2> marchSquare(const Rect& rect, const Vec2& first, float threshold);
unsigned int getSquareValue(unsigned int x, unsigned int y, const Rect& rect, float threshold);
unsigned char getAlphaByIndex(unsigned int i);
unsigned char getAlphaByPos(const Vec2& pos);
int getIndexFromPos(unsigned int x, unsigned int y) { return y * _width + x; }
cocos2d::Vec2 getPosFromIndex(unsigned int i)
axis::Vec2 getPosFromIndex(unsigned int i)
{
return cocos2d::Vec2(static_cast<float>(i % _width), static_cast<float>(i / _width));
return axis::Vec2(static_cast<float>(i % _width), static_cast<float>(i / _width));
}
std::vector<cocos2d::Vec2> rdp(const std::vector<cocos2d::Vec2>& v, float optimization);
float perpendicularDistance(const cocos2d::Vec2& i, const cocos2d::Vec2& start, const cocos2d::Vec2& end);
std::vector<axis::Vec2> rdp(const std::vector<axis::Vec2>& v, float optimization);
float perpendicularDistance(const axis::Vec2& i, const axis::Vec2& start, const axis::Vec2& end);
// real rect is the size that is in scale with the texture file
Rect getRealRect(const Rect& rect);
@ -288,6 +288,6 @@ protected:
unsigned int _threshold;
};
NS_CC_END
NS_AX_END
#endif // #ifndef COCOS_2D_CCAUTOPOLYGON_H__

8
core/2d/CCCamera.cpp
View File

@ -32,7 +32,7 @@
#include "renderer/CCRenderer.h"
#include "renderer/CCQuadCommand.h"
NS_CC_BEGIN
NS_AX_BEGIN
Camera* Camera::_visitingCamera = nullptr;
Viewport Camera::_defaultViewport;
@ -407,12 +407,12 @@ void Camera::applyZoom()
{
switch (_projectionType)
{
case cocos2d::Director::Projection::_2D:
case axis::Director::Projection::_2D:
{
Mat4::createOrthographic(_zoom[0] * _zoomFactor, _zoom[1] * _zoomFactor, _nearPlane, _farPlane, &_projection);
break;
}
case cocos2d::Director::Projection::_3D:
case axis::Director::Projection::_3D:
{
// Push the far plane farther the more we zoom out.
if (_zoomFactorFarPlane * _zoomFactor > _farPlane)
@ -582,4 +582,4 @@ bool Camera::isBrushValid()
return _clearBrush != nullptr && _clearBrush->isValid();
}
NS_CC_END
NS_AX_END

4
core/2d/CCCamera.h
View File

@ -33,7 +33,7 @@ THE SOFTWARE.
#include "renderer/CCCustomCommand.h"
#include "base/CCDirector.h"
NS_CC_BEGIN
NS_AX_BEGIN
class Scene;
class CameraBackgroundBrush;
@ -408,4 +408,4 @@ protected:
CameraBackgroundBrush* _clearBrush = nullptr; // brush used to clear the back ground
};
NS_CC_END
NS_AX_END

4
core/2d/CCCameraBackgroundBrush.cpp
View File

@ -43,7 +43,7 @@
# include "base/CCEventDispatcher.h"
#endif
NS_CC_BEGIN
NS_AX_BEGIN
CameraBackgroundBrush::CameraBackgroundBrush() {}
@ -487,4 +487,4 @@ void CameraBackgroundSkyBoxBrush::onAfterDraw()
renderer->setCullMode(_stateBlock.cullMode);
}
NS_CC_END
NS_AX_END

4
core/2d/CCCameraBackgroundBrush.h
View File

@ -35,7 +35,7 @@
#include "renderer/backend/Types.h"
#include <vector>
NS_CC_BEGIN
NS_AX_BEGIN
class CameraBackgroundColorBrush;
class CameraBackgroundDepthBrush;
@ -322,4 +322,4 @@ private:
} _stateBlock;
};
NS_CC_END
NS_AX_END

4
core/2d/CCClippingNode.cpp
View File

@ -32,7 +32,7 @@
#include "base/CCDirector.h"
#include "base/CCStencilStateManager.h"
NS_CC_BEGIN
NS_AX_BEGIN
ClippingNode::ClippingNode() : _stencil(nullptr), _stencilStateManager(new StencilStateManager()) {}
@ -337,4 +337,4 @@ void ClippingNode::restoreAllProgramStates()
}
}
NS_CC_END
NS_AX_END

4
core/2d/CCClippingNode.h
View File

@ -32,7 +32,7 @@
#include "renderer/CCCustomCommand.h"
#include "renderer/CCCallbackCommand.h"
#include <unordered_map>
NS_CC_BEGIN
NS_AX_BEGIN
class StencilStateManager;
/**
@ -169,4 +169,4 @@ private:
CC_DISALLOW_COPY_AND_ASSIGN(ClippingNode);
};
/** @} */
NS_CC_END
NS_AX_END

4
core/2d/CCClippingRectangleNode.cpp
View File

@ -27,7 +27,7 @@
#include "math/Vec2.h"
#include "platform/CCGLView.h"
NS_CC_BEGIN
NS_AX_BEGIN
ClippingRectangleNode* ClippingRectangleNode::create(const Rect& clippingRegion)
{
@ -105,4 +105,4 @@ void ClippingRectangleNode::visit(Renderer* renderer, const Mat4& parentTransfor
renderer->addCommand(afterVisitCmdScissor);
}
NS_CC_END
NS_AX_END

4
core/2d/CCClippingRectangleNode.h
View File

@ -30,7 +30,7 @@
#include "2d/CCNode.h"
#include "renderer/CCCallbackCommand.h"
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup _2d
@ -102,4 +102,4 @@ protected:
// end of _2d group
/// @}
NS_CC_END
NS_AX_END

4
core/2d/CCComponent.cpp
View File

@ -25,7 +25,7 @@ THE SOFTWARE.
#include "2d/CCComponent.h"
NS_CC_BEGIN
NS_AX_BEGIN
Component::Component() : _owner(nullptr), _enabled(true) {}
@ -77,4 +77,4 @@ void Component::setEnabled(bool enabled)
_enabled = enabled;
}
NS_CC_END
NS_AX_END

4
core/2d/CCComponent.h
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "base/CCRef.h"
#include "base/CCScriptSupport.h"
NS_CC_BEGIN
NS_AX_BEGIN
class Node;
@ -85,7 +85,7 @@ protected:
bool _enabled;
};
NS_CC_END
NS_AX_END
/// @endcond
#endif // __CC_FRAMEWORK_COMPONENT_H__

4
core/2d/CCComponentContainer.cpp
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#include "2d/CCComponent.h"
#include "2d/CCNode.h"
NS_CC_BEGIN
NS_AX_BEGIN
ComponentContainer::ComponentContainer(Node* node) : _owner(node) {}
@ -141,4 +141,4 @@ void ComponentContainer::onExit()
}
}
NS_CC_END
NS_AX_END

4
core/2d/CCComponentContainer.h
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "base/CCMap.h"
#include <string>
NS_CC_BEGIN
NS_AX_BEGIN
class Component;
class Node;
@ -74,7 +74,7 @@ private:
friend class Node;
};
NS_CC_END
NS_AX_END
/// @endcond
#endif // __CC_FRAMEWORK_COMCONTAINER_H__

4
core/2d/CCDrawNode.cpp
View File

@ -37,7 +37,7 @@
#include "renderer/ccShaders.h"
#include "renderer/backend/ProgramState.h"
NS_CC_BEGIN
NS_AX_BEGIN
static inline Tex2F v2ToTex2F(const Vec2& v)
{
@ -822,4 +822,4 @@ void DrawNode::visit(Renderer* renderer, const Mat4& parentTransform, uint32_t p
}
}
NS_CC_END
NS_AX_END

4
core/2d/CCDrawNode.h
View File

@ -39,7 +39,7 @@
#include "math/CCMath.h"
#include "base/any_buffer.h"
NS_CC_BEGIN
NS_AX_BEGIN
static const int DEFAULT_LINE_WIDTH = 2;
@ -415,6 +415,6 @@ private:
CC_DISALLOW_COPY_AND_ASSIGN(DrawNode);
};
/** @} */
NS_CC_END
NS_AX_END
#endif // __CCDRAWNODES_CCDRAW_NODE_H__

4
core/2d/CCFastTMXLayer.cpp
View File

@ -50,7 +50,7 @@ THE SOFTWARE.
#include "base/ccUTF8.h"
#include "renderer/backend/ProgramState.h"
NS_CC_BEGIN
NS_AX_BEGIN
const int FastTMXLayer::FAST_TMX_ORIENTATION_ORTHO = 0;
const int FastTMXLayer::FAST_TMX_ORIENTATION_HEX = 1;
@ -1055,4 +1055,4 @@ TMXTileAnimTask* TMXTileAnimTask::create(FastTMXLayer* layer, TMXTileAnimInfo* a
return ret;
}
NS_CC_END
NS_AX_END

4
core/2d/CCFastTMXLayer.h
View File

@ -33,7 +33,7 @@ THE SOFTWARE.
#include "2d/CCTMXXMLParser.h"
#include "renderer/CCCustomCommand.h"
NS_CC_BEGIN
NS_AX_BEGIN
class TMXMapInfo;
class TMXLayerInfo;
@ -444,4 +444,4 @@ typedef FastTMXLayer TMXLayer;
// end of tilemap_parallax_nodes group
/// @}
NS_CC_END
NS_AX_END

4
core/2d/CCFastTMXTiledMap.cpp
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "2d/CCFastTMXLayer.h"
#include "base/ccUTF8.h"
NS_CC_BEGIN
NS_AX_BEGIN
// implementation FastTMXTiledMap
@ -274,4 +274,4 @@ void FastTMXTiledMap::setTileAnimEnabled(bool enabled)
}
}
NS_CC_END
NS_AX_END

4
core/2d/CCFastTMXTiledMap.h
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "2d/CCNode.h"
#include "2d/CCTMXObjectGroup.h"
NS_CC_BEGIN
NS_AX_BEGIN
class TMXLayerInfo;
class TMXTilesetInfo;
@ -258,4 +258,4 @@ private:
// @API compatible
typedef FastTMXTiledMap TMXTiledMap;
NS_CC_END
NS_AX_END

4
core/2d/CCFont.h
View File

@ -34,7 +34,7 @@
#include "base/ccTypes.h"
#include "base/ccUTF8.h"
NS_CC_BEGIN
NS_AX_BEGIN
class FontAtlas;
@ -46,7 +46,7 @@ public:
virtual int getFontMaxHeight() const { return 0; }
};
NS_CC_END
NS_AX_END
/// @endcond
#endif

4
core/2d/CCFontAtlas.cpp
View File

@ -38,7 +38,7 @@
#include "base/CCEventDispatcher.h"
#include "base/CCEventType.h"
NS_CC_BEGIN
NS_AX_BEGIN
const int FontAtlas::CacheTextureWidth = 512;
const int FontAtlas::CacheTextureHeight = 512;
@ -428,4 +428,4 @@ void FontAtlas::setAntiAliasTexParameters()
}
}
NS_CC_END
NS_AX_END

4
core/2d/CCFontAtlas.h
View File

@ -38,7 +38,7 @@
#include "platform/CCStdC.h" // ssize_t on windows
#include "renderer/CCTexture2D.h"
NS_CC_BEGIN
NS_AX_BEGIN
class Font;
class EventCustom;
@ -167,7 +167,7 @@ protected:
friend class Label;
};
NS_CC_END
NS_AX_END
/// @endcond
#endif /* defined(__cocos2d_libs__CCFontAtlas__) */

4
core/2d/CCFontAtlasCache.cpp
View File

@ -34,7 +34,7 @@
#include "2d/CCLabel.h"
#include "platform/CCFileUtils.h"
NS_CC_BEGIN
NS_AX_BEGIN
hlookup::string_map<FontAtlas*> FontAtlasCache::_atlasMap;
#define ATLAS_MAP_KEY_PREFIX_BUFFER_SIZE 255
@ -305,4 +305,4 @@ void FontAtlasCache::unloadFontAtlasTTF(std::string_view fontFileName)
}
}
NS_CC_END
NS_AX_END

4
core/2d/CCFontAtlasCache.h
View File

@ -32,7 +32,7 @@
#include <unordered_map>
#include "base/ccTypes.h"
NS_CC_BEGIN
NS_AX_BEGIN
class FontAtlas;
class Texture2D;
@ -81,7 +81,7 @@ private:
static hlookup::string_map<FontAtlas*> _atlasMap;
};
NS_CC_END
NS_AX_END
/// @endcond
#endif

4
core/2d/CCFontCharMap.cpp
View File

@ -31,7 +31,7 @@
#include "base/CCDirector.h"
#include "renderer/CCTextureCache.h"
NS_CC_BEGIN
NS_AX_BEGIN
FontCharMap* FontCharMap::create(std::string_view plistFile)
{
@ -142,4 +142,4 @@ FontAtlas* FontCharMap::newFontAtlas()
return tempAtlas;
}
NS_CC_END
NS_AX_END

4
core/2d/CCFontCharMap.h
View File

@ -32,7 +32,7 @@
#include "2d/CCFont.h"
NS_CC_BEGIN
NS_AX_BEGIN
class Texture2D;
class FontCharMap : public Font
@ -64,6 +64,6 @@ private:
/// @endcond
NS_CC_END
NS_AX_END
#endif /* defined(_CCFontCharMap_h_) */

4
core/2d/CCFontFNT.cpp
View File

@ -37,7 +37,7 @@
#include <cmath>
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup GUI
@ -783,4 +783,4 @@ void FontFNT::reloadBMFontResource(std::string_view fntFilePath)
}
}
NS_CC_END
NS_AX_END

4
core/2d/CCFontFNT.h
View File

@ -34,7 +34,7 @@
#include <set>
#include <unordered_map>
NS_CC_BEGIN
NS_AX_BEGIN
/**
@struct BMFontDef
@ -188,6 +188,6 @@ protected:
/// @endcond
NS_CC_END
NS_AX_END
#endif /* defined(__cocos2d_libs__CCFontFNT__) */

18
core/2d/CCFontFreeType.cpp
View File

@ -39,7 +39,7 @@ THE SOFTWARE.
#include FT_BBOX_H
#include FT_FONT_FORMATS_H
NS_CC_BEGIN
NS_AX_BEGIN
FT_Library FontFreeType::_FTlibrary;
bool FontFreeType::_FTInitialized = false;
@ -295,7 +295,7 @@ bool FontFreeType::loadFontFace(std::string_view fontPath, float fontSize)
FT_Done_Face(face);
cocos2d::log("Init font '%s' failed, only unicode ttf/ttc was supported.", fontPath.data());
axis::log("Init font '%s' failed, only unicode ttf/ttc was supported.", fontPath.data());
return false;
}
@ -394,11 +394,11 @@ unsigned char* FontFreeType::getGlyphBitmap(char32_t charCode,
char32_t ntcs[2] = {charCode, (char32_t)0};
std::u32string_view charUTF32(ntcs, 1);
std::string charUTF8;
cocos2d::StringUtils::UTF32ToUTF8(charUTF32, charUTF8);
axis::StringUtils::UTF32ToUTF8(charUTF32, charUTF8);
if (charUTF8 == "\n")
charUTF8 = "\\n";
cocos2d::log("The font face: %s doesn't contains char: <%s>", _fontFace->charmap->face->family_name,
axis::log("The font face: %s doesn't contains char: <%s>", _fontFace->charmap->face->family_name,
charUTF8.c_str());
if (_mssingGlyphCharacter != 0)
@ -609,15 +609,15 @@ std::string_view FontFreeType::getGlyphCollection() const
std::string_view glyphCollection;
switch (_usedGlyphs)
{
case cocos2d::GlyphCollection::DYNAMIC:
case axis::GlyphCollection::DYNAMIC:
break;
case cocos2d::GlyphCollection::NEHE:
case axis::GlyphCollection::NEHE:
glyphCollection = _glyphNEHE;
break;
case cocos2d::GlyphCollection::ASCII:
case axis::GlyphCollection::ASCII:
glyphCollection = _glyphASCII;
break;
case cocos2d::GlyphCollection::CUSTOM:
case axis::GlyphCollection::CUSTOM:
glyphCollection = _customGlyphs;
break;
default:
@ -639,4 +639,4 @@ void FontFreeType::releaseFont(std::string_view fontName)
}
}
NS_CC_END
NS_AX_END

4
core/2d/CCFontFreeType.h
View File

@ -40,7 +40,7 @@ typedef struct FT_FaceRec_* FT_Face;
typedef struct FT_StrokerRec_* FT_Stroker;
typedef struct FT_BBox_ FT_BBox;
NS_CC_BEGIN
NS_AX_BEGIN
class CC_DLL FontFreeType : public Font
{
@ -146,6 +146,6 @@ private:
/// @endcond
NS_CC_END
NS_AX_END
#endif

14
core/2d/CCGrid.cpp
View File

@ -38,7 +38,7 @@ THE SOFTWARE.
#include "renderer/backend/RenderTarget.h"
#include "2d/CCCamera.h"
NS_CC_BEGIN
NS_AX_BEGIN
// implementation of GridBase
bool GridBase::initWithSize(const Vec2& gridSize)
@ -46,7 +46,7 @@ bool GridBase::initWithSize(const Vec2& gridSize)
return initWithSize(gridSize, Rect::ZERO);
}
bool GridBase::initWithSize(const Vec2& gridSize, const cocos2d::Rect& rect)
bool GridBase::initWithSize(const Vec2& gridSize, const axis::Rect& rect)
{
Director* director = Director::getInstance();
Vec2 s = director->getWinSizeInPixels();
@ -194,7 +194,7 @@ void GridBase::set2DProjection()
director->loadIdentityMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
}
void GridBase::setGridRect(const cocos2d::Rect& rect)
void GridBase::setGridRect(const axis::Rect& rect)
{
_gridRect = rect;
}
@ -227,7 +227,7 @@ void GridBase::beforeDraw()
renderer->clear(TargetBufferFlags::COLOR, _clearColor, 1, 0, 0.0);
}
void GridBase::afterDraw(cocos2d::Node* /*target*/)
void GridBase::afterDraw(axis::Node* /*target*/)
{
// restore projection
Director* director = Director::getInstance();
@ -380,7 +380,7 @@ void Grid3D::blit()
updateVertexBuffer();
_drawCommand.init(0, _blendFunc);
Director::getInstance()->getRenderer()->addCommand(&_drawCommand);
cocos2d::Mat4 projectionMat = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
axis::Mat4 projectionMat = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
auto programState = _drawCommand.getPipelineDescriptor().programState;
programState->setUniform(_mvpMatrixLocation, projectionMat.m, sizeof(projectionMat.m));
programState->setTexture(_textureLocation, 0, _texture->getBackendTexture());
@ -630,7 +630,7 @@ void TiledGrid3D::blit()
{
updateVertexBuffer();
Director::getInstance()->getRenderer()->addCommand(&_drawCommand);
cocos2d::Mat4 projectionMat = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
axis::Mat4 projectionMat = Director::getInstance()->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
auto programState = _drawCommand.getPipelineDescriptor().programState;
programState->setUniform(_mvpMatrixLocation, projectionMat.m, sizeof(projectionMat.m));
programState->setTexture(_textureLocation, 0, _texture->getBackendTexture());
@ -795,4 +795,4 @@ void TiledGrid3D::updateVertexAndTexCoordinate()
_drawCommand.updateIndexBuffer(_indices, gradSize * 6 * sizeof(unsigned short));
}
NS_CC_END
NS_AX_END

4
core/2d/CCGrid.h
View File

@ -34,7 +34,7 @@ THE SOFTWARE.
#include "renderer/CCCustomCommand.h"
#include "renderer/CCCallbackCommand.h"
NS_CC_BEGIN
NS_AX_BEGIN
class Texture2D;
// class Grabber;
@ -310,4 +310,4 @@ protected:
// end of effects group
/// @}
NS_CC_END
NS_AX_END

32
core/2d/CCLabel.cpp
View File

@ -50,7 +50,7 @@
#include "renderer/backend/ProgramState.h"
#include "renderer/backend/ProgramStateRegistry.h"
NS_CC_BEGIN
NS_AX_BEGIN
namespace
{
@ -728,7 +728,7 @@ void Label::updateShaderProgram()
{
switch (_currLabelEffect)
{
case cocos2d::LabelEffect::NORMAL:
case axis::LabelEffect::NORMAL:
if (_useDistanceField)
{
programType = backend::ProgramType::LABEL_DISTANCE_NORMAL;
@ -747,12 +747,12 @@ void Label::updateShaderProgram()
}
}
break;
case cocos2d::LabelEffect::OUTLINE:
case axis::LabelEffect::OUTLINE:
{
programType = backend::ProgramType::LABLE_OUTLINE;
}
break;
case cocos2d::LabelEffect::GLOW:
case axis::LabelEffect::GLOW:
if (_useDistanceField)
{
programType = backend::ProgramType::LABLE_DISTANCEFIELD_GLOW;
@ -1525,9 +1525,9 @@ void Label::disableEffect(LabelEffect effect)
{
switch (effect)
{
case cocos2d::LabelEffect::NORMAL:
case axis::LabelEffect::NORMAL:
break;
case cocos2d::LabelEffect::OUTLINE:
case axis::LabelEffect::OUTLINE:
if (_currLabelEffect == LabelEffect::OUTLINE)
{
if (_currentLabelType == LabelType::TTF)
@ -1539,7 +1539,7 @@ void Label::disableEffect(LabelEffect effect)
_contentDirty = true;
}
break;
case cocos2d::LabelEffect::SHADOW:
case axis::LabelEffect::SHADOW:
if (_shadowEnabled)
{
_shadowEnabled = false;
@ -1547,17 +1547,17 @@ void Label::disableEffect(LabelEffect effect)
updateShaderProgram();
}
break;
case cocos2d::LabelEffect::GLOW:
case axis::LabelEffect::GLOW:
if (_currLabelEffect == LabelEffect::GLOW)
{
_currLabelEffect = LabelEffect::NORMAL;
updateShaderProgram();
}
break;
case cocos2d::LabelEffect::ITALICS:
case axis::LabelEffect::ITALICS:
setRotationSkewX(0);
break;
case cocos2d::LabelEffect::BOLD:
case axis::LabelEffect::BOLD:
if (_boldEnabled)
{
_boldEnabled = false;
@ -1565,14 +1565,14 @@ void Label::disableEffect(LabelEffect effect)
disableEffect(LabelEffect::SHADOW);
}
break;
case cocos2d::LabelEffect::UNDERLINE:
case axis::LabelEffect::UNDERLINE:
if (_underlineNode)
{
removeChild(_underlineNode);
_underlineNode = nullptr;
}
break;
case cocos2d::LabelEffect::STRIKETHROUGH:
case axis::LabelEffect::STRIKETHROUGH:
_strikethroughEnabled = false;
// since it is based on underline, disable it as well
disableEffect(LabelEffect::UNDERLINE);
@ -1937,7 +1937,7 @@ void Label::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
if (_insideBounds)
#endif
{
cocos2d::Mat4 matrixProjection = _director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
axis::Mat4 matrixProjection = _director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
if (!_shadowEnabled && (_currentLabelType == LabelType::BMFONT || _currentLabelType == LabelType::CHARMAP))
{
updateBlendState();
@ -1960,7 +1960,7 @@ void Label::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
}
else
{
cocos2d::Mat4 matrixMVP = matrixProjection * transform;
axis::Mat4 matrixMVP = matrixProjection * transform;
for (auto&& it : _letters)
{
@ -2388,7 +2388,7 @@ void Label::updateColor()
color4.b *= _displayedOpacity / 255.0f;
}
cocos2d::TextureAtlas* textureAtlas;
axis::TextureAtlas* textureAtlas;
V3F_C4B_T2F_Quad* quads;
for (auto&& batchNode : _batchNodes)
{
@ -2636,4 +2636,4 @@ void Label::updateLetterSpriteScale(Sprite* sprite)
}
}
NS_CC_END
NS_AX_END

6
core/2d/CCLabel.h
View File

@ -34,7 +34,7 @@
#include "2d/CCFontAtlas.h"
#include "base/ccTypes.h"
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup _2d
@ -775,7 +775,7 @@ protected:
void computeAlignmentOffset();
bool computeHorizontalKernings(const std::u32string& stringToRender);
void recordLetterInfo(const cocos2d::Vec2& point, char32_t utf32Char, int letterIndex, int lineIndex);
void recordLetterInfo(const axis::Vec2& point, char32_t utf32Char, int letterIndex, int lineIndex);
void recordPlaceholderInfo(int letterIndex, char32_t utf16Char);
bool updateQuads();
@ -926,6 +926,6 @@ private:
// end group
/// @}
NS_CC_END
NS_AX_END
#endif /*__COCOS2D_CCLABEL_H */

4
core/2d/CCLabelAtlas.cpp
View File

@ -36,7 +36,7 @@ THE SOFTWARE.
# include "renderer/CCRenderer.h"
#endif
NS_CC_BEGIN
NS_AX_BEGIN
// CCLabelAtlas - Creation & Init
@ -286,4 +286,4 @@ std::string LabelAtlas::getDescription() const
return StringUtils::format("<LabelAtlas | Tag = %d, Label = '%s'>", _tag, _string.c_str());
}
NS_CC_END
NS_AX_END

4
core/2d/CCLabelAtlas.h
View File

@ -33,7 +33,7 @@ THE SOFTWARE.
# include "renderer/CCCustomCommand.h"
# include "2d/CCDrawNode.h"
#endif
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup _2d
@ -137,6 +137,6 @@ protected:
// end group
/// @}
NS_CC_END
NS_AX_END
#endif //__CCLABEL_ATLAS_H__

18
core/2d/CCLabelTextFormatter.cpp
View File

@ -31,23 +31,23 @@
#include "2d/CCFontAtlas.h"
#include "2d/CCFontFNT.h"
NS_CC_BEGIN
NS_AX_BEGIN
void Label::computeAlignmentOffset()
{
_linesOffsetX.clear();
switch (_hAlignment)
{
case cocos2d::TextHAlignment::LEFT:
case axis::TextHAlignment::LEFT:
_linesOffsetX.assign(_numberOfLines, 0);
break;
case cocos2d::TextHAlignment::CENTER:
case axis::TextHAlignment::CENTER:
for (auto lineWidth : _linesWidth)
{
_linesOffsetX.push_back((_contentSize.width - lineWidth) / 2.f);
}
break;
case cocos2d::TextHAlignment::RIGHT:
case axis::TextHAlignment::RIGHT:
for (auto lineWidth : _linesWidth)
{
_linesOffsetX.push_back(_contentSize.width - lineWidth);
@ -59,13 +59,13 @@ void Label::computeAlignmentOffset()
switch (_vAlignment)
{
case cocos2d::TextVAlignment::TOP:
case axis::TextVAlignment::TOP:
_letterOffsetY = _contentSize.height;
break;
case cocos2d::TextVAlignment::CENTER:
case axis::TextVAlignment::CENTER:
_letterOffsetY = (_contentSize.height + _textDesiredHeight) / 2.f;
break;
case cocos2d::TextVAlignment::BOTTOM:
case axis::TextVAlignment::BOTTOM:
_letterOffsetY = _textDesiredHeight;
break;
default:
@ -421,7 +421,7 @@ void Label::shrinkLabelToContentSize(const std::function<bool(void)>& lambda)
}
}
void Label::recordLetterInfo(const cocos2d::Vec2& point, char32_t utf32Char, int letterIndex, int lineIndex)
void Label::recordLetterInfo(const axis::Vec2& point, char32_t utf32Char, int letterIndex, int lineIndex)
{
if (static_cast<std::size_t>(letterIndex) >= _lettersInfo.size())
{
@ -447,4 +447,4 @@ void Label::recordPlaceholderInfo(int letterIndex, char32_t utf32Char)
_lettersInfo[letterIndex].valid = false;
}
NS_CC_END
NS_AX_END

12
core/2d/CCLayer.cpp
View File

@ -50,7 +50,7 @@ THE SOFTWARE.
# include "platform/desktop/CCGLViewImpl-desktop.h"
#endif
NS_CC_BEGIN
NS_AX_BEGIN
Layer* Layer::create()
{
@ -409,8 +409,8 @@ LayerRadialGradient::~LayerRadialGradient()
CC_SAFE_RELEASE_NULL(_customCommand.getPipelineDescriptor().programState);
}
bool LayerRadialGradient::initWithColor(const cocos2d::Color4B& startColor,
const cocos2d::Color4B& endColor,
bool LayerRadialGradient::initWithColor(const axis::Color4B& startColor,
const axis::Color4B& endColor,
float radius,
const Vec2& center,
float expand)
@ -523,7 +523,7 @@ void LayerRadialGradient::setStartColor(const Color3B& color)
setStartColor(Color4B(color));
}
void LayerRadialGradient::setStartColor(const cocos2d::Color4B& color)
void LayerRadialGradient::setStartColor(const axis::Color4B& color)
{
_startColor = color;
convertColor4B24F(_startColorRend, _startColor);
@ -544,7 +544,7 @@ void LayerRadialGradient::setEndColor(const Color3B& color)
setEndColor(Color4B(color));
}
void LayerRadialGradient::setEndColor(const cocos2d::Color4B& color)
void LayerRadialGradient::setEndColor(const axis::Color4B& color)
{
_endColor = color;
convertColor4B24F(_endColorRend, _endColor);
@ -766,4 +766,4 @@ std::string LayerMultiplex::getDescription() const
return StringUtils::format("<LayerMultiplex | Tag = %d, Layers = %d", _tag, static_cast<int>(_children.size()));
}
NS_CC_END
NS_AX_END

4
core/2d/CCLayer.h
View File

@ -33,7 +33,7 @@ THE SOFTWARE.
#include <vector>
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup _2d
@ -445,4 +445,4 @@ private:
// end of _2d group
/// @}
NS_CC_END
NS_AX_END

4
core/2d/CCLight.cpp
View File

@ -25,7 +25,7 @@
#include "2d/CCLight.h"
#include "2d/CCScene.h"
NS_CC_BEGIN
NS_AX_BEGIN
void BaseLight::setIntensity(float intensity)
{
@ -176,4 +176,4 @@ AmbientLight::AmbientLight() {}
AmbientLight::~AmbientLight() {}
NS_CC_END
NS_AX_END

4
core/2d/CCLight.h
View File

@ -28,7 +28,7 @@
#include "2d/CCNode.h"
NS_CC_BEGIN
NS_AX_BEGIN
enum class LightType
{
@ -288,6 +288,6 @@ public:
virtual ~AmbientLight();
};
NS_CC_END
NS_AX_END
#endif

4
core/2d/CCMenu.cpp
View File

@ -37,7 +37,7 @@ THE SOFTWARE.
using namespace std;
NS_CC_BEGIN
NS_AX_BEGIN
enum
{
@ -557,4 +557,4 @@ std::string Menu::getDescription() const
return StringUtils::format("<Menu | Tag = %d>", _tag);
}
NS_CC_END
NS_AX_END

4
core/2d/CCMenu.h
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "2d/CCLayer.h"
#include "base/CCValue.h"
NS_CC_BEGIN
NS_AX_BEGIN
class Touch;
/**
@ -185,6 +185,6 @@ private:
// end of _2d group
/// @}
NS_CC_END
NS_AX_END
#endif //__CCMENU_H_

4
core/2d/CCMenuItem.cpp
View File

@ -34,7 +34,7 @@ THE SOFTWARE.
#include "base/ccUTF8.h"
#include <stdarg.h>
NS_CC_BEGIN
NS_AX_BEGIN
static int _globalFontSize = kItemSize;
static std::string _globalFontName = "Marker Felt";
@ -867,4 +867,4 @@ MenuItem* MenuItemToggle::getSelectedItem()
return _subItems.at(_selectedIndex);
}
NS_CC_END
NS_AX_END

4
core/2d/CCMenuItem.h
View File

@ -36,7 +36,7 @@ THE SOFTWARE.
#include "2d/CCNode.h"
#include "base/CCProtocols.h"
NS_CC_BEGIN
NS_AX_BEGIN
typedef std::function<void(Ref*)> ccMenuCallback;
@ -507,6 +507,6 @@ private:
// end of 2d group
/// @}
NS_CC_END
NS_AX_END
#endif //__CCMENU_ITEM_H__

4
core/2d/CCMotionStreak.cpp
View File

@ -34,7 +34,7 @@ THE SOFTWARE.
#include "renderer/ccShaders.h"
#include "renderer/backend/ProgramState.h"
NS_CC_BEGIN
NS_AX_BEGIN
MotionStreak::MotionStreak()
{
@ -438,4 +438,4 @@ void MotionStreak::draw(Renderer* renderer, const Mat4& transform, uint32_t flag
}
}
NS_CC_END
NS_AX_END

4
core/2d/CCMotionStreak.h
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "2d/CCNode.h"
#include "renderer/CCCustomCommand.h"
NS_CC_BEGIN
NS_AX_BEGIN
class Texture2D;
@ -206,4 +206,4 @@ private:
// end of _2d group
/// @}
NS_CC_END
NS_AX_END

4
core/2d/CCNode.cpp
View File

@ -58,7 +58,7 @@ THE SOFTWARE.
*/
#define CC_HASH_NODE_NAME(name) (!name.empty() ? XXH3_64bits(name.data(), name.length()) : 0)
NS_CC_BEGIN
NS_AX_BEGIN
// FIXME:: Yes, nodes might have a sort problem once every 30 days if the game runs at 60 FPS and each frame sprites are
// reordered.
@ -2247,4 +2247,4 @@ backend::ProgramState* Node::getProgramState() const
return _programState;
}
NS_CC_END
NS_AX_END

6
core/2d/CCNode.h
View File

@ -45,7 +45,7 @@
# include "physics/CCPhysicsBody.h"
#endif
NS_CC_BEGIN
NS_AX_BEGIN
class GridBase;
class Touch;
@ -946,7 +946,7 @@ public:
*
*/
template <typename _T>
inline static void sortNodes(cocos2d::Vector<_T*>& nodes)
inline static void sortNodes(axis::Vector<_T*>& nodes)
{
static_assert(std::is_base_of<Node, _T>::value, "Node::sortNodes: Only accept derived of Node!");
#if CC_64BITS
@ -2048,6 +2048,6 @@ bool CC_DLL isScreenPointInRect(const Vec2& pt, const Camera* camera, const Mat4
// end of _2d group
/// @}
NS_CC_END
NS_AX_END
#endif // __CCNODE_H__

6
core/2d/CCNodeGrid.cpp
View File

@ -26,7 +26,7 @@
#include "2d/CCGrid.h"
#include "renderer/CCRenderer.h"
NS_CC_BEGIN
NS_AX_BEGIN
NodeGrid* NodeGrid::create()
{
@ -42,7 +42,7 @@ NodeGrid* NodeGrid::create()
return ret;
}
NodeGrid* NodeGrid::create(const cocos2d::Rect& rect)
NodeGrid* NodeGrid::create(const axis::Rect& rect)
{
NodeGrid* ret = NodeGrid::create();
if (ret)
@ -178,4 +178,4 @@ void NodeGrid::setGrid(GridBase* grid)
_nodeGrid = grid;
}
NS_CC_END
NS_AX_END

4
core/2d/CCNodeGrid.h
View File

@ -28,7 +28,7 @@
#include "renderer/CCGroupCommand.h"
#include "renderer/CCCustomCommand.h"
NS_CC_BEGIN
NS_AX_BEGIN
class GridBase;
/**
@ -107,4 +107,4 @@ private:
CC_DISALLOW_COPY_AND_ASSIGN(NodeGrid);
};
/** @} */
NS_CC_END
NS_AX_END

4
core/2d/CCParallaxNode.cpp
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#include "2d/CCParallaxNode.h"
#include "base/ccCArray.h"
NS_CC_BEGIN
NS_AX_BEGIN
class PointObject : public Ref
{
@ -167,4 +167,4 @@ void ParallaxNode::visit(Renderer* renderer, const Mat4& parentTransform, uint32
Node::visit(renderer, parentTransform, parentFlags);
}
NS_CC_END
NS_AX_END

4
core/2d/CCParallaxNode.h
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "2d/CCNode.h"
/*#include "ccArray.h"*/
NS_CC_BEGIN
NS_AX_BEGIN
struct _ccArray;
@ -113,6 +113,6 @@ private:
// end of _2d group
/// @}
NS_CC_END
NS_AX_END
#endif //__CCPARALLAX_NODE_H__

6
core/2d/CCParticleBatchNode.cpp
View File

@ -45,7 +45,7 @@
#include "renderer/ccShaders.h"
#include "renderer/backend/ProgramState.h"
NS_CC_BEGIN
NS_AX_BEGIN
ParticleBatchNode::ParticleBatchNode()
{
@ -455,7 +455,7 @@ void ParticleBatchNode::draw(Renderer* renderer, const Mat4& transform, uint32_t
_customCommand.init(_globalZOrder, _blendFunc);
// Texture is set in TextureAtlas.
const cocos2d::Mat4& projectionMat = _director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
const axis::Mat4& projectionMat = _director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
Mat4 finalMat = projectionMat * transform;
auto programState = _customCommand.getPipelineDescriptor().programState;
programState->setUniform(_mvpMatrixLocaiton, finalMat.m, sizeof(finalMat.m));
@ -583,4 +583,4 @@ const BlendFunc& ParticleBatchNode::getBlendFunc() const
return _blendFunc;
}
NS_CC_END
NS_AX_END

4
core/2d/CCParticleBatchNode.h
View File

@ -34,7 +34,7 @@
#include "base/CCProtocols.h"
#include "renderer/CCCustomCommand.h"
NS_CC_BEGIN
NS_AX_BEGIN
class Texture2D;
class TextureAtlas;
@ -190,4 +190,4 @@ private:
// end of _2d group
/// @}
NS_CC_END
NS_AX_END

4
core/2d/CCParticleExamples.cpp
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "base/firePngData.h"
#include "renderer/CCTextureCache.h"
NS_CC_BEGIN
NS_AX_BEGIN
//
// ParticleFire
//
@ -1229,4 +1229,4 @@ bool ParticleRain::initWithTotalParticles(int numberOfParticles)
return false;
}
NS_CC_END
NS_AX_END

4
core/2d/CCParticleExamples.h
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "2d/CCParticleSystemQuad.h"
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup _2d
@ -436,6 +436,6 @@ private:
// end of _2d group
/// @}
NS_CC_END
NS_AX_END
#endif //__CCPARTICLE_EXAMPLE_H__

10
core/2d/CCParticleSystem.cpp
View File

@ -61,7 +61,7 @@ THE SOFTWARE.
using namespace std;
NS_CC_BEGIN
NS_AX_BEGIN
// ideas taken from:
// . The ocean spray in your face [Jeff Lander]
@ -1451,12 +1451,12 @@ bool ParticleSystem::addAnimationIndex(unsigned short index, std::string_view fr
return false;
}
bool ParticleSystem::addAnimationIndex(cocos2d::SpriteFrame* frame)
bool ParticleSystem::addAnimationIndex(axis::SpriteFrame* frame)
{
return addAnimationIndex(_animIndexCount, frame);
}
bool ParticleSystem::addAnimationIndex(unsigned short index, cocos2d::SpriteFrame* frame)
bool ParticleSystem::addAnimationIndex(unsigned short index, axis::SpriteFrame* frame)
{
if (frame)
{
@ -1468,7 +1468,7 @@ bool ParticleSystem::addAnimationIndex(unsigned short index, cocos2d::SpriteFram
return false;
}
bool ParticleSystem::addAnimationIndex(unsigned short index, cocos2d::Rect rect, bool rotated)
bool ParticleSystem::addAnimationIndex(unsigned short index, axis::Rect rect, bool rotated)
{
auto iter = _animationIndices.find(index);
if (iter == _animationIndices.end())
@ -2383,4 +2383,4 @@ void ParticleEmissionMaskCache::removeAllMasks()
this->masks.clear();
}
NS_CC_END
NS_AX_END

20
core/2d/CCParticleSystem.h
View File

@ -36,7 +36,7 @@ THE SOFTWARE.
#include "2d/CCSpriteFrameCache.h"
#include "math/FastRNG.h"
NS_CC_BEGIN
NS_AX_BEGIN
class ParticleBatchNode;
@ -80,7 +80,7 @@ struct EmissionShape
struct ParticleEmissionMaskDescriptor
{
Vec2 size;
std::vector<cocos2d::Vec2> points;
std::vector<axis::Vec2> points;
};
/** @struct ParticleAnimationDescriptor
@ -99,7 +99,7 @@ Structure that contains frame description
*/
struct ParticleFrameDescriptor
{
cocos2d::Rect rect;
axis::Rect rect;
bool isRotated;
};
@ -239,7 +239,7 @@ public:
* Particle emission mask cache.
* @since axis-1.0.0b8
*/
class CC_DLL ParticleEmissionMaskCache : public cocos2d::Ref
class CC_DLL ParticleEmissionMaskCache : public axis::Ref
{
public:
static ParticleEmissionMaskCache* getInstance();
@ -1144,7 +1144,7 @@ public:
*
* @return Returns true of the index was successfully found and added. Otherwise, false
*/
bool addAnimationIndex(cocos2d::SpriteFrame* frame);
bool addAnimationIndex(axis::SpriteFrame* frame);
/** Add a particle animation index based on tex coords spicified using a sprite frame.
* you can specify which index you want to override in this function
@ -1154,7 +1154,7 @@ public:
*
* @return Returns true of the index was successfully found and added. Otherwise, false
*/
bool addAnimationIndex(unsigned short index, cocos2d::SpriteFrame* frame);
bool addAnimationIndex(unsigned short index, axis::SpriteFrame* frame);
/** Add a particle animation index based on tex coords spicified.
* you can specify which index you want to override in this function
@ -1165,13 +1165,13 @@ public:
*
* @return Returns true of the index was successfully found and added. Otherwise, false
*/
bool addAnimationIndex(unsigned short index, cocos2d::Rect rect, bool rotated = false);
bool addAnimationIndex(unsigned short index, axis::Rect rect, bool rotated = false);
/** You can specify what rect is used if an index in an animation descriptor wasn't found.
*
* @param rect Rect containting data about tex coords in pixels
*/
void setRectForUndefinedIndices(cocos2d::Rect rect) { _undefinedIndexRect = rect; };
void setRectForUndefinedIndices(axis::Rect rect) { _undefinedIndexRect = rect; };
/** Add a particle animation descriptor with an index.
*
@ -1647,7 +1647,7 @@ protected:
/** Wether the animation goes with the time scale of the system or is independent. */
bool _animationTimescaleInd;
/** A rect that is used instead when an index is not found */
cocos2d::Rect _undefinedIndexRect;
axis::Rect _undefinedIndexRect;
/** does FlippedY variance of each particle */
int _yCoordFlipped;
@ -1690,6 +1690,6 @@ private:
// end of _2d group
/// @}
NS_CC_END
NS_AX_END
#endif //__CCPARTICLE_SYSTEM_H__

6
core/2d/CCParticleSystemQuad.cpp
View File

@ -44,7 +44,7 @@ THE SOFTWARE.
#include "renderer/backend/ProgramState.h"
#include "2d/CCTweenFunction.h"
NS_CC_BEGIN
NS_AX_BEGIN
ParticleSystemQuad::ParticleSystemQuad()
{
@ -710,7 +710,7 @@ void ParticleSystemQuad::draw(Renderer* renderer, const Mat4& transform, uint32_
{
auto programState = _quadCommand.getPipelineDescriptor().programState;
cocos2d::Mat4 projectionMat = _director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
axis::Mat4 projectionMat = _director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
programState->setUniform(_mvpMatrixLocaiton, projectionMat.m, sizeof(projectionMat.m));
_quadCommand.init(_globalZOrder, _texture, _blendFunc, _quads, _particleCount, transform, flags);
@ -878,4 +878,4 @@ std::string ParticleSystemQuad::getDescription() const
{
return StringUtils::format("<ParticleSystemQuad | Tag = %d, Total Particles = %d>", _tag, _totalParticles);
}
NS_CC_END
NS_AX_END

4
core/2d/CCParticleSystemQuad.h
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
#include "2d/CCParticleSystem.h"
#include "renderer/CCQuadCommand.h"
NS_CC_BEGIN
NS_AX_BEGIN
class SpriteFrame;
class EventCustom;
@ -182,4 +182,4 @@ private:
// end of _2d group
/// @}
NS_CC_END
NS_AX_END

8
core/2d/CCPlistSpriteSheetLoader.cpp
View File

@ -16,7 +16,7 @@
using namespace std;
NS_CC_BEGIN
NS_AX_BEGIN
void PlistSpriteSheetLoader::load(std::string_view filePath, SpriteFrameCache& cache)
{
@ -163,7 +163,7 @@ void PlistSpriteSheetLoader::addSpriteFramesWithDictionary(ValueMap& dictionary,
Version 3 with TexturePacker 4.0 polygon mesh packing
*/
if (dictionary["frames"].getType() != cocos2d::Value::Type::MAP)
if (dictionary["frames"].getType() != axis::Value::Type::MAP)
return;
auto spriteSheet = std::make_shared<SpriteSheet>();
@ -279,7 +279,7 @@ void PlistSpriteSheetLoader::addSpriteFramesWithDictionary(ValueMap& dictionary,
if (frameDict.find("vertices") != frameDict.end())
{
using cocos2d::utils::parseIntegerList;
using axis::utils::parseIntegerList;
auto vertices = parseIntegerList(optValue(frameDict, "vertices"sv).asString());
auto verticesUV = parseIntegerList(optValue(frameDict, "verticesUV"sv).asString());
auto indices = parseIntegerList(optValue(frameDict, "triangles"sv).asString());
@ -485,4 +485,4 @@ void PlistSpriteSheetLoader::reloadSpriteFramesWithDictionary(ValueMap& dict,
}
}
NS_CC_END
NS_AX_END

4
core/2d/CCPlistSpriteSheetLoader.h
View File

@ -6,7 +6,7 @@
#include "base/CCValue.h"
#include "base/CCData.h"
NS_CC_BEGIN
NS_AX_BEGIN
class PlistSpriteSheetLoader : public SpriteSheetLoader
{
@ -41,4 +41,4 @@ protected:
SpriteFrameCache& cache);
};
NS_CC_END
NS_AX_END

8
core/2d/CCProgressTimer.cpp
View File

@ -37,7 +37,7 @@ THE SOFTWARE.
#include "renderer/ccShaders.h"
#include "renderer/backend/ProgramState.h"
NS_CC_BEGIN
NS_AX_BEGIN
#define kProgressTextureCoordsCount 4
// kProgressTextureCoords holds points {0,1} {0,0} {1,0} {1,1} we can represent it as bits
@ -45,7 +45,7 @@ const char kProgressTextureCoords = 0x4b;
namespace
{
backend::ProgramState* initPipelineDescriptor(cocos2d::CustomCommand& command,
backend::ProgramState* initPipelineDescriptor(axis::CustomCommand& command,
bool ridal,
backend::UniformLocation& locMVP,
backend::UniformLocation& locTexture)
@ -615,7 +615,7 @@ void ProgressTimer::draw(Renderer* renderer, const Mat4& transform, uint32_t fla
if (_vertexData.empty() || !_sprite)
return;
const cocos2d::Mat4& projectionMat = _director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
const axis::Mat4& projectionMat = _director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
Mat4 finalMat = projectionMat * transform;
_programState->setUniform(_locMVP1, finalMat.m, sizeof(finalMat.m));
_programState->setTexture(_locTex1, 0, _sprite->getTexture()->getBackendTexture());
@ -645,4 +645,4 @@ void ProgressTimer::draw(Renderer* renderer, const Mat4& transform, uint32_t fla
}
}
NS_CC_END
NS_AX_END

4
core/2d/CCProgressTimer.h
View File

@ -33,7 +33,7 @@ THE SOFTWARE.
#include <vector>
NS_CC_BEGIN
NS_AX_BEGIN
class Sprite;
@ -207,4 +207,4 @@ private:
// end of misc_nodes group
/// @}
NS_CC_END
NS_AX_END

14
core/2d/CCProtectedNode.cpp
View File

@ -32,7 +32,7 @@
#include "base/CCDirector.h"
#include "2d/CCScene.h"
NS_CC_BEGIN
NS_AX_BEGIN
ProtectedNode::ProtectedNode() : _reorderProtectedChildDirty(false) {}
@ -64,12 +64,12 @@ void ProtectedNode::cleanup()
child->cleanup();
}
void ProtectedNode::addProtectedChild(cocos2d::Node* child)
void ProtectedNode::addProtectedChild(axis::Node* child)
{
addProtectedChild(child, child->getLocalZOrder(), child->getTag());
}
void ProtectedNode::addProtectedChild(cocos2d::Node* child, int localZOrder)
void ProtectedNode::addProtectedChild(axis::Node* child, int localZOrder)
{
addProtectedChild(child, localZOrder, child->getTag());
}
@ -132,7 +132,7 @@ Node* ProtectedNode::getProtectedChildByTag(int tag)
* If a class want's to extend the 'removeChild' behavior it only needs
* to override this method
*/
void ProtectedNode::removeProtectedChild(cocos2d::Node* child, bool cleanup)
void ProtectedNode::removeProtectedChild(axis::Node* child, bool cleanup)
{
// explicit nil handling
if (_protectedChildren.empty())
@ -228,7 +228,7 @@ void ProtectedNode::removeProtectedChildByTag(int tag, bool cleanup)
}
// helper used by reorderChild & add
void ProtectedNode::insertProtectedChild(cocos2d::Node* child, int z)
void ProtectedNode::insertProtectedChild(axis::Node* child, int z)
{
#if CC_ENABLE_GC_FOR_NATIVE_OBJECTS
auto sEngine = ScriptEngineManager::getInstance()->getScriptEngine();
@ -251,7 +251,7 @@ void ProtectedNode::sortAllProtectedChildren()
}
}
void ProtectedNode::reorderProtectedChild(cocos2d::Node* child, int localZOrder)
void ProtectedNode::reorderProtectedChild(axis::Node* child, int localZOrder)
{
CCASSERT(child != nullptr, "Child must be non-nil");
_reorderProtectedChildDirty = true;
@ -439,4 +439,4 @@ void ProtectedNode::setGlobalZOrder(float globalZOrder)
child->setGlobalZOrder(globalZOrder);
}
NS_CC_END
NS_AX_END

4
core/2d/CCProtectedNode.h
View File

@ -32,7 +32,7 @@
#include "2d/CCNode.h"
NS_CC_BEGIN
NS_AX_BEGIN
/**
* @addtogroup _2d
@ -205,6 +205,6 @@ private:
// end of 2d group
/// @}
NS_CC_END
NS_AX_END
#endif // __CPROTECTEDCNODE_H__

Some files were not shown because too many files have changed in this diff Show More