mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
fixed android build
This commit is contained in:
@@ -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 \
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
#include "SkeletonDataMgr.h"
|
||||
#include <algorithm>
|
||||
#include <vector>
|
||||
|
||||
using namespace spine;
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ BaseRenderer::BaseRenderer()
|
||||
_stageInfos = new RecyclePool<StageInfo>([]()mutable->StageInfo*{return new StageInfo();}, 10);
|
||||
_views = new RecyclePool<View>([]()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);
|
||||
|
||||
Reference in New Issue
Block a user