diff --git a/native/cocos/Android.mk b/native/cocos/Android.mk index 523ce182fe..dfbf1fd4e2 100644 --- a/native/cocos/Android.mk +++ b/native/cocos/Android.mk @@ -26,6 +26,7 @@ math/Quaternion.cpp \ math/Vec2.cpp \ math/Vec3.cpp \ math/Vec4.cpp \ +math/Mat3.cpp \ base/CCAutoreleasePool.cpp \ base/CCConfiguration.cpp \ base/CCData.cpp \ diff --git a/native/cocos/editor-support/spine-creator-support/SkeletonDataMgr.cpp b/native/cocos/editor-support/spine-creator-support/SkeletonDataMgr.cpp index 58317e6f17..93774b1f4e 100644 --- a/native/cocos/editor-support/spine-creator-support/SkeletonDataMgr.cpp +++ b/native/cocos/editor-support/spine-creator-support/SkeletonDataMgr.cpp @@ -29,6 +29,7 @@ #include "SkeletonDataMgr.h" #include +#include using namespace spine; diff --git a/native/cocos/renderer/renderer/BaseRenderer.cpp b/native/cocos/renderer/renderer/BaseRenderer.cpp index 6e0de37979..6e8689f6b7 100644 --- a/native/cocos/renderer/renderer/BaseRenderer.cpp +++ b/native/cocos/renderer/renderer/BaseRenderer.cpp @@ -44,7 +44,7 @@ BaseRenderer::BaseRenderer() _stageInfos = new RecyclePool([]()mutable->StageInfo*{return new StageInfo();}, 10); _views = new RecyclePool([]()mutable->View*{return new View();}, 8); - _tmpMat3 = new Mat3(); + _tmpMat3 = new cocos2d::Mat3(); } BaseRenderer::~BaseRenderer() @@ -264,7 +264,7 @@ void BaseRenderer::draw(const StageItem& item) Mat4 worldMatrix = item.model->getWorldMatrix(); _device->setUniformMat4("cc_matWorld", worldMatrix.m); - Mat3::fromMat4(*_tmpMat3, worldMatrix); + cocos2d::Mat3::fromMat4(*_tmpMat3, worldMatrix); _tmpMat3->inverse(); _tmpMat3->transpose(); _device->setUniformMat4("cc_mat3WorldIT", _tmpMat3->m);