From 2bd5935110c02080ab84dc0ba6770e9d3d96b6a5 Mon Sep 17 00:00:00 2001 From: 2youyouo2 <501251991@qq.com> Date: Wed, 26 Jun 2019 17:21:20 +0800 Subject: [PATCH 1/3] add effect.copy bindings --- .../CCArmatureDisplay.cpp | 2 +- .../SkeletonRenderer.cpp | 2 +- native/cocos/renderer/renderer/Effect.cpp | 14 ++++++------- native/cocos/renderer/renderer/Effect.h | 2 +- .../js-bindings/auto/jsb_renderer_auto.cpp | 20 +++++++++++++++++++ .../js-bindings/auto/jsb_renderer_auto.hpp | 1 + native/tools/tojs/renderer.ini | 2 +- 7 files changed, 32 insertions(+), 11 deletions(-) diff --git a/native/cocos/editor-support/dragonbones-creator-support/CCArmatureDisplay.cpp b/native/cocos/editor-support/dragonbones-creator-support/CCArmatureDisplay.cpp index cff99c6a01..d190bb4a05 100644 --- a/native/cocos/editor-support/dragonbones-creator-support/CCArmatureDisplay.cpp +++ b/native/cocos/editor-support/dragonbones-creator-support/CCArmatureDisplay.cpp @@ -269,7 +269,7 @@ void CCArmatureDisplay::traverseArmature(Armature* armature, float parentOpacity } auto effect = new cocos2d::renderer::Effect(); effect->autorelease(); - effect->copy(*_effect); + effect->copy(_effect); Technique* tech = effect->getTechnique(techStage); Vector& passes = (Vector&)tech->getPasses(); diff --git a/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp b/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp index eff1ad478c..6b73fb2dcd 100644 --- a/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp +++ b/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp @@ -365,7 +365,7 @@ void SkeletonRenderer::update (float deltaTime) { } auto effect = new cocos2d::renderer::Effect(); effect->autorelease(); - effect->copy(*_effect); + effect->copy(_effect); Technique* tech = effect->getTechnique(techStage); cocos2d::Vector& passes = (cocos2d::Vector&)tech->getPasses(); diff --git a/native/cocos/renderer/renderer/Effect.cpp b/native/cocos/renderer/renderer/Effect.cpp index 47ac0539d4..a97bb1e059 100644 --- a/native/cocos/renderer/renderer/Effect.cpp +++ b/native/cocos/renderer/renderer/Effect.cpp @@ -153,10 +153,10 @@ void Effect::generateKey() _definesKey <<= 8; } -void Effect::copy(Effect& effect) +void Effect::copy(const Effect* effect) { - _hash = effect._hash; - auto& otherTech = effect._techniques; + _hash = effect->_hash; + auto& otherTech = effect->_techniques; for (auto it = otherTech.begin(); it != otherTech.end(); it ++) { auto tech = new Technique(); @@ -164,10 +164,10 @@ void Effect::copy(Effect& effect) tech->copy(**it); _techniques.pushBack(tech); } - _defineTemplates = effect._defineTemplates; - _cachedNameValues = effect._cachedNameValues; - _properties = effect._properties; - _definesKey = effect._definesKey; + _defineTemplates = effect->_defineTemplates; + _cachedNameValues = effect->_cachedNameValues; + _properties = effect->_properties; + _definesKey = effect->_definesKey; } void Effect::setCullMode(CullMode cullMode) diff --git a/native/cocos/renderer/renderer/Effect.h b/native/cocos/renderer/renderer/Effect.h index 064bfef5af..6787daf226 100644 --- a/native/cocos/renderer/renderer/Effect.h +++ b/native/cocos/renderer/renderer/Effect.h @@ -192,7 +192,7 @@ public: /** * @brief Deep copy from other effect. */ - void copy(Effect& effect); + void copy(const Effect* effect); private: double _hash; diff --git a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp index 88d2909c1c..d244318c55 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp @@ -1010,6 +1010,25 @@ static bool js_renderer_Effect_updateHash(se::State& s) } SE_BIND_FUNC(js_renderer_Effect_updateHash) +static bool js_renderer_Effect_copy(se::State& s) +{ + cocos2d::renderer::Effect* cobj = (cocos2d::renderer::Effect*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_renderer_Effect_copy : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + CC_UNUSED bool ok = true; + if (argc == 1) { + const cocos2d::renderer::Effect* arg0 = nullptr; + ok &= seval_to_native_ptr(args[0], &arg0); + SE_PRECONDITION2(ok, false, "js_renderer_Effect_copy : Error processing arguments"); + cobj->copy(arg0); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); + return false; +} +SE_BIND_FUNC(js_renderer_Effect_copy) + static bool js_renderer_Effect_clear(se::State& s) { cocos2d::renderer::Effect* cobj = (cocos2d::renderer::Effect*)s.nativeThisObject(); @@ -1081,6 +1100,7 @@ bool js_register_renderer_Effect(se::Object* obj) cls->defineFunction("setBlend", _SE(js_renderer_Effect_setBlend)); cls->defineFunction("getHash", _SE(js_renderer_Effect_getHash)); cls->defineFunction("updateHash", _SE(js_renderer_Effect_updateHash)); + cls->defineFunction("copy", _SE(js_renderer_Effect_copy)); cls->defineFunction("clear", _SE(js_renderer_Effect_clear)); cls->defineFunction("define", _SE(js_renderer_Effect_define)); cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_Effect_finalize)); diff --git a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp index 81b7961a94..fdfd74d646 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp @@ -44,6 +44,7 @@ SE_DECLARE_FUNC(js_renderer_Effect_setStencil); SE_DECLARE_FUNC(js_renderer_Effect_setBlend); SE_DECLARE_FUNC(js_renderer_Effect_getHash); SE_DECLARE_FUNC(js_renderer_Effect_updateHash); +SE_DECLARE_FUNC(js_renderer_Effect_copy); SE_DECLARE_FUNC(js_renderer_Effect_clear); SE_DECLARE_FUNC(js_renderer_Effect_define); SE_DECLARE_FUNC(js_renderer_Effect_Effect); diff --git a/native/tools/tojs/renderer.ini b/native/tools/tojs/renderer.ini index 32fdfced12..98e8af1197 100644 --- a/native/tools/tojs/renderer.ini +++ b/native/tools/tojs/renderer.ini @@ -48,7 +48,7 @@ skip = BaseRenderer::[registerStage], Light::[extractView], View::[getForward getPosition], Scene::[getModel removeModel addModel removeModels], - Effect::[getProperties setProperty getDefines getDefinesKey extractDefines getTechniques init copy], + Effect::[getProperties setProperty getDefines getDefinesKey extractDefines getTechniques init], NodeProxy::[getWorldMatrix updateJSTRS getWorldPosition getWorldRT getPosition getScale getRotation visitAsRoot addChild removeChild removeAllChildren setParent], Pass::[setStencilTest copy], Technique::[setPass getParameters getPasses getStageIDs copy], From 2c1b1482c675ed109071a6c6ad09a384e9bec75b Mon Sep 17 00:00:00 2001 From: owen <1053210246@qq.com> Date: Wed, 26 Jun 2019 18:58:44 +0800 Subject: [PATCH 2/3] Native optimize --- native/cocos/editor-support/MeshBuffer.cpp | 38 +++- native/cocos/editor-support/MeshBuffer.h | 1 + .../cocos/editor-support/MiddlewareManager.h | 10 +- .../CCArmatureDisplay.cpp | 21 ++- .../CCArmatureDisplay.h | 6 + .../SkeletonRenderer.cpp | 45 ++++- .../spine-creator-support/SkeletonRenderer.h | 8 +- native/cocos/renderer/gfx/VertexFormat.cpp | 7 + native/cocos/renderer/gfx/VertexFormat.h | 4 + .../renderer/renderer/InputAssembler.cpp | 11 ++ .../cocos/renderer/renderer/InputAssembler.h | 4 + native/cocos/renderer/scene/ModelBatcher.cpp | 174 ++++++++++-------- native/cocos/renderer/scene/ModelBatcher.hpp | 36 ++-- native/cocos/renderer/scene/RenderFlow.cpp | 22 ++- native/cocos/renderer/scene/RenderFlow.hpp | 2 +- .../scene/assembler/CustomAssembler.cpp | 7 +- .../scene/assembler/CustomAssembler.hpp | 7 +- .../api/jsb_cocos2dx_dragonbones_auto_api.js | 18 +- .../auto/api/jsb_cocos2dx_spine_auto_api.js | 10 + .../auto/api/jsb_renderer_auto_api.js | 58 +++--- .../auto/jsb_cocos2dx_dragonbones_auto.cpp | 60 ++++-- .../auto/jsb_cocos2dx_dragonbones_auto.hpp | 3 +- .../auto/jsb_cocos2dx_spine_auto.cpp | 20 ++ .../auto/jsb_cocos2dx_spine_auto.hpp | 1 + .../js-bindings/auto/jsb_renderer_auto.cpp | 136 ++++++++------ .../js-bindings/auto/jsb_renderer_auto.hpp | 5 +- native/tools/tojs/renderer.ini | 2 +- 27 files changed, 483 insertions(+), 233 deletions(-) diff --git a/native/cocos/editor-support/MeshBuffer.cpp b/native/cocos/editor-support/MeshBuffer.cpp index 8713036878..18ca15696a 100644 --- a/native/cocos/editor-support/MeshBuffer.cpp +++ b/native/cocos/editor-support/MeshBuffer.cpp @@ -31,11 +31,12 @@ using namespace cocos2d::renderer; MIDDLEWARE_BEGIN -MeshBuffer::MeshBuffer(int vertexSize) -: _ib(INIT_INDEX_BUFFER_SIZE) -, _vb(MAX_VERTEX_BUFFER_SIZE * vertexSize) +MeshBuffer::MeshBuffer(int vertexFormat) +: _vertexFormat(vertexFormat) +, _ib(INIT_INDEX_BUFFER_SIZE) +, _vb(MAX_VERTEX_BUFFER_SIZE * vertexFormat) { - _vb.setMaxSize(MAX_VERTEX_BUFFER_SIZE * vertexSize); + _vb.setMaxSize(MAX_VERTEX_BUFFER_SIZE * _vertexFormat); _vb.setFullCallback([this] { uploadVB(); @@ -50,7 +51,19 @@ MeshBuffer::MeshBuffer(int vertexSize) _glIBArr.push_back(glIB); auto glVB = new VertexBuffer(); - glVB->init(DeviceGraphics::getInstance(), VertexFormat::XY_UV_Color, Usage::DYNAMIC, nullptr, 0, (uint32_t)_vb.getCapacity() / VertexFormat::XY_UV_Color->getBytes()); + switch(_vertexFormat) + { + case VF_XYUVC: + glVB->init(DeviceGraphics::getInstance(), VertexFormat::XY_UV_Color, Usage::DYNAMIC, nullptr, 0, (uint32_t)_vb.getCapacity() / VertexFormat::XY_UV_Color->getBytes()); + break; + case VF_XYUVCC: + glVB->init(DeviceGraphics::getInstance(), VertexFormat::XY_UV_Two_Color, Usage::DYNAMIC, nullptr, 0, (uint32_t)_vb.getCapacity() / VertexFormat::XY_UV_Two_Color->getBytes()); + break; + default: + CCASSERT(false, "MeshBuffer constructor unknow vertex format"); + break; + } + _glVBArr.push_back(glVB); } @@ -99,7 +112,20 @@ void MeshBuffer::next() if (_glVBArr.size() <= _bufferPos) { auto glVB = new VertexBuffer(); - glVB->init(DeviceGraphics::getInstance(), VertexFormat::XY_UV_Color, Usage::DYNAMIC, nullptr, 0, (uint32_t)_vb.getCapacity() / VertexFormat::XY_UV_Color->getBytes()); + + switch(_vertexFormat) + { + case VF_XYUVC: + glVB->init(DeviceGraphics::getInstance(), VertexFormat::XY_UV_Color, Usage::DYNAMIC, nullptr, 0, (uint32_t)_vb.getCapacity() / VertexFormat::XY_UV_Color->getBytes()); + break; + case VF_XYUVCC: + glVB->init(DeviceGraphics::getInstance(), VertexFormat::XY_UV_Two_Color, Usage::DYNAMIC, nullptr, 0, (uint32_t)_vb.getCapacity() / VertexFormat::XY_UV_Two_Color->getBytes()); + break; + default: + CCASSERT(false, "MeshBuffer constructor unknow vertex format"); + break; + } + _glVBArr.push_back(glVB); } } diff --git a/native/cocos/editor-support/MeshBuffer.h b/native/cocos/editor-support/MeshBuffer.h index 7fe802ef2a..e75bbc5f85 100644 --- a/native/cocos/editor-support/MeshBuffer.h +++ b/native/cocos/editor-support/MeshBuffer.h @@ -68,6 +68,7 @@ private: std::size_t _bufferPos = 0; IOBuffer _vb; IOBuffer _ib; + int _vertexFormat = 0; }; MIDDLEWARE_END diff --git a/native/cocos/editor-support/MiddlewareManager.h b/native/cocos/editor-support/MiddlewareManager.h index 670f9bef68..a1ecd4d8b9 100644 --- a/native/cocos/editor-support/MiddlewareManager.h +++ b/native/cocos/editor-support/MiddlewareManager.h @@ -66,8 +66,16 @@ public: } } + static uint8_t generateModuleID() + { + static uint8_t uniqueId = 0; + uniqueId++; + return uniqueId; + } + /** - * update by js + * @brief update all elements + * @param[in] dt Delta time. */ void update(float dt); diff --git a/native/cocos/editor-support/dragonbones-creator-support/CCArmatureDisplay.cpp b/native/cocos/editor-support/dragonbones-creator-support/CCArmatureDisplay.cpp index d190bb4a05..72c82d10e7 100644 --- a/native/cocos/editor-support/dragonbones-creator-support/CCArmatureDisplay.cpp +++ b/native/cocos/editor-support/dragonbones-creator-support/CCArmatureDisplay.cpp @@ -32,6 +32,7 @@ using namespace cocos2d::renderer; static const std::string techStage = "opaque"; static const std::string textureKey = "texture"; +static const uint8_t moduleID = MiddlewareManager::generateModuleID(); DRAGONBONES_NAMESPACE_BEGIN @@ -107,6 +108,7 @@ void CCArmatureDisplay::dbUpdate() return; } _assembler->reset(); + _assembler->setUseModel(!_batch); _preBlendMode = -1; _preTextureIndex = -1; @@ -201,6 +203,9 @@ CCArmatureDisplay* CCArmatureDisplay::getRootDisplay() void CCArmatureDisplay::traverseArmature(Armature* armature, float parentOpacity) { + static cocos2d::Mat4 matrixTemp; + const cocos2d::Mat4& nodeWorldMat = _nodeProxy->getWorldMatrix(); + auto& slots = armature->getSlots(); auto mgr = MiddlewareManager::getInstance(); @@ -208,6 +213,7 @@ void CCArmatureDisplay::traverseArmature(Armature* armature, float parentOpacity IOBuffer& vb = mb->getVB(); IOBuffer& ib = mb->getIB(); float realOpacity = _nodeProxy->getRealOpacity() / 255.0f; + float r, g, b, a; CCSlot* slot = nullptr; middleware::Texture2D* texture = nullptr; @@ -242,7 +248,7 @@ void CCArmatureDisplay::traverseArmature(Armature* armature, float parentOpacity break; } - double curHash = _curTextureIndex + (int)_curBlendSrc + (int)_curBlendDst; + double curHash = _curTextureIndex + (moduleID << 16) + ((uint8_t)slot->_blendMode << 24); Effect* renderEffect = _assembler->getEffect(_materialLen); Technique::Parameter* param = nullptr; @@ -349,14 +355,21 @@ void CCArmatureDisplay::traverseArmature(Armature* armature, float parentOpacity // Transform component matrix to global matrix middleware::Triangles& triangles = slot->triangles; - cocos2d::Mat4& worldMatrix = slot->worldMatrix; + cocos2d::Mat4* worldMatrix = &slot->worldMatrix; + if (_batch) { + cocos2d::Mat4::multiply(nodeWorldMat, *worldMatrix, &matrixTemp); + worldMatrix = &matrixTemp; + } + middleware::V2F_T2F_C4B* worldTriangles = slot->worldVerts; + for (int v = 0, w = 0, vn = triangles.vertCount; v < vn; ++v, w += 2) { middleware::V2F_T2F_C4B* vertex = triangles.verts + v; middleware::V2F_T2F_C4B* worldVertex = worldTriangles + v; - worldVertex->vertex.x = vertex->vertex.x * worldMatrix.m[0] + vertex->vertex.y * worldMatrix.m[4] + worldMatrix.m[12]; - worldVertex->vertex.y = vertex->vertex.x * worldMatrix.m[1] + vertex->vertex.y * worldMatrix.m[5] + worldMatrix.m[13]; + worldVertex->vertex.x = vertex->vertex.x * worldMatrix->m[0] + vertex->vertex.y * worldMatrix->m[4] + worldMatrix->m[12]; + worldVertex->vertex.y = vertex->vertex.x * worldMatrix->m[1] + vertex->vertex.y * worldMatrix->m[5] + worldMatrix->m[13]; + worldVertex->color.r = (GLubyte)r; worldVertex->color.g = (GLubyte)g; worldVertex->color.b = (GLubyte)b; diff --git a/native/cocos/editor-support/dragonbones-creator-support/CCArmatureDisplay.h b/native/cocos/editor-support/dragonbones-creator-support/CCArmatureDisplay.h index fbb7871d7e..edf2c2de62 100644 --- a/native/cocos/editor-support/dragonbones-creator-support/CCArmatureDisplay.h +++ b/native/cocos/editor-support/dragonbones-creator-support/CCArmatureDisplay.h @@ -153,6 +153,11 @@ public: _debugDraw = enabled; } + void setBatchEnabled (bool enabled) + { + _batch = enabled; + } + void setOpacityModifyRGB (bool value) { _premultipliedAlpha = value; @@ -193,6 +198,7 @@ private: int _debugSlotsLen = 0; int _materialLen = 0; + bool _batch = false; bool _premultipliedAlpha = false; dbEventCallback _dbEventCallback = nullptr; cocos2d::renderer::NodeProxy* _nodeProxy = nullptr; diff --git a/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp b/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp index 6b73fb2dcd..0d09b2f00a 100644 --- a/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp +++ b/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp @@ -49,6 +49,7 @@ using namespace cocos2d::renderer; static const std::string techStage = "opaque"; static const std::string textureKey = "texture"; +static const uint8_t moduleID = MiddlewareManager::generateModuleID(); static Cocos2dTextureLoader textureLoader; @@ -270,6 +271,7 @@ void SkeletonRenderer::update (float deltaTime) { return; } assembler->reset(); + assembler->setUseModel(!_batch); _nodeColor.a = _nodeProxy->getRealOpacity() / (float)255; @@ -287,16 +289,22 @@ void SkeletonRenderer::update (float deltaTime) { middleware::IOBuffer& vb = mb->getVB(); middleware::IOBuffer& ib = mb->getIB(); + // vertex size int bytes with one color + int vbs1 = sizeof(V2F_T2F_C4B); // vertex size in floats with one color - int vs1 = sizeof(V2F_T2F_C4B) / sizeof(float); + int vs1 = vbs1 / sizeof(float); + // vertex size int bytes with two color + int vbs2 = sizeof(V2F_T2F_C4B_C4B); // verex size in floats with two color - int vs2 = sizeof(V2F_T2F_C4B_C4B) / sizeof(float); - + int vs2 = vbs2 / sizeof(float); + const cocos2d::Mat4& nodeWorldMat = _nodeProxy->getWorldMatrix(); + int vbSize = 0; int ibSize = 0; BlendFactor curBlendSrc = BlendFactor::ONE; BlendFactor curBlendDst = BlendFactor::ZERO; + int curBlendMode = -1; int preBlendMode = -1; int preTextureIndex = -1; int curTextureIndex = -1; @@ -325,7 +333,8 @@ void SkeletonRenderer::update (float deltaTime) { } // prepare to fill new segment field - switch (slot->getData().getBlendMode()) { + curBlendMode = slot->getData().getBlendMode(); + switch (curBlendMode) { case BlendMode_Additive: curBlendSrc = _premultipliedAlpha ? BlendFactor::ONE : BlendFactor::SRC_ALPHA; curBlendDst = BlendFactor::ONE; @@ -343,7 +352,7 @@ void SkeletonRenderer::update (float deltaTime) { curBlendDst = BlendFactor::ONE_MINUS_SRC_ALPHA; } - double curHash = curTextureIndex + (int)curBlendSrc + (int)curBlendDst; + double curHash = curTextureIndex + (moduleID << 16) + (curBlendMode << 24) + ((int)_useTint << 25) + ((int)_batch << 27); Effect* renderEffect = assembler->getEffect(materialLen); Technique::Parameter* param = nullptr; Pass* pass = nullptr; @@ -384,7 +393,7 @@ void SkeletonRenderer::update (float deltaTime) { pass->setBlend(BlendOp::ADD, curBlendSrc, curBlendDst, BlendOp::ADD, curBlendSrc, curBlendDst); } - + renderEffect->updateHash(curHash); // save new segment count pos field @@ -814,9 +823,25 @@ void SkeletonRenderer::update (float deltaTime) { } if (vbSize > 0 && ibSize > 0) { - auto vertexOffset = vb.getCurPos() / sizeof(middleware::V2F_T2F_C4B); + auto vbs = vbs1; + auto vertexOffset = vb.getCurPos() / vbs1; if (_useTint) { - vertexOffset = vb.getCurPos() / sizeof(middleware::V2F_T2F_C4B_C4B); + vbs = vbs2; + vertexOffset = vb.getCurPos() / vbs2; + } + + if (_batch) { + uint8_t* vbBuffer = vb.getCurBuffer(); + cocos2d::Vec3* point = nullptr; + float tempZ = 0.0f; + for (int ii = 0, nn = vbSize; ii < nn; ii += vbs) + { + point = (cocos2d::Vec3*)(vbBuffer + ii); + tempZ = point->z; + point->z = 0; + nodeWorldMat.transformPoint(point); + point->z = tempZ; + } } if (vertexOffset > 0) { @@ -1017,6 +1042,10 @@ void SkeletonRenderer::setColor (cocos2d::Color4B& color) { _nodeColor.a = color.a / 255.0f; } +void SkeletonRenderer::setBatchEnabled (bool enabled) { + _batch = enabled; +} + void SkeletonRenderer::setDebugBonesEnabled (bool enabled) { _debugBones = enabled; } diff --git a/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.h b/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.h index b7adb258a9..b24a756616 100644 --- a/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.h +++ b/native/cocos/editor-support/spine-creator-support/SkeletonRenderer.h @@ -110,16 +110,14 @@ namespace spine { return nullptr; } - void bindNodeProxy(cocos2d::renderer::NodeProxy* node) - { + void bindNodeProxy(cocos2d::renderer::NodeProxy* node) { if (node == _nodeProxy) return; CC_SAFE_RELEASE(_nodeProxy); _nodeProxy = node; CC_SAFE_RETAIN(_nodeProxy); } - void setEffect(cocos2d::renderer::Effect* effect) - { + void setEffect(cocos2d::renderer::Effect* effect) { if (effect == _effect) return; CC_SAFE_RELEASE(_effect); _effect = effect; @@ -127,6 +125,7 @@ namespace spine { } void setColor (cocos2d::Color4B& color); + void setBatchEnabled (bool enabled); void setDebugBonesEnabled (bool enabled); void setDebugSlotsEnabled (bool enabled); void setDebugMeshEnabled (bool enabled); @@ -171,6 +170,7 @@ namespace spine { float _timeScale = 1; bool _paused = false; + bool _batch = false; bool _debugMesh = false; bool _debugSlots = false; bool _debugBones = false; diff --git a/native/cocos/renderer/gfx/VertexFormat.cpp b/native/cocos/renderer/gfx/VertexFormat.cpp index 2e7458bfcc..a4c9d612f9 100644 --- a/native/cocos/renderer/gfx/VertexFormat.cpp +++ b/native/cocos/renderer/gfx/VertexFormat.cpp @@ -48,6 +48,13 @@ static uint32_t attrTypeBytes(AttribType attrType) return 0; } +VertexFormat* VertexFormat::XY_UV_Two_Color = new VertexFormat(std::vector({ + Info(ATTRIB_NAME_POSITION, AttribType::FLOAT32, 2), + Info(ATTRIB_NAME_UV0, AttribType::FLOAT32, 2), + Info(ATTRIB_NAME_COLOR, AttribType::UINT8, 4, true), + Info(ATTRIB_NAME_COLOR0, AttribType::UINT8, 4, true) +})); + VertexFormat* VertexFormat::XY_UV_Color = new VertexFormat(std::vector({ Info(ATTRIB_NAME_POSITION, AttribType::FLOAT32, 2), Info(ATTRIB_NAME_UV0, AttribType::FLOAT32, 2), diff --git a/native/cocos/renderer/gfx/VertexFormat.h b/native/cocos/renderer/gfx/VertexFormat.h index ed7fb61886..e7a5754db7 100644 --- a/native/cocos/renderer/gfx/VertexFormat.h +++ b/native/cocos/renderer/gfx/VertexFormat.h @@ -167,6 +167,10 @@ public: */ uint32_t getBytes() const { return _bytes; }; + /* + * Builtin VertexFormat with 2d position, uv, color, color0 attributes + */ + static VertexFormat* XY_UV_Two_Color; /* * Builtin VertexFormat with 2d position, uv, color attributes */ diff --git a/native/cocos/renderer/renderer/InputAssembler.cpp b/native/cocos/renderer/renderer/InputAssembler.cpp index 359be41763..26a5ef93c9 100644 --- a/native/cocos/renderer/renderer/InputAssembler.cpp +++ b/native/cocos/renderer/renderer/InputAssembler.cpp @@ -90,6 +90,8 @@ InputAssembler& InputAssembler::operator=(InputAssembler&& o) o._indexBuffer = nullptr; o._vertexBuffer = nullptr; + o._start = 0; + o._count = -1; return *this; } @@ -130,4 +132,13 @@ uint32_t InputAssembler::getPrimitiveCount() const return _vertexBuffer->getCount(); } +bool InputAssembler::isMergeable(const InputAssembler& ia) const +{ + if (_indexBuffer != ia._indexBuffer || _vertexBuffer != ia._vertexBuffer) + { + return false; + } + return (_start + _count) == ia._start; +} + RENDERER_END diff --git a/native/cocos/renderer/renderer/InputAssembler.h b/native/cocos/renderer/renderer/InputAssembler.h index cdb0b100c4..173fe18ceb 100644 --- a/native/cocos/renderer/renderer/InputAssembler.h +++ b/native/cocos/renderer/renderer/InputAssembler.h @@ -107,6 +107,10 @@ public: * @brief Clears all field. */ void clear(); + /** + * @brief Can be merge. + */ + bool isMergeable(const InputAssembler& ia) const; private: friend class BaseRenderer; diff --git a/native/cocos/renderer/scene/ModelBatcher.cpp b/native/cocos/renderer/scene/ModelBatcher.cpp index b959778cdc..d5ae3f6efb 100644 --- a/native/cocos/renderer/scene/ModelBatcher.cpp +++ b/native/cocos/renderer/scene/ModelBatcher.cpp @@ -29,12 +29,10 @@ RENDERER_BEGIN -#define INIT_IA_LENGTH 16 #define INIT_MODEL_LENGTH 16 ModelBatcher::ModelBatcher(RenderFlow* flow) : _flow(flow) -, _iaOffset(0) , _modelOffset(0) , _cullingMask(0) , _walking(false) @@ -42,11 +40,6 @@ ModelBatcher::ModelBatcher(RenderFlow* flow) , _buffer(nullptr) , _useModel(false) { - for (int i = 0; i < INIT_IA_LENGTH; i++) - { - _iaPool.push_back(new InputAssembler()); - } - for (int i = 0; i < INIT_MODEL_LENGTH; i++) { _modelPool.push_back(new Model()); @@ -57,13 +50,6 @@ ModelBatcher::ModelBatcher(RenderFlow* flow) ModelBatcher::~ModelBatcher() { - for (int i = 0; i < _iaPool.size(); i++) - { - auto ia = _iaPool[i]; - delete ia; - } - _iaPool.clear(); - for (int i = 0; i < _modelPool.size(); i++) { auto model = _modelPool[i]; @@ -81,17 +67,14 @@ ModelBatcher::~ModelBatcher() void ModelBatcher::reset() { - _iaOffset = 0; - _modelOffset = 0; - - for (int i = 0; i < _batchedModel.size(); ++i) + for (int i = 0; i < _modelOffset; ++i) { - Model* model = _batchedModel[i]; + Model* model = _modelPool[i]; model->clearInputAssemblers(); model->clearEffects(); - _flow->getRenderScene()->removeModel(model); } - _batchedModel.clear(); + _flow->getRenderScene()->removeModels(); + _modelOffset = 0; for (auto iter : _buffers) { @@ -99,18 +82,39 @@ void ModelBatcher::reset() } _buffer = nullptr; - CC_SAFE_RELEASE_NULL(_currEffect); + _commitState = CommitState::None; + setCurrentEffect(nullptr); + _ia.clear(); _cullingMask = 0; _walking = false; _useModel = false; _modelMat.set(Mat4::IDENTITY); - _stencilMgr->reset(); } +void ModelBatcher::changeCommitState(CommitState state) +{ + if (_commitState == state) return; + switch(_commitState) + { + case CommitState::Custom: + flushIA(); + break; + case CommitState::Common: + flush(); + break; + default: + break; + } + setCurrentEffect(nullptr); + _commitState = state; +} + void ModelBatcher::commit(NodeProxy* node, Assembler* assembler) { + changeCommitState(CommitState::Common); + VertexFormat* vfmt = assembler->getVertexFormat(); if (!vfmt) { @@ -121,19 +125,18 @@ void ModelBatcher::commit(NodeProxy* node, Assembler* assembler) bool ignoreWorldMatrix = assembler->isIgnoreWorldMatrix(); const Mat4& nodeWorldMat = node->getWorldMatrix(); const Mat4& worldMat = useModel && !ignoreWorldMatrix ? nodeWorldMat : Mat4::IDENTITY; + int cullingMask = node->getCullingMask(); for (std::size_t i = 0, l = assembler->getIACount(); i < l; ++i) { assembler->beforeFillBuffers(i); - Effect* effect = assembler->getEffect((uint32_t)i); + Effect* effect = assembler->getEffect(i); if (!effect) continue; - int cullingMask = node->getCullingMask(); if (_currEffect == nullptr || _currEffect->getHash() != effect->getHash() || - _cullingMask != cullingMask || - _useModel != useModel) + _cullingMask != cullingMask || useModel) { // Break auto batch flush(); @@ -161,44 +164,70 @@ void ModelBatcher::commit(NodeProxy* node, Assembler* assembler) void ModelBatcher::commitIA(NodeProxy* node, CustomAssembler* assembler) { - flush(); + changeCommitState(CommitState::Custom); + + Effect* effect = assembler->getEffect(0); + if (!effect) return; + + auto customIA = assembler->getIA(0); + if (!customIA) return; - for (std::size_t i = 0, n = assembler->getIACount(); i < n; i++ ) + std::size_t iaCount = assembler->getIACount(); + int cullingMask = node->getCullingMask(); + bool useModel = assembler->getUseModel(); + const Mat4& worldMat = useModel ? node->getWorldMatrix() : Mat4::IDENTITY; + + if (_currEffect == nullptr || + _currEffect->getHash() != effect->getHash() || + _cullingMask != cullingMask || useModel || + !_ia.isMergeable(*customIA)) { - const Mat4& worldMat = assembler->getUseModel() ? node->getWorldMatrix() : Mat4::IDENTITY; - Effect* effect = assembler->getEffect((uint32_t)i); - if (!effect) continue; + flushIA(); + setCurrentEffect(effect); - _cullingMask = node->getCullingMask(); _modelMat.set(worldMat); - assembler->renderIA(i, this, node); + _useModel = useModel; + _cullingMask = cullingMask; + + _ia.setVertexBuffer(customIA->getVertexBuffer()); + _ia.setIndexBuffer(customIA->getIndexBuffer()); + _ia.setStart(customIA->getStart()); + _ia.setCount(0); + } + + for (std::size_t i = 0; i < iaCount; i++ ) + { + customIA = assembler->getIA(i); + effect = assembler->getEffect(i); + if (!effect) continue; + + if (i > 0) + { + flushIA(); + + setCurrentEffect(effect); + _modelMat.set(worldMat); + _useModel = useModel; + _cullingMask = cullingMask; + + _ia.setVertexBuffer(customIA->getVertexBuffer()); + _ia.setIndexBuffer(customIA->getIndexBuffer()); + _ia.setStart(customIA->getStart()); + _ia.setCount(0); + } + + _ia.setCount(_ia.getCount() + customIA->getCount()); } } -void ModelBatcher::flushIA(InputAssembler* customIA) +void ModelBatcher::flushIA() { - if (!_walking || _currEffect == nullptr || customIA == nullptr || customIA->getCount() <= 0) + if (!_walking || _currEffect == nullptr || _ia.getCount() <= 0) { + _ia.clear(); return; } - // Generate IA - InputAssembler* ia = nullptr; - if (_iaOffset >= _iaPool.size()) - { - ia = new InputAssembler(); - _iaPool.push_back(ia); - } - else - { - ia = _iaPool[_iaOffset]; - } - _iaOffset++; - ia->setVertexBuffer(customIA->getVertexBuffer()); - ia->setIndexBuffer(customIA->getIndexBuffer()); - ia->setStart(customIA->getStart()); - ia->setCount(customIA->getCount()); - // Stencil manager process _stencilMgr->handleEffect(_currEffect); @@ -218,18 +247,11 @@ void ModelBatcher::flushIA(InputAssembler* customIA) model->setWorldMatix(_modelMat); model->setCullingMask(_cullingMask); model->addEffect(_currEffect); - model->addInputAssembler(*ia); - _batchedModel.push_back(model); + model->addInputAssembler(_ia); _flow->getRenderScene()->addModel(model); } -void ModelBatcher::startBatch() -{ - reset(); - _walking = true; -} - void ModelBatcher::flush() { if (_buffer == nullptr) @@ -245,22 +267,10 @@ void ModelBatcher::flush() return; } - // Generate IA - InputAssembler* ia = nullptr; - if (_iaOffset >= _iaPool.size()) - { - ia = new InputAssembler(); - _iaPool.push_back(ia); - } - else - { - ia = _iaPool[_iaOffset]; - } - _iaOffset++; - ia->setVertexBuffer(_buffer->getVertexBuffer()); - ia->setIndexBuffer(_buffer->getIndexBuffer()); - ia->setStart(indexStart); - ia->setCount(indexCount); + _ia.setVertexBuffer(_buffer->getVertexBuffer()); + _ia.setIndexBuffer(_buffer->getIndexBuffer()); + _ia.setStart(indexStart); + _ia.setCount(indexCount); // Stencil manager process _stencilMgr->handleEffect(_currEffect); @@ -281,17 +291,23 @@ void ModelBatcher::flush() model->setWorldMatix(_modelMat); model->setCullingMask(_cullingMask); model->addEffect(_currEffect); - model->addInputAssembler(*ia); - _batchedModel.push_back(model); + model->addInputAssembler(_ia); _flow->getRenderScene()->addModel(model); _buffer->updateOffset(); } +void ModelBatcher::startBatch() +{ + reset(); + _walking = true; +} + void ModelBatcher::terminateBatch() { flush(); + flushIA(); for (auto iter : _buffers) { diff --git a/native/cocos/renderer/scene/ModelBatcher.hpp b/native/cocos/renderer/scene/ModelBatcher.hpp index 1cb94a1938..c2037cfb75 100644 --- a/native/cocos/renderer/scene/ModelBatcher.hpp +++ b/native/cocos/renderer/scene/ModelBatcher.hpp @@ -50,6 +50,13 @@ class StencilManager; class ModelBatcher { public: + + enum CommitState { + None, + Common, + Custom, + }; + /** * @brief The constructor. */ @@ -86,7 +93,11 @@ public: */ void flush(); /** - * @brief Construct a new Model from custom input assembler provided by CustomRenderHandle and add the Model to render Scene. + * @brief Finished Custom input assmebler batch and add the Model to render Scene. + */ + void flushIA(); + /** + * @brief Add new input assembler into current input assembler. */ void flushIA(InputAssembler* customIA); /** @@ -118,22 +129,23 @@ public: void setCurrentEffect(Effect* effect); void setUseModel(bool useModel) { _useModel = useModel; } private: - int _iaOffset; - int _modelOffset; - int _cullingMask; - bool _useModel; - bool _walking; + void changeCommitState(CommitState state); +private: + int _modelOffset = 0; + int _cullingMask = 0; + bool _useModel = false; + bool _walking = false; cocos2d::Mat4 _modelMat; + CommitState _commitState = CommitState::None; - MeshBuffer* _buffer; - Effect* _currEffect; - RenderFlow* _flow; + MeshBuffer* _buffer = nullptr; + Effect* _currEffect = nullptr; + RenderFlow* _flow = nullptr; - StencilManager* _stencilMgr; + StencilManager* _stencilMgr = nullptr; - std::vector _iaPool; + InputAssembler _ia; std::vector _modelPool; - std::vector _batchedModel; std::unordered_map _buffers; }; diff --git a/native/cocos/renderer/scene/RenderFlow.cpp b/native/cocos/renderer/scene/RenderFlow.cpp index 0cc6da3b9d..28f4478472 100644 --- a/native/cocos/renderer/scene/RenderFlow.cpp +++ b/native/cocos/renderer/scene/RenderFlow.cpp @@ -25,6 +25,10 @@ #include "RenderFlow.hpp" #include "NodeMemPool.hpp" +#if USE_MIDDLEWARE +#include "MiddlewareManager.h" +#endif + RENDERER_BEGIN const uint32_t InitLevelCount = 3; @@ -201,7 +205,7 @@ void RenderFlow::calculateLevelWorldMatrix(int tid) auto selfDirty = *info.dirty & WORLD_TRANSFORM; if (info.parentDirty != nullptr && ((*info.parentDirty & WORLD_TRANSFORM_CHANGED) || selfDirty)) { - info.worldMat->multiply(*info.parentWorldMat, *info.localMat, info.worldMat); + cocos2d::Mat4::multiply(*info.parentWorldMat, *info.localMat, info.worldMat); *info.dirty |= WORLD_TRANSFORM_CHANGED; *info.dirty &= ~WORLD_TRANSFORM; } @@ -225,7 +229,7 @@ void RenderFlow::calculateWorldMatrix() auto selfDirty = *info.dirty & WORLD_TRANSFORM; if (info.parentDirty != nullptr && ((*info.parentDirty & WORLD_TRANSFORM_CHANGED) || selfDirty)) { - info.worldMat->multiply(*info.parentWorldMat, *info.localMat, info.worldMat); + cocos2d::Mat4::multiply(*info.parentWorldMat, *info.localMat, info.worldMat); *info.dirty |= WORLD_TRANSFORM_CHANGED; *info.dirty &= ~WORLD_TRANSFORM; } @@ -239,7 +243,7 @@ void RenderFlow::calculateWorldMatrix() } } -void RenderFlow::render(NodeProxy* scene) +void RenderFlow::render(NodeProxy* scene, float deltaTime) { if (scene != nullptr) { @@ -275,7 +279,11 @@ void RenderFlow::render(NodeProxy* scene) } else { - if (!threadBegan) _paralleTask->begin(); + if (!threadBegan) + { + _paralleTask->begin(); + threadBegan = true; + } *_runFlag = ParallelTask::RunFlag::ToProcess; calculateLevelWorldMatrix(mainThreadTid); while(*_runFlag != ParallelTask::RunFlag::ProcessFinished) std::this_thread::yield(); @@ -287,7 +295,11 @@ void RenderFlow::render(NodeProxy* scene) calculateLocalMatrix(); calculateWorldMatrix(); #endif - + +#if USE_MIDDLEWARE + middleware::MiddlewareManager::getInstance()->update(deltaTime); +#endif + _batcher->startBatch(); scene->visitAsRoot(_batcher, _scene); _batcher->terminateBatch(); diff --git a/native/cocos/renderer/scene/RenderFlow.hpp b/native/cocos/renderer/scene/RenderFlow.hpp index 468b3be9fb..94af73b4e3 100644 --- a/native/cocos/renderer/scene/RenderFlow.hpp +++ b/native/cocos/renderer/scene/RenderFlow.hpp @@ -124,7 +124,7 @@ public: * @brief Render the scene specified by its root node. * @param[in] scene The root node. */ - void render(NodeProxy* scene); + void render(NodeProxy* scene, float deltaTime); /** * @brief Visit a node tree. */ diff --git a/native/cocos/renderer/scene/assembler/CustomAssembler.cpp b/native/cocos/renderer/scene/assembler/CustomAssembler.cpp index ca0da2edaf..851099ffb8 100644 --- a/native/cocos/renderer/scene/assembler/CustomAssembler.cpp +++ b/native/cocos/renderer/scene/assembler/CustomAssembler.cpp @@ -104,15 +104,14 @@ InputAssembler* CustomAssembler::adjustIA(std::size_t index) return ia; } -void CustomAssembler::renderIA(std::size_t index, ModelBatcher* batcher, NodeProxy* node) +InputAssembler* CustomAssembler::getIA(std::size_t index) const { if (index >= _iaCount) { - cocos2d::log("CustomAssembler:renderIA index:%lu out of range", index); - return; + return nullptr; } - batcher->flushIA(_iaPool[index]); + return _iaPool[index]; } void CustomAssembler::updateEffect(std::size_t index, Effect* effect) diff --git a/native/cocos/renderer/scene/assembler/CustomAssembler.hpp b/native/cocos/renderer/scene/assembler/CustomAssembler.hpp index 2f9d8e961e..822a43324a 100644 --- a/native/cocos/renderer/scene/assembler/CustomAssembler.hpp +++ b/native/cocos/renderer/scene/assembler/CustomAssembler.hpp @@ -61,11 +61,10 @@ public: virtual void updateIABuffer(std::size_t index, cocos2d::renderer::VertexBuffer* vb, cocos2d::renderer::IndexBuffer* ib); /** - * @brief Submit the InputAssembler for the given index to ModelBatcher - * @param[in] index Render data index. - * @param[in] batcher The ModelBatcher which will transform render data to Model + * @brief Gets input assembler by index + * @param[in] index. */ - virtual void renderIA(std::size_t index, ModelBatcher* batcher, NodeProxy* node); + InputAssembler* getIA(std::size_t index) const; /** * @brief Gets input assembler count. diff --git a/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_dragonbones_auto_api.js b/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_dragonbones_auto_api.js index cc739f2cb6..7a6bce5cc4 100644 --- a/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_dragonbones_auto_api.js +++ b/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_dragonbones_auto_api.js @@ -2445,6 +2445,16 @@ effect { }, +/** + * @method setDBEventCallback + * @param {function} arg0 + */ +setDBEventCallback : function ( +func +) +{ +}, + /** * @method setOpacityModifyRGB * @param {bool} arg0 @@ -2456,11 +2466,11 @@ bool }, /** - * @method setDBEventCallback - * @param {function} arg0 + * @method setBatchEnabled + * @param {bool} arg0 */ -setDBEventCallback : function ( -func +setBatchEnabled : function ( +bool ) { }, diff --git a/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_spine_auto_api.js b/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_spine_auto_api.js index df7bb84200..68b6929ee9 100644 --- a/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_spine_auto_api.js +++ b/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_spine_auto_api.js @@ -6388,6 +6388,16 @@ nodeproxy { }, +/** + * @method setBatchEnabled + * @param {bool} arg0 + */ +setBatchEnabled : function ( +bool +) +{ +}, + /** * @method setSkin * @param {char|String} char diff --git a/native/cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js b/native/cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js index 10cb7a1589..e596ddd71b 100644 --- a/native/cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js +++ b/native/cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js @@ -1666,6 +1666,16 @@ Scene : function ( */ renderer.MemPool = { +/** + * @method removeCommonData + * @param {unsigned int} arg0 + */ +removeCommonData : function ( +int +) +{ +}, + /** * @method updateCommonData * @param {unsigned int} arg0 @@ -1680,16 +1690,6 @@ object { }, -/** - * @method removeCommonData - * @param {unsigned int} arg0 - */ -removeCommonData : function ( -int -) -{ -}, - /** * @method MemPool * @constructor @@ -2034,6 +2034,18 @@ getIACount : function ( return 0; }, +/** + * @method getIA + * @param {unsigned int} arg0 + * @return {cc.renderer::InputAssembler} + */ +getIA : function ( +int +) +{ + return cc.renderer::InputAssembler; +}, + /** * @method adjustIA * @param {unsigned int} arg0 @@ -2068,20 +2080,6 @@ clearEffect : function ( { }, -/** - * @method renderIA - * @param {unsigned int} arg0 - * @param {cc.renderer::ModelBatcher} arg1 - * @param {cc.renderer::NodeProxy} arg2 - */ -renderIA : function ( -int, -modelbatcher, -nodeproxy -) -{ -}, - /** * @method updateEffect * @param {unsigned int} arg0 @@ -2139,9 +2137,11 @@ renderer.RenderFlow = { /** * @method render * @param {cc.renderer::NodeProxy} arg0 + * @param {float} arg1 */ render : function ( -nodeproxy +nodeproxy, +float ) { }, @@ -2216,6 +2216,14 @@ getModelBatcher : function ( return cc.renderer::ModelBatcher; }, +/** + * @method calculateLevelWorldMatrix + */ +calculateLevelWorldMatrix : function ( +) +{ +}, + /** * @method getDevice * @return {cc.renderer::DeviceGraphics} diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.cpp b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.cpp index ad4a5b48a0..e205b6996f 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.cpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.cpp @@ -6436,25 +6436,6 @@ static bool js_cocos2dx_dragonbones_CCArmatureDisplay_setEffect(se::State& s) } SE_BIND_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_setEffect) -static bool js_cocos2dx_dragonbones_CCArmatureDisplay_setOpacityModifyRGB(se::State& s) -{ - dragonBones::CCArmatureDisplay* cobj = (dragonBones::CCArmatureDisplay*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_cocos2dx_dragonbones_CCArmatureDisplay_setOpacityModifyRGB : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - bool arg0; - ok &= seval_to_boolean(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_cocos2dx_dragonbones_CCArmatureDisplay_setOpacityModifyRGB : Error processing arguments"); - cobj->setOpacityModifyRGB(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_setOpacityModifyRGB) - static bool js_cocos2dx_dragonbones_CCArmatureDisplay_setDBEventCallback(se::State& s) { dragonBones::CCArmatureDisplay* cobj = (dragonBones::CCArmatureDisplay*)s.nativeThisObject(); @@ -6503,6 +6484,44 @@ static bool js_cocos2dx_dragonbones_CCArmatureDisplay_setDBEventCallback(se::Sta } SE_BIND_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_setDBEventCallback) +static bool js_cocos2dx_dragonbones_CCArmatureDisplay_setOpacityModifyRGB(se::State& s) +{ + dragonBones::CCArmatureDisplay* cobj = (dragonBones::CCArmatureDisplay*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_cocos2dx_dragonbones_CCArmatureDisplay_setOpacityModifyRGB : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + CC_UNUSED bool ok = true; + if (argc == 1) { + bool arg0; + ok &= seval_to_boolean(args[0], &arg0); + SE_PRECONDITION2(ok, false, "js_cocos2dx_dragonbones_CCArmatureDisplay_setOpacityModifyRGB : Error processing arguments"); + cobj->setOpacityModifyRGB(arg0); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); + return false; +} +SE_BIND_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_setOpacityModifyRGB) + +static bool js_cocos2dx_dragonbones_CCArmatureDisplay_setBatchEnabled(se::State& s) +{ + dragonBones::CCArmatureDisplay* cobj = (dragonBones::CCArmatureDisplay*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_cocos2dx_dragonbones_CCArmatureDisplay_setBatchEnabled : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + CC_UNUSED bool ok = true; + if (argc == 1) { + bool arg0; + ok &= seval_to_boolean(args[0], &arg0); + SE_PRECONDITION2(ok, false, "js_cocos2dx_dragonbones_CCArmatureDisplay_setBatchEnabled : Error processing arguments"); + cobj->setBatchEnabled(arg0); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); + return false; +} +SE_BIND_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_setBatchEnabled) + static bool js_cocos2dx_dragonbones_CCArmatureDisplay_setDebugBonesEnabled(se::State& s) { dragonBones::CCArmatureDisplay* cobj = (dragonBones::CCArmatureDisplay*)s.nativeThisObject(); @@ -6717,8 +6736,9 @@ bool js_register_cocos2dx_dragonbones_CCArmatureDisplay(se::Object* obj) cls->defineFunction("dispatchDBEvent", _SE(js_cocos2dx_dragonbones_CCArmatureDisplay_dispatchDBEvent)); cls->defineFunction("dispose", _SE(js_cocos2dx_dragonbones_CCArmatureDisplay_dispose)); cls->defineFunction("setEffect", _SE(js_cocos2dx_dragonbones_CCArmatureDisplay_setEffect)); - cls->defineFunction("setOpacityModifyRGB", _SE(js_cocos2dx_dragonbones_CCArmatureDisplay_setOpacityModifyRGB)); cls->defineFunction("setDBEventCallback", _SE(js_cocos2dx_dragonbones_CCArmatureDisplay_setDBEventCallback)); + cls->defineFunction("setOpacityModifyRGB", _SE(js_cocos2dx_dragonbones_CCArmatureDisplay_setOpacityModifyRGB)); + cls->defineFunction("setBatchEnabled", _SE(js_cocos2dx_dragonbones_CCArmatureDisplay_setBatchEnabled)); cls->defineFunction("setDebugBonesEnabled", _SE(js_cocos2dx_dragonbones_CCArmatureDisplay_setDebugBonesEnabled)); cls->defineFunction("removeDBEventListener", _SE(js_cocos2dx_dragonbones_CCArmatureDisplay_removeDBEventListener)); cls->defineFunction("dbClear", _SE(js_cocos2dx_dragonbones_CCArmatureDisplay_dbClear)); diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp index f297ce1c2e..5825829d6e 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp @@ -356,8 +356,9 @@ SE_DECLARE_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_dbUpdate); SE_DECLARE_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_dispatchDBEvent); SE_DECLARE_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_dispose); SE_DECLARE_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_setEffect); -SE_DECLARE_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_setOpacityModifyRGB); SE_DECLARE_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_setDBEventCallback); +SE_DECLARE_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_setOpacityModifyRGB); +SE_DECLARE_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_setBatchEnabled); SE_DECLARE_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_setDebugBonesEnabled); SE_DECLARE_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_removeDBEventListener); SE_DECLARE_FUNC(js_cocos2dx_dragonbones_CCArmatureDisplay_dbClear); diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp index 193169b604..f8a2d8471e 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp @@ -12917,6 +12917,25 @@ static bool js_cocos2dx_spine_SkeletonRenderer_bindNodeProxy(se::State& s) } SE_BIND_FUNC(js_cocos2dx_spine_SkeletonRenderer_bindNodeProxy) +static bool js_cocos2dx_spine_SkeletonRenderer_setBatchEnabled(se::State& s) +{ + spine::SkeletonRenderer* cobj = (spine::SkeletonRenderer*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_cocos2dx_spine_SkeletonRenderer_setBatchEnabled : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + CC_UNUSED bool ok = true; + if (argc == 1) { + bool arg0; + ok &= seval_to_boolean(args[0], &arg0); + SE_PRECONDITION2(ok, false, "js_cocos2dx_spine_SkeletonRenderer_setBatchEnabled : Error processing arguments"); + cobj->setBatchEnabled(arg0); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); + return false; +} +SE_BIND_FUNC(js_cocos2dx_spine_SkeletonRenderer_setBatchEnabled) + static bool js_cocos2dx_spine_SkeletonRenderer_setSkin(se::State& s) { CC_UNUSED bool ok = true; @@ -13227,6 +13246,7 @@ bool js_register_cocos2dx_spine_SkeletonRenderer(se::Object* obj) cls->defineFunction("onDisable", _SE(js_cocos2dx_spine_SkeletonRenderer_onDisable)); cls->defineFunction("setColor", _SE(js_cocos2dx_spine_SkeletonRenderer_setColor)); cls->defineFunction("bindNodeProxy", _SE(js_cocos2dx_spine_SkeletonRenderer_bindNodeProxy)); + cls->defineFunction("setBatchEnabled", _SE(js_cocos2dx_spine_SkeletonRenderer_setBatchEnabled)); cls->defineFunction("setSkin", _SE(js_cocos2dx_spine_SkeletonRenderer_setSkin)); cls->defineFunction("findSlot", _SE(js_cocos2dx_spine_SkeletonRenderer_findSlot)); cls->defineFunction("updateWorldTransform", _SE(js_cocos2dx_spine_SkeletonRenderer_updateWorldTransform)); diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp index 7be18db27e..d1448bc7c2 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp @@ -897,6 +897,7 @@ SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_setSlotsRange); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_onDisable); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_setColor); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_bindNodeProxy); +SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_setBatchEnabled); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_setSkin); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_findSlot); SE_DECLARE_FUNC(js_cocos2dx_spine_SkeletonRenderer_updateWorldTransform); diff --git a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp index d244318c55..059349f43b 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp @@ -3858,6 +3858,25 @@ bool js_register_renderer_Scene(se::Object* obj) se::Object* __jsb_cocos2d_renderer_MemPool_proto = nullptr; se::Class* __jsb_cocos2d_renderer_MemPool_class = nullptr; +static bool js_renderer_MemPool_removeCommonData(se::State& s) +{ + cocos2d::renderer::MemPool* cobj = (cocos2d::renderer::MemPool*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_renderer_MemPool_removeCommonData : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + CC_UNUSED bool ok = true; + if (argc == 1) { + size_t arg0 = 0; + ok &= seval_to_size(args[0], &arg0); + SE_PRECONDITION2(ok, false, "js_renderer_MemPool_removeCommonData : Error processing arguments"); + cobj->removeCommonData(arg0); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); + return false; +} +SE_BIND_FUNC(js_renderer_MemPool_removeCommonData) + static bool js_renderer_MemPool_updateCommonData(se::State& s) { cocos2d::renderer::MemPool* cobj = (cocos2d::renderer::MemPool*)s.nativeThisObject(); @@ -3881,25 +3900,6 @@ static bool js_renderer_MemPool_updateCommonData(se::State& s) } SE_BIND_FUNC(js_renderer_MemPool_updateCommonData) -static bool js_renderer_MemPool_removeCommonData(se::State& s) -{ - cocos2d::renderer::MemPool* cobj = (cocos2d::renderer::MemPool*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_MemPool_removeCommonData : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - size_t arg0 = 0; - ok &= seval_to_size(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_MemPool_removeCommonData : Error processing arguments"); - cobj->removeCommonData(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_MemPool_removeCommonData) - SE_DECLARE_FINALIZE_FUNC(js_cocos2d_renderer_MemPool_finalize) static bool js_renderer_MemPool_constructor(se::State& s) @@ -3932,8 +3932,8 @@ bool js_register_renderer_MemPool(se::Object* obj) { auto cls = se::Class::create("MemPool", obj, nullptr, _SE(js_renderer_MemPool_constructor)); - cls->defineFunction("updateCommonData", _SE(js_renderer_MemPool_updateCommonData)); cls->defineFunction("removeCommonData", _SE(js_renderer_MemPool_removeCommonData)); + cls->defineFunction("updateCommonData", _SE(js_renderer_MemPool_updateCommonData)); cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_MemPool_finalize)); cls->install(); JSBClassType::registerClass(cls); @@ -4591,6 +4591,27 @@ static bool js_renderer_CustomAssembler_getIACount(se::State& s) } SE_BIND_FUNC(js_renderer_CustomAssembler_getIACount) +static bool js_renderer_CustomAssembler_getIA(se::State& s) +{ + cocos2d::renderer::CustomAssembler* cobj = (cocos2d::renderer::CustomAssembler*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_renderer_CustomAssembler_getIA : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + CC_UNUSED bool ok = true; + if (argc == 1) { + size_t arg0 = 0; + ok &= seval_to_size(args[0], &arg0); + SE_PRECONDITION2(ok, false, "js_renderer_CustomAssembler_getIA : Error processing arguments"); + cocos2d::renderer::InputAssembler* result = cobj->getIA(arg0); + ok &= native_ptr_to_seval((cocos2d::renderer::InputAssembler*)result, &s.rval()); + SE_PRECONDITION2(ok, false, "js_renderer_CustomAssembler_getIA : Error processing arguments"); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); + return false; +} +SE_BIND_FUNC(js_renderer_CustomAssembler_getIA) + static bool js_renderer_CustomAssembler_adjustIA(se::State& s) { cocos2d::renderer::CustomAssembler* cobj = (cocos2d::renderer::CustomAssembler*)s.nativeThisObject(); @@ -4650,29 +4671,6 @@ static bool js_renderer_CustomAssembler_clearEffect(se::State& s) } SE_BIND_FUNC(js_renderer_CustomAssembler_clearEffect) -static bool js_renderer_CustomAssembler_renderIA(se::State& s) -{ - cocos2d::renderer::CustomAssembler* cobj = (cocos2d::renderer::CustomAssembler*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_CustomAssembler_renderIA : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 3) { - size_t arg0 = 0; - cocos2d::renderer::ModelBatcher* arg1 = nullptr; - cocos2d::renderer::NodeProxy* arg2 = nullptr; - ok &= seval_to_size(args[0], &arg0); - ok &= seval_to_native_ptr(args[1], &arg1); - ok &= seval_to_native_ptr(args[2], &arg2); - SE_PRECONDITION2(ok, false, "js_renderer_CustomAssembler_renderIA : Error processing arguments"); - cobj->renderIA(arg0, arg1, arg2); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 3); - return false; -} -SE_BIND_FUNC(js_renderer_CustomAssembler_renderIA) - static bool js_renderer_CustomAssembler_updateEffect(se::State& s) { cocos2d::renderer::CustomAssembler* cobj = (cocos2d::renderer::CustomAssembler*)s.nativeThisObject(); @@ -4775,10 +4773,10 @@ bool js_register_renderer_CustomAssembler(se::Object* obj) auto cls = se::Class::create("CustomAssembler", obj, __jsb_cocos2d_renderer_AssemblerBase_proto, _SE(js_renderer_CustomAssembler_constructor)); cls->defineFunction("getIACount", _SE(js_renderer_CustomAssembler_getIACount)); + cls->defineFunction("getIA", _SE(js_renderer_CustomAssembler_getIA)); cls->defineFunction("adjustIA", _SE(js_renderer_CustomAssembler_adjustIA)); cls->defineFunction("updateIARange", _SE(js_renderer_CustomAssembler_updateIARange)); cls->defineFunction("clearEffect", _SE(js_renderer_CustomAssembler_clearEffect)); - cls->defineFunction("renderIA", _SE(js_renderer_CustomAssembler_renderIA)); cls->defineFunction("updateEffect", _SE(js_renderer_CustomAssembler_updateEffect)); cls->defineFunction("updateIABuffer", _SE(js_renderer_CustomAssembler_updateIABuffer)); cls->defineFunction("getEffect", _SE(js_renderer_CustomAssembler_getEffect)); @@ -4805,14 +4803,16 @@ static bool js_renderer_RenderFlow_render(se::State& s) const auto& args = s.args(); size_t argc = args.size(); CC_UNUSED bool ok = true; - if (argc == 1) { + if (argc == 2) { cocos2d::renderer::NodeProxy* arg0 = nullptr; + float arg1 = 0; ok &= seval_to_native_ptr(args[0], &arg0); + ok &= seval_to_float(args[1], &arg1); SE_PRECONDITION2(ok, false, "js_renderer_RenderFlow_render : Error processing arguments"); - cobj->render(arg0); + cobj->render(arg0, arg1); return true; } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 2); return false; } SE_BIND_FUNC(js_renderer_RenderFlow_render) @@ -4840,9 +4840,9 @@ static bool js_renderer_RenderFlow_insertNodeLevel(se::State& s) size_t argc = args.size(); CC_UNUSED bool ok = true; if (argc == 2) { - unsigned int arg0 = 0; + size_t arg0 = 0; cocos2d::renderer::RenderFlow::LevelInfo arg1; - ok &= seval_to_uint32(args[0], (uint32_t*)&arg0); + ok &= seval_to_size(args[0], &arg0); #pragma warning NO CONVERSION TO NATIVE FOR LevelInfo ok = false; SE_PRECONDITION2(ok, false, "js_renderer_RenderFlow_insertNodeLevel : Error processing arguments"); @@ -4879,11 +4879,19 @@ static bool js_renderer_RenderFlow_calculateLocalMatrix(se::State& s) SE_PRECONDITION2(cobj, false, "js_renderer_RenderFlow_calculateLocalMatrix : Invalid Native Object"); const auto& args = s.args(); size_t argc = args.size(); + CC_UNUSED bool ok = true; if (argc == 0) { cobj->calculateLocalMatrix(); return true; } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); + if (argc == 1) { + int arg0 = 0; + do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (int)tmp; } while(false); + SE_PRECONDITION2(ok, false, "js_renderer_RenderFlow_calculateLocalMatrix : Error processing arguments"); + cobj->calculateLocalMatrix(arg0); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); return false; } SE_BIND_FUNC(js_renderer_RenderFlow_calculateLocalMatrix) @@ -4896,9 +4904,9 @@ static bool js_renderer_RenderFlow_removeNodeLevel(se::State& s) size_t argc = args.size(); CC_UNUSED bool ok = true; if (argc == 2) { - unsigned int arg0 = 0; + size_t arg0 = 0; cocos2d::Mat4* arg1 = nullptr; - ok &= seval_to_uint32(args[0], (uint32_t*)&arg0); + ok &= seval_to_size(args[0], &arg0); ok &= seval_to_native_ptr(args[1], &arg1); SE_PRECONDITION2(ok, false, "js_renderer_RenderFlow_removeNodeLevel : Error processing arguments"); cobj->removeNodeLevel(arg0, arg1); @@ -4945,6 +4953,29 @@ static bool js_renderer_RenderFlow_getModelBatcher(se::State& s) } SE_BIND_FUNC(js_renderer_RenderFlow_getModelBatcher) +static bool js_renderer_RenderFlow_calculateLevelWorldMatrix(se::State& s) +{ + cocos2d::renderer::RenderFlow* cobj = (cocos2d::renderer::RenderFlow*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_renderer_RenderFlow_calculateLevelWorldMatrix : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + CC_UNUSED bool ok = true; + if (argc == 0) { + cobj->calculateLevelWorldMatrix(); + return true; + } + if (argc == 1) { + int arg0 = 0; + do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (int)tmp; } while(false); + SE_PRECONDITION2(ok, false, "js_renderer_RenderFlow_calculateLevelWorldMatrix : Error processing arguments"); + cobj->calculateLevelWorldMatrix(arg0); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); + return false; +} +SE_BIND_FUNC(js_renderer_RenderFlow_calculateLevelWorldMatrix) + static bool js_renderer_RenderFlow_getDevice(se::State& s) { cocos2d::renderer::RenderFlow* cobj = (cocos2d::renderer::RenderFlow*)s.nativeThisObject(); @@ -5028,6 +5059,7 @@ bool js_register_renderer_RenderFlow(se::Object* obj) cls->defineFunction("removeNodeLevel", _SE(js_renderer_RenderFlow_removeNodeLevel)); cls->defineFunction("getRenderScene", _SE(js_renderer_RenderFlow_getRenderScene)); cls->defineFunction("getModelBatcher", _SE(js_renderer_RenderFlow_getModelBatcher)); + cls->defineFunction("calculateLevelWorldMatrix", _SE(js_renderer_RenderFlow_calculateLevelWorldMatrix)); cls->defineFunction("getDevice", _SE(js_renderer_RenderFlow_getDevice)); cls->defineStaticFunction("getInstance", _SE(js_renderer_RenderFlow_getInstance)); cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_RenderFlow_finalize)); diff --git a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp index fdfd74d646..2ed11e0e72 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp @@ -231,8 +231,8 @@ extern se::Class* __jsb_cocos2d_renderer_MemPool_class; bool js_register_cocos2d_renderer_MemPool(se::Object* obj); bool register_all_renderer(se::Object* obj); -SE_DECLARE_FUNC(js_renderer_MemPool_updateCommonData); SE_DECLARE_FUNC(js_renderer_MemPool_removeCommonData); +SE_DECLARE_FUNC(js_renderer_MemPool_updateCommonData); SE_DECLARE_FUNC(js_renderer_MemPool_MemPool); extern se::Object* __jsb_cocos2d_renderer_NodeMemPool_proto; @@ -285,10 +285,10 @@ extern se::Class* __jsb_cocos2d_renderer_CustomAssembler_class; bool js_register_cocos2d_renderer_CustomAssembler(se::Object* obj); bool register_all_renderer(se::Object* obj); SE_DECLARE_FUNC(js_renderer_CustomAssembler_getIACount); +SE_DECLARE_FUNC(js_renderer_CustomAssembler_getIA); SE_DECLARE_FUNC(js_renderer_CustomAssembler_adjustIA); SE_DECLARE_FUNC(js_renderer_CustomAssembler_updateIARange); SE_DECLARE_FUNC(js_renderer_CustomAssembler_clearEffect); -SE_DECLARE_FUNC(js_renderer_CustomAssembler_renderIA); SE_DECLARE_FUNC(js_renderer_CustomAssembler_updateEffect); SE_DECLARE_FUNC(js_renderer_CustomAssembler_updateIABuffer); SE_DECLARE_FUNC(js_renderer_CustomAssembler_getEffect); @@ -307,6 +307,7 @@ SE_DECLARE_FUNC(js_renderer_RenderFlow_calculateLocalMatrix); SE_DECLARE_FUNC(js_renderer_RenderFlow_removeNodeLevel); SE_DECLARE_FUNC(js_renderer_RenderFlow_getRenderScene); SE_DECLARE_FUNC(js_renderer_RenderFlow_getModelBatcher); +SE_DECLARE_FUNC(js_renderer_RenderFlow_calculateLevelWorldMatrix); SE_DECLARE_FUNC(js_renderer_RenderFlow_getDevice); SE_DECLARE_FUNC(js_renderer_RenderFlow_getInstance); SE_DECLARE_FUNC(js_renderer_RenderFlow_RenderFlow); diff --git a/native/tools/tojs/renderer.ini b/native/tools/tojs/renderer.ini index 98e8af1197..8ef75b70b1 100644 --- a/native/tools/tojs/renderer.ini +++ b/native/tools/tojs/renderer.ini @@ -52,7 +52,7 @@ skip = BaseRenderer::[registerStage], NodeProxy::[getWorldMatrix updateJSTRS getWorldPosition getWorldRT getPosition getScale getRotation visitAsRoot addChild removeChild removeAllChildren setParent], Pass::[setStencilTest copy], Technique::[setPass getParameters getPasses getStageIDs copy], - MemPool::[getCommonPool getCommonUnit], + MemPool::[getCommonPool getCommonUnit getCommonList], NodeMemPool::[getUnit getNodePool] rename_classes = BaseRenderer::Base, From eec0bace41f5e5f0fddaceabd355744009bb0feb Mon Sep 17 00:00:00 2001 From: owen <1053210246@qq.com> Date: Thu, 27 Jun 2019 16:20:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=8F=E6=98=8E?= =?UTF-8?q?=E5=BA=A6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- native/cocos/renderer/scene/ModelBatcher.cpp | 7 +- native/cocos/renderer/scene/NodeProxy.cpp | 139 ++++++------------ native/cocos/renderer/scene/NodeProxy.hpp | 27 +--- native/cocos/renderer/scene/RenderFlow.cpp | 47 ++++-- native/cocos/renderer/scene/RenderFlow.hpp | 13 +- .../renderer/scene/assembler/Assembler.cpp | 5 +- .../scene/assembler/AssemblerBase.cpp | 30 +++- .../scene/assembler/AssemblerBase.hpp | 33 ++--- .../scene/assembler/TiledMapAssembler.cpp | 2 - .../auto/api/jsb_renderer_auto_api.js | 70 +++++---- .../js-bindings/auto/jsb_renderer_auto.cpp | 123 +++++++--------- .../js-bindings/auto/jsb_renderer_auto.hpp | 9 +- 12 files changed, 243 insertions(+), 262 deletions(-) diff --git a/native/cocos/renderer/scene/ModelBatcher.cpp b/native/cocos/renderer/scene/ModelBatcher.cpp index d5ae3f6efb..2b2fb2f671 100644 --- a/native/cocos/renderer/scene/ModelBatcher.cpp +++ b/native/cocos/renderer/scene/ModelBatcher.cpp @@ -127,6 +127,10 @@ void ModelBatcher::commit(NodeProxy* node, Assembler* assembler) const Mat4& worldMat = useModel && !ignoreWorldMatrix ? nodeWorldMat : Mat4::IDENTITY; int cullingMask = node->getCullingMask(); + auto asmDirty = assembler->getDirty(); + auto nodeDirty = node->getDirty(); + auto needUpdateOpacity = *asmDirty & RenderFlow::OPACITY_CHANGED || *nodeDirty & RenderFlow::OPACITY_CHANGED || assembler->isOpacityAlwaysDirty(); + for (std::size_t i = 0, l = assembler->getIACount(); i < l; ++i) { assembler->beforeFillBuffers(i); @@ -147,8 +151,7 @@ void ModelBatcher::commit(NodeProxy* node, Assembler* assembler) _cullingMask = cullingMask; } - auto dirtyFlag = assembler->getDirtyFlag(); - if (dirtyFlag & AssemblerBase::OPACITY || assembler->isOpacityAlwaysDirty()) + if (needUpdateOpacity) { assembler->updateOpacity(i, node->getRealOpacity()); } diff --git a/native/cocos/renderer/scene/NodeProxy.cpp b/native/cocos/renderer/scene/NodeProxy.cpp index c4885772b8..c636dcab31 100644 --- a/native/cocos/renderer/scene/NodeProxy.cpp +++ b/native/cocos/renderer/scene/NodeProxy.cpp @@ -38,14 +38,12 @@ RENDERER_BEGIN -int NodeProxy::_parentOpacityDirty = 0; -int NodeProxy::_worldMatDirty = 0; - -NodeProxy::NodeProxy(std::size_t unitID, std::size_t index, std::string id) +NodeProxy::NodeProxy(std::size_t unitID, std::size_t index, const std::string& id, const std::string& name) { _id = id; _unitID = unitID; _index = index; + _name = name; NodeMemPool* pool = NodeMemPool::getInstance(); CCASSERT(pool, "NodeProxy constructor NodeMemPool is null"); @@ -238,18 +236,22 @@ void NodeProxy::updateLevel() levelInfo.dirty = _dirty; levelInfo.localMat = _localMat; levelInfo.worldMat = _worldMat; + levelInfo.opacity = _opacity; + levelInfo.realOpacity = &_realOpacity; if (_parent) { _level = _parent->_level + 1; levelInfo.parentWorldMat = _parent->_worldMat; levelInfo.parentDirty = _parent->_dirty; + levelInfo.parentRealOpacity = &_parent->_realOpacity; } else { _level = 0; levelInfo.parentWorldMat = nullptr; levelInfo.parentDirty = nullptr; + levelInfo.parentRealOpacity = nullptr; } renderFlow->insertNodeLevel(_level, levelInfo); @@ -299,7 +301,7 @@ void NodeProxy::clearAssembler() CC_SAFE_RELEASE_NULL(_assembler); } -AssemblerBase* NodeProxy::getAssembler() +AssemblerBase* NodeProxy::getAssembler() const { return _assembler; } @@ -386,28 +388,44 @@ void NodeProxy::setOpacity(uint8_t opacity) void NodeProxy::updateRealOpacity() { - if (_parent && (_parentOpacityDirty > 0 || *_dirty & RenderFlow::OPACITY)) + bool selfOpacityDirty = *_dirty & RenderFlow::OPACITY; + if (_parent) { - float parentOpacity = _parent ? _parent->getRealOpacity() / 255.0f : 1.0f; - float opacity = (uint8_t)(*_opacity * parentOpacity); - _realOpacity = opacity; - _opacityUpdated = true; - *_dirty &= ~RenderFlow::OPACITY; - - if (_assembler) + if (selfOpacityDirty || *_parent->_dirty & RenderFlow::OPACITY_CHANGED) { - _assembler->notifyDirty(AssemblerBase::OPACITY); + _realOpacity = *_opacity * _parent->getRealOpacity() / 255.0f; + *_dirty &= ~RenderFlow::OPACITY; + *_dirty |= RenderFlow::OPACITY_CHANGED; + } + } + else + { + if (selfOpacityDirty) + { + _realOpacity = *_opacity; + *_dirty &= ~RenderFlow::OPACITY; + *_dirty |= RenderFlow::OPACITY_CHANGED; } } } void NodeProxy::updateWorldMatrix() { - if (_updateWorldMatrix && (*_dirty & RenderFlow::WORLD_TRANSFORM || _worldMatDirty > 0)) + if (!_updateWorldMatrix) return; + + bool selfWorldDirty = *_dirty & RenderFlow::WORLD_TRANSFORM; + if (_parent) { - // Update world matrix - const cocos2d::Mat4& parentMat = _parent == nullptr ? cocos2d::Mat4::IDENTITY : _parent->getWorldMatrix(); - updateWorldMatrix(parentMat); + if (selfWorldDirty || *_parent->_dirty & RenderFlow::WORLD_TRANSFORM_CHANGED) + { + updateWorldMatrix(_parent->getWorldMatrix()); + } + } + else if (selfWorldDirty) + { + *_worldMat = *_localMat; + *_dirty &= ~RenderFlow::WORLD_TRANSFORM; + *_dirty |= RenderFlow::WORLD_TRANSFORM_CHANGED; } } @@ -415,7 +433,7 @@ void NodeProxy::updateWorldMatrix(const cocos2d::Mat4& parentMatrix) { _worldMat->multiply(parentMatrix, *_localMat, _worldMat); *_dirty &= ~RenderFlow::WORLD_TRANSFORM; - _matrixUpdated = true; + *_dirty |= RenderFlow::WORLD_TRANSFORM_CHANGED; } void NodeProxy::updateLocalMatrix() @@ -444,55 +462,19 @@ void NodeProxy::updateLocalMatrix() } } -void NodeProxy::visitAsRoot(ModelBatcher* batcher, Scene* scene) +void NodeProxy::render(ModelBatcher* batcher, Scene* scene) { - _worldMatDirty = 0; - _parentOpacityDirty = 0; - visitWithoutTransform(batcher, scene); -} - -void NodeProxy::visitWithoutTransform(ModelBatcher* batcher, Scene* scene) -{ - if (!_needVisit) return; - - updateRealOpacity(); - - if (_realOpacity == 0) - { - return; - } + if (!_needVisit || _realOpacity == 0) return; // pre render if (_assembler && _assembler->enabled()) _assembler->handle(this, batcher, scene); - ///////////////////////////////////////// - // begin visit children - ///////////////////////////////////////// - - bool parentOpacityUpdated = false; - - if (_opacityUpdated) - { - _parentOpacityDirty++; - _opacityUpdated = false; - parentOpacityUpdated = true; - } - reorderChildren(); for (const auto& child : _children) { - child->visitWithoutTransform(batcher, scene); + child->render(batcher, scene); } - if (parentOpacityUpdated) - { - _parentOpacityDirty--; - } - - ///////////////////////////////////////// - // end visit children - ///////////////////////////////////////// - // post render if (_assembler && _assembler->enabled()) _assembler->postHandle(this, batcher, scene); } @@ -510,51 +492,16 @@ void NodeProxy::visit(ModelBatcher* batcher, Scene* scene) updateLocalMatrix(); updateWorldMatrix(); - + // pre render if (_assembler && _assembler->enabled()) _assembler->handle(this, batcher, scene); - - ///////////////////////////////////////// - // begin visit children - ///////////////////////////////////////// - - bool parentWorldMatUpdated = false; - bool parentOpacityUpdated = false; - - if (_matrixUpdated) - { - _worldMatDirty++; - _matrixUpdated = false; - parentWorldMatUpdated = true; - } - - if (_opacityUpdated) - { - _parentOpacityDirty++; - _opacityUpdated = false; - parentOpacityUpdated = true; - } - + reorderChildren(); for (const auto& child : _children) { child->visit(batcher, scene); } - - if (parentOpacityUpdated) - { - _parentOpacityDirty--; - } - - if (parentWorldMatUpdated) - { - _worldMatDirty--; - } - - ///////////////////////////////////////// - // end visit children - ///////////////////////////////////////// - + // post render if (_assembler && _assembler->enabled()) _assembler->postHandle(this, batcher, scene); } diff --git a/native/cocos/renderer/scene/NodeProxy.hpp b/native/cocos/renderer/scene/NodeProxy.hpp index ad2ad0beb9..49c5aaf3a9 100644 --- a/native/cocos/renderer/scene/NodeProxy.hpp +++ b/native/cocos/renderer/scene/NodeProxy.hpp @@ -71,7 +71,7 @@ public: /* * @brief The default constructor. */ - NodeProxy(std::size_t unitID, std::size_t index, std::string id); + NodeProxy(std::size_t unitID, std::size_t index, const std::string& id, const std::string& name); /* * @brief The destructor. */ @@ -232,12 +232,7 @@ public: * @param[in] sysid The system id. * @return The system handle object or nullptr if not exist */ - AssemblerBase* getAssembler(); - - /* - * @brief Traverse all node proxy in the current node tree. - */ - void visitAsRoot(ModelBatcher* batcher, Scene* scene); + AssemblerBase* getAssembler() const; /* * @brief Visit the node as a ordinary node but not a root node. */ @@ -245,7 +240,7 @@ public: /* * @brief Visit the node but do not transform position. */ - void visitWithoutTransform(ModelBatcher* batcher, Scene* scene); + void render(ModelBatcher* batcher, Scene* scene); /* * @brief Enables visit. */ @@ -280,28 +275,18 @@ public: /* * @brief Gets node runtime id */ - std::string getID() { return _id; } + const std::string& getID() const { return _id; } /* - * @brief Adds world matrix dirty count + * @brief Gets node dirty */ - void addWorldMatDirty() { _worldMatDirty++; } - /* - * @brief Subs world matrix dirty count - */ - void subWorldMatDirty() { _worldMatDirty--; } - + uint32_t* getDirty() const { return _dirty; } protected: void updateLevel(); void childrenAlloc(); void detachChild(NodeProxy* child, ssize_t childIndex); void reorderChildren(); private: - static int _worldMatDirty; - static int _parentOpacityDirty; - - bool _matrixUpdated = false; - bool _opacityUpdated = false; bool _needVisit = true; bool _updateWorldMatrix = true; diff --git a/native/cocos/renderer/scene/RenderFlow.cpp b/native/cocos/renderer/scene/RenderFlow.cpp index 28f4478472..f5e33d0d86 100644 --- a/native/cocos/renderer/scene/RenderFlow.cpp +++ b/native/cocos/renderer/scene/RenderFlow.cpp @@ -81,7 +81,7 @@ RenderFlow::RenderFlow(DeviceGraphics* device, Scene* scene, ForwardRenderer* fo RenderFlow::~RenderFlow() { - delete _paralleTask; + CC_SAFE_DELETE(_paralleTask); CC_SAFE_DELETE(_batcher); } @@ -163,7 +163,8 @@ void RenderFlow::calculateLocalMatrix(int tid) { if (signData->freeFlag == SPACE_FREE_FLAG) continue; // reset world transform changed flag - *dirty &= ~WORLD_TRANSFORM_CHANGED; + *dirty &= ~(WORLD_TRANSFORM_CHANGED | OPACITY_CHANGED); + // reset opacity changed flag if (!(*dirty & LOCAL_TRANSFORM)) continue; localMat->setIdentity(); @@ -202,18 +203,40 @@ void RenderFlow::calculateLevelWorldMatrix(int tid) for(std::size_t index = begin; index < end; index++) { auto& info = levelInfos[index]; - auto selfDirty = *info.dirty & WORLD_TRANSFORM; - if (info.parentDirty != nullptr && ((*info.parentDirty & WORLD_TRANSFORM_CHANGED) || selfDirty)) + auto selfWorldDirty = *info.dirty & WORLD_TRANSFORM; + auto selfOpacityDirty = *info.dirty & OPACITY; + + if (info.parentDirty) { - cocos2d::Mat4::multiply(*info.parentWorldMat, *info.localMat, info.worldMat); - *info.dirty |= WORLD_TRANSFORM_CHANGED; - *info.dirty &= ~WORLD_TRANSFORM; + if ((*info.parentDirty & WORLD_TRANSFORM_CHANGED) || selfWorldDirty) + { + cocos2d::Mat4::multiply(*info.parentWorldMat, *info.localMat, info.worldMat); + *info.dirty |= WORLD_TRANSFORM_CHANGED; + *info.dirty &= ~WORLD_TRANSFORM; + } + + if ((*info.parentDirty & OPACITY_CHANGED) || selfOpacityDirty) + { + *info.realOpacity = *info.opacity * *info.parentRealOpacity / 255.0f; + *info.dirty |= OPACITY_CHANGED; + *info.dirty &= ~OPACITY; + } } - else if (selfDirty) + else { - *info.worldMat = *info.localMat; - *info.dirty |= WORLD_TRANSFORM_CHANGED; - *info.dirty &= ~WORLD_TRANSFORM; + if (selfWorldDirty) + { + *info.worldMat = *info.localMat; + *info.dirty |= WORLD_TRANSFORM_CHANGED; + *info.dirty &= ~WORLD_TRANSFORM; + } + + if (selfOpacityDirty) + { + *info.realOpacity = *info.opacity; + *info.dirty |= OPACITY_CHANGED; + *info.dirty &= ~OPACITY; + } } } } @@ -301,7 +324,7 @@ void RenderFlow::render(NodeProxy* scene, float deltaTime) #endif _batcher->startBatch(); - scene->visitAsRoot(_batcher, _scene); + scene->render(_batcher, _scene); _batcher->terminateBatch(); _forward->render(_scene); diff --git a/native/cocos/renderer/scene/RenderFlow.hpp b/native/cocos/renderer/scene/RenderFlow.hpp index 94af73b4e3..6205c8e8e0 100644 --- a/native/cocos/renderer/scene/RenderFlow.hpp +++ b/native/cocos/renderer/scene/RenderFlow.hpp @@ -72,9 +72,11 @@ public: FINAL = 1 << 9, // native render flag - REORDER_CHILDREN = 1 << 10, + REORDER_CHILDREN = 1 << 29, // world matrix changed - WORLD_TRANSFORM_CHANGED = 1 << 11 + WORLD_TRANSFORM_CHANGED = 1 << 30, + // cascade opacity changed + OPACITY_CHANGED = 1 << 31, }; enum ParallelStage { @@ -85,10 +87,13 @@ public: struct LevelInfo{ uint32_t* dirty = nullptr; + uint32_t* parentDirty = nullptr; + cocos2d::Mat4* parentWorldMat = nullptr; + uint8_t* parentRealOpacity = nullptr; cocos2d::Mat4* localMat = nullptr; cocos2d::Mat4* worldMat = nullptr; - cocos2d::Mat4* parentWorldMat = nullptr; - uint32_t* parentDirty = nullptr; + uint8_t* opacity = nullptr; + uint8_t* realOpacity = nullptr; }; static RenderFlow *getInstance() diff --git a/native/cocos/renderer/scene/assembler/Assembler.cpp b/native/cocos/renderer/scene/assembler/Assembler.cpp index 28ca79633d..93deef61fd 100644 --- a/native/cocos/renderer/scene/assembler/Assembler.cpp +++ b/native/cocos/renderer/scene/assembler/Assembler.cpp @@ -32,6 +32,7 @@ #include "cocos/scripting/js-bindings/jswrapper/SeApi.h" #include "cocos/scripting/js-bindings/manual/jsb_conversions.hpp" #include "cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp" +#include "../RenderFlow.hpp" RENDERER_BEGIN @@ -83,7 +84,7 @@ Assembler::~Assembler() void Assembler::enable() { _enabled = true; - _dirtyFlag |= OPACITY; + *_dirty |= RenderFlow::OPACITY_CHANGED; } void Assembler::updateMeshIndex(std::size_t iaIndex, int meshIndex) @@ -261,7 +262,7 @@ void Assembler::updateOpacity(std::size_t index, uint8_t opacity) ptrAlpha += dataPerVertex; } - _dirtyFlag &= ~OPACITY; + *_dirty &= ~RenderFlow::OPACITY_CHANGED; } RENDERER_END diff --git a/native/cocos/renderer/scene/assembler/AssemblerBase.cpp b/native/cocos/renderer/scene/assembler/AssemblerBase.cpp index 4c49f70a4a..6d256d88d3 100644 --- a/native/cocos/renderer/scene/assembler/AssemblerBase.cpp +++ b/native/cocos/renderer/scene/assembler/AssemblerBase.cpp @@ -33,7 +33,14 @@ AssemblerBase::AssemblerBase() AssemblerBase::~AssemblerBase() { - + if (_jsDirty) + { + _jsDirty->unroot(); + _jsDirty->decRef(); + _jsDirty = nullptr; + } + _dirty = nullptr; + _dirtyLen = 0; } void AssemblerBase::enable() @@ -46,4 +53,25 @@ void AssemblerBase::disable() _enabled = false; } +void AssemblerBase::setDirty(se_object_ptr jsDirty) +{ + if (_jsDirty == jsDirty) return; + + if (_jsDirty) + { + _jsDirty->unroot(); + _jsDirty->decRef(); + _jsDirty = nullptr; + } + + if (jsDirty == nullptr) return; + + _jsDirty = jsDirty; + _jsDirty->root(); + _jsDirty->incRef(); + _dirty = nullptr; + _dirtyLen = 0; + _jsDirty->getTypedArrayData((uint8_t**)&_dirty, &_dirtyLen); +} + RENDERER_END diff --git a/native/cocos/renderer/scene/assembler/AssemblerBase.hpp b/native/cocos/renderer/scene/assembler/AssemblerBase.hpp index e639a72b8d..c93e1a696b 100644 --- a/native/cocos/renderer/scene/assembler/AssemblerBase.hpp +++ b/native/cocos/renderer/scene/assembler/AssemblerBase.hpp @@ -28,6 +28,7 @@ #include #include "base/CCVector.h" #include "../../renderer/Effect.h" +#include "scripting/js-bindings/jswrapper/Object.hpp" RENDERER_BEGIN @@ -58,14 +59,14 @@ public: * @param[in] batcher * @param[in] scene */ - virtual void handle(NodeProxy *node, ModelBatcher* batcher, Scene* scene) {}; + virtual void handle(NodeProxy *node, ModelBatcher* batcher, Scene* scene) {} /** * @brief Callback which will be invoked after visiting child nodes. * @param[in] node The node being processed. * @param[in] batcher * @param[in] scene */ - virtual void postHandle(NodeProxy *node, ModelBatcher* batcher, Scene* scene) {}; + virtual void postHandle(NodeProxy *node, ModelBatcher* batcher, Scene* scene) {} /** * @brief Gets whether the current handle should use model matrix uniform during rendering @@ -73,7 +74,7 @@ public: bool getUseModel() const { return _useModel; - }; + } /** * @brief Sets whether the current handle should use model matrix uniform during rendering @@ -81,24 +82,19 @@ public: void setUseModel(bool useModel) { _useModel = useModel; - }; + } /** - * @brief Notify dirty flag. - * @param[in] node The node being processed. - * @param[in] flag + * @brief Sync script dirty flag. */ - virtual void notifyDirty(uint32_t flag) - { - _dirtyFlag |= flag; - } + virtual void setDirty(se_object_ptr jsDirty); /** * @brief Gets dirty flag. */ - uint32_t getDirtyFlag() const + uint32_t* getDirty() const { - return _dirtyFlag; + return _dirty; } /** @@ -115,16 +111,17 @@ public: * @brief Is assembler enabled. * @return _enabled */ - bool enabled() const { return _enabled; }; + bool enabled() const { return _enabled; } /** * @brief Resets data. */ - virtual void reset() {}; -public: - static const int OPACITY = 1; + virtual void reset() {} protected: - uint32_t _dirtyFlag = 0; + se::Object* _jsDirty = nullptr; + uint32_t* _dirty = nullptr; + std::size_t _dirtyLen = 0; + bool _enabled = false; bool _useModel = false; }; diff --git a/native/cocos/renderer/scene/assembler/TiledMapAssembler.cpp b/native/cocos/renderer/scene/assembler/TiledMapAssembler.cpp index 7fc0dc4f9d..450bd1da68 100644 --- a/native/cocos/renderer/scene/assembler/TiledMapAssembler.cpp +++ b/native/cocos/renderer/scene/assembler/TiledMapAssembler.cpp @@ -73,9 +73,7 @@ void TiledMapAssembler::beforeFillBuffers(std::size_t index) child->disaleUpdateWorldMatrix(); child->updateLocalMatrix(); child->updateWorldMatrix(_tileMapWorldMat); - child->addWorldMatDirty(); flow->visit(child); - child->subWorldMatDirty(); child->enableUpdateWorldMatrix(); child->disableVisit(); } diff --git a/native/cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js b/native/cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js index e596ddd71b..251795c614 100644 --- a/native/cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js +++ b/native/cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js @@ -264,6 +264,16 @@ double { }, +/** + * @method copy + * @param {cc.renderer::Effect} arg0 + */ +copy : function ( +effect +) +{ +}, + /** * @method clear */ @@ -388,16 +398,6 @@ scene { }, -/** - * @method getDirtyFlag - * @return {unsigned int} - */ -getDirtyFlag : function ( -) -{ - return 0; -}, - /** * @method postHandle * @param {cc.renderer::NodeProxy} arg0 @@ -451,11 +451,21 @@ disable : function ( }, /** - * @method notifyDirty - * @param {unsigned int} arg0 + * @method getDirty + * @return {unsigned int} */ -notifyDirty : function ( -int +getDirty : function ( +) +{ + return 0; +}, + +/** + * @method setDirty + * @param {se::Object} arg0 + */ +setDirty : function ( +object ) { }, @@ -477,11 +487,11 @@ AssemblerBase : function ( renderer.NodeProxy = { /** - * @method visitWithoutTransform + * @method render * @param {cc.renderer::ModelBatcher} arg0 * @param {cc.renderer::Scene} arg1 */ -visitWithoutTransform : function ( +render : function ( modelbatcher, scene ) @@ -516,14 +526,6 @@ getChildren : function ( return new Array(); }, -/** - * @method subWorldMatDirty - */ -subWorldMatDirty : function ( -) -{ -}, - /** * @method disableVisit */ @@ -542,14 +544,6 @@ int { }, -/** - * @method addWorldMatDirty - */ -addWorldMatDirty : function ( -) -{ -}, - /** * @method disaleUpdateWorldMatrix */ @@ -628,6 +622,16 @@ getRealOpacity : function ( return 0; }, +/** + * @method getDirty + * @return {unsigned int} + */ +getDirty : function ( +) +{ + return 0; +}, + /** * @method getOpacity * @return {unsigned char} @@ -778,10 +782,12 @@ getChildrenCount : function ( * @param {unsigned int} arg0 * @param {unsigned int} arg1 * @param {String} arg2 + * @param {String} arg3 */ NodeProxy : function ( int, int, +str, str ) { diff --git a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp index 059349f43b..36afc7745c 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp @@ -1315,24 +1315,6 @@ static bool js_renderer_AssemblerBase_handle(se::State& s) } SE_BIND_FUNC(js_renderer_AssemblerBase_handle) -static bool js_renderer_AssemblerBase_getDirtyFlag(se::State& s) -{ - cocos2d::renderer::AssemblerBase* cobj = (cocos2d::renderer::AssemblerBase*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_AssemblerBase_getDirtyFlag : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - unsigned int result = cobj->getDirtyFlag(); - ok &= uint32_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_AssemblerBase_getDirtyFlag : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_AssemblerBase_getDirtyFlag) - static bool js_renderer_AssemblerBase_postHandle(se::State& s) { cocos2d::renderer::AssemblerBase* cobj = (cocos2d::renderer::AssemblerBase*)s.nativeThisObject(); @@ -1426,24 +1408,42 @@ static bool js_renderer_AssemblerBase_disable(se::State& s) } SE_BIND_FUNC(js_renderer_AssemblerBase_disable) -static bool js_renderer_AssemblerBase_notifyDirty(se::State& s) +static bool js_renderer_AssemblerBase_getDirty(se::State& s) { cocos2d::renderer::AssemblerBase* cobj = (cocos2d::renderer::AssemblerBase*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_AssemblerBase_notifyDirty : Invalid Native Object"); + SE_PRECONDITION2(cobj, false, "js_renderer_AssemblerBase_getDirty : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + CC_UNUSED bool ok = true; + if (argc == 0) { + unsigned int* result = cobj->getDirty(); + #pragma warning NO CONVERSION FROM NATIVE FOR unsigned int*; + SE_PRECONDITION2(ok, false, "js_renderer_AssemblerBase_getDirty : Error processing arguments"); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); + return false; +} +SE_BIND_FUNC(js_renderer_AssemblerBase_getDirty) + +static bool js_renderer_AssemblerBase_setDirty(se::State& s) +{ + cocos2d::renderer::AssemblerBase* cobj = (cocos2d::renderer::AssemblerBase*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_renderer_AssemblerBase_setDirty : Invalid Native Object"); const auto& args = s.args(); size_t argc = args.size(); CC_UNUSED bool ok = true; if (argc == 1) { - unsigned int arg0 = 0; - ok &= seval_to_uint32(args[0], (uint32_t*)&arg0); - SE_PRECONDITION2(ok, false, "js_renderer_AssemblerBase_notifyDirty : Error processing arguments"); - cobj->notifyDirty(arg0); + se_object_ptr arg0 = nullptr; + arg0 = args[0].toObject(); + SE_PRECONDITION2(ok, false, "js_renderer_AssemblerBase_setDirty : Error processing arguments"); + cobj->setDirty(arg0); return true; } SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); return false; } -SE_BIND_FUNC(js_renderer_AssemblerBase_notifyDirty) +SE_BIND_FUNC(js_renderer_AssemblerBase_setDirty) SE_DECLARE_FINALIZE_FUNC(js_cocos2d_renderer_AssemblerBase_finalize) @@ -1483,13 +1483,13 @@ bool js_register_renderer_AssemblerBase(se::Object* obj) cls->defineFunction("reset", _SE(js_renderer_AssemblerBase_reset)); cls->defineFunction("enable", _SE(js_renderer_AssemblerBase_enable)); cls->defineFunction("handle", _SE(js_renderer_AssemblerBase_handle)); - cls->defineFunction("getDirtyFlag", _SE(js_renderer_AssemblerBase_getDirtyFlag)); cls->defineFunction("postHandle", _SE(js_renderer_AssemblerBase_postHandle)); cls->defineFunction("getUseModel", _SE(js_renderer_AssemblerBase_getUseModel)); cls->defineFunction("setUseModel", _SE(js_renderer_AssemblerBase_setUseModel)); cls->defineFunction("enabled", _SE(js_renderer_AssemblerBase_enabled)); cls->defineFunction("disable", _SE(js_renderer_AssemblerBase_disable)); - cls->defineFunction("notifyDirty", _SE(js_renderer_AssemblerBase_notifyDirty)); + cls->defineFunction("getDirty", _SE(js_renderer_AssemblerBase_getDirty)); + cls->defineFunction("setDirty", _SE(js_renderer_AssemblerBase_setDirty)); cls->defineFunction("ctor", _SE(js_renderer_AssemblerBase_ctor)); cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_AssemblerBase_finalize)); cls->install(); @@ -1506,10 +1506,10 @@ bool js_register_renderer_AssemblerBase(se::Object* obj) se::Object* __jsb_cocos2d_renderer_NodeProxy_proto = nullptr; se::Class* __jsb_cocos2d_renderer_NodeProxy_class = nullptr; -static bool js_renderer_NodeProxy_visitWithoutTransform(se::State& s) +static bool js_renderer_NodeProxy_render(se::State& s) { cocos2d::renderer::NodeProxy* cobj = (cocos2d::renderer::NodeProxy*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_NodeProxy_visitWithoutTransform : Invalid Native Object"); + SE_PRECONDITION2(cobj, false, "js_renderer_NodeProxy_render : Invalid Native Object"); const auto& args = s.args(); size_t argc = args.size(); CC_UNUSED bool ok = true; @@ -1518,14 +1518,14 @@ static bool js_renderer_NodeProxy_visitWithoutTransform(se::State& s) cocos2d::renderer::Scene* arg1 = nullptr; ok &= seval_to_native_ptr(args[0], &arg0); ok &= seval_to_native_ptr(args[1], &arg1); - SE_PRECONDITION2(ok, false, "js_renderer_NodeProxy_visitWithoutTransform : Error processing arguments"); - cobj->visitWithoutTransform(arg0, arg1); + SE_PRECONDITION2(ok, false, "js_renderer_NodeProxy_render : Error processing arguments"); + cobj->render(arg0, arg1); return true; } SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 2); return false; } -SE_BIND_FUNC(js_renderer_NodeProxy_visitWithoutTransform) +SE_BIND_FUNC(js_renderer_NodeProxy_render) static bool js_renderer_NodeProxy_updateLocalMatrix(se::State& s) { @@ -1589,21 +1589,6 @@ static bool js_renderer_NodeProxy_getChildren(se::State& s) } SE_BIND_FUNC(js_renderer_NodeProxy_getChildren) -static bool js_renderer_NodeProxy_subWorldMatDirty(se::State& s) -{ - cocos2d::renderer::NodeProxy* cobj = (cocos2d::renderer::NodeProxy*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_NodeProxy_subWorldMatDirty : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - if (argc == 0) { - cobj->subWorldMatDirty(); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_NodeProxy_subWorldMatDirty) - static bool js_renderer_NodeProxy_disableVisit(se::State& s) { cocos2d::renderer::NodeProxy* cobj = (cocos2d::renderer::NodeProxy*)s.nativeThisObject(); @@ -1638,21 +1623,6 @@ static bool js_renderer_NodeProxy_setCullingMask(se::State& s) } SE_BIND_FUNC(js_renderer_NodeProxy_setCullingMask) -static bool js_renderer_NodeProxy_addWorldMatDirty(se::State& s) -{ - cocos2d::renderer::NodeProxy* cobj = (cocos2d::renderer::NodeProxy*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_NodeProxy_addWorldMatDirty : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - if (argc == 0) { - cobj->addWorldMatDirty(); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_NodeProxy_addWorldMatDirty) - static bool js_renderer_NodeProxy_disaleUpdateWorldMatrix(se::State& s) { cocos2d::renderer::NodeProxy* cobj = (cocos2d::renderer::NodeProxy*)s.nativeThisObject(); @@ -1795,6 +1765,24 @@ static bool js_renderer_NodeProxy_getRealOpacity(se::State& s) } SE_BIND_FUNC(js_renderer_NodeProxy_getRealOpacity) +static bool js_renderer_NodeProxy_getDirty(se::State& s) +{ + cocos2d::renderer::NodeProxy* cobj = (cocos2d::renderer::NodeProxy*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_renderer_NodeProxy_getDirty : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + CC_UNUSED bool ok = true; + if (argc == 0) { + unsigned int* result = cobj->getDirty(); + #pragma warning NO CONVERSION FROM NATIVE FOR unsigned int*; + SE_PRECONDITION2(ok, false, "js_renderer_NodeProxy_getDirty : Error processing arguments"); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); + return false; +} +SE_BIND_FUNC(js_renderer_NodeProxy_getDirty) + static bool js_renderer_NodeProxy_getOpacity(se::State& s) { cocos2d::renderer::NodeProxy* cobj = (cocos2d::renderer::NodeProxy*)s.nativeThisObject(); @@ -1903,7 +1891,7 @@ static bool js_renderer_NodeProxy_getID(se::State& s) size_t argc = args.size(); CC_UNUSED bool ok = true; if (argc == 0) { - std::string result = cobj->getID(); + const std::string& result = cobj->getID(); ok &= std_string_to_seval(result, &s.rval()); SE_PRECONDITION2(ok, false, "js_renderer_NodeProxy_getID : Error processing arguments"); return true; @@ -2069,11 +2057,13 @@ static bool js_renderer_NodeProxy_constructor(se::State& s) size_t arg0 = 0; size_t arg1 = 0; std::string arg2; + std::string arg3; ok &= seval_to_size(args[0], &arg0); ok &= seval_to_size(args[1], &arg1); ok &= seval_to_std_string(args[2], &arg2); + ok &= seval_to_std_string(args[3], &arg3); SE_PRECONDITION2(ok, false, "js_renderer_NodeProxy_constructor : Error processing arguments"); - cocos2d::renderer::NodeProxy* cobj = new (std::nothrow) cocos2d::renderer::NodeProxy(arg0, arg1, arg2); + cocos2d::renderer::NodeProxy* cobj = new (std::nothrow) cocos2d::renderer::NodeProxy(arg0, arg1, arg2, arg3); s.thisObject()->setPrivateData(cobj); return true; } @@ -2095,14 +2085,12 @@ bool js_register_renderer_NodeProxy(se::Object* obj) { auto cls = se::Class::create("NodeProxy", obj, nullptr, _SE(js_renderer_NodeProxy_constructor)); - cls->defineFunction("visitWithoutTransform", _SE(js_renderer_NodeProxy_visitWithoutTransform)); + cls->defineFunction("render", _SE(js_renderer_NodeProxy_render)); cls->defineFunction("updateLocalMatrix", _SE(js_renderer_NodeProxy_updateLocalMatrix)); cls->defineFunction("updateWorldMatrix", _SE(js_renderer_NodeProxy_updateWorldMatrix)); cls->defineFunction("getChildren", _SE(js_renderer_NodeProxy_getChildren)); - cls->defineFunction("subWorldMatDirty", _SE(js_renderer_NodeProxy_subWorldMatDirty)); cls->defineFunction("disableVisit", _SE(js_renderer_NodeProxy_disableVisit)); cls->defineFunction("setCullingMask", _SE(js_renderer_NodeProxy_setCullingMask)); - cls->defineFunction("addWorldMatDirty", _SE(js_renderer_NodeProxy_addWorldMatDirty)); cls->defineFunction("disaleUpdateWorldMatrix", _SE(js_renderer_NodeProxy_disaleUpdateWorldMatrix)); cls->defineFunction("getAssembler", _SE(js_renderer_NodeProxy_getAssembler)); cls->defineFunction("getChildByName", _SE(js_renderer_NodeProxy_getChildByName)); @@ -2111,6 +2099,7 @@ bool js_register_renderer_NodeProxy(se::Object* obj) cls->defineFunction("setOpacity", _SE(js_renderer_NodeProxy_setOpacity)); cls->defineFunction("destroyImmediately", _SE(js_renderer_NodeProxy_destroyImmediately)); cls->defineFunction("getRealOpacity", _SE(js_renderer_NodeProxy_getRealOpacity)); + cls->defineFunction("getDirty", _SE(js_renderer_NodeProxy_getDirty)); cls->defineFunction("getOpacity", _SE(js_renderer_NodeProxy_getOpacity)); cls->defineFunction("enableVisit", _SE(js_renderer_NodeProxy_enableVisit)); cls->defineFunction("enableUpdateWorldMatrix", _SE(js_renderer_NodeProxy_enableUpdateWorldMatrix)); diff --git a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp index 2ed11e0e72..2444fbdd1e 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp @@ -73,13 +73,13 @@ bool register_all_renderer(se::Object* obj); SE_DECLARE_FUNC(js_renderer_AssemblerBase_reset); SE_DECLARE_FUNC(js_renderer_AssemblerBase_enable); SE_DECLARE_FUNC(js_renderer_AssemblerBase_handle); -SE_DECLARE_FUNC(js_renderer_AssemblerBase_getDirtyFlag); SE_DECLARE_FUNC(js_renderer_AssemblerBase_postHandle); SE_DECLARE_FUNC(js_renderer_AssemblerBase_getUseModel); SE_DECLARE_FUNC(js_renderer_AssemblerBase_setUseModel); SE_DECLARE_FUNC(js_renderer_AssemblerBase_enabled); SE_DECLARE_FUNC(js_renderer_AssemblerBase_disable); -SE_DECLARE_FUNC(js_renderer_AssemblerBase_notifyDirty); +SE_DECLARE_FUNC(js_renderer_AssemblerBase_getDirty); +SE_DECLARE_FUNC(js_renderer_AssemblerBase_setDirty); SE_DECLARE_FUNC(js_renderer_AssemblerBase_AssemblerBase); extern se::Object* __jsb_cocos2d_renderer_NodeProxy_proto; @@ -87,14 +87,12 @@ extern se::Class* __jsb_cocos2d_renderer_NodeProxy_class; bool js_register_cocos2d_renderer_NodeProxy(se::Object* obj); bool register_all_renderer(se::Object* obj); -SE_DECLARE_FUNC(js_renderer_NodeProxy_visitWithoutTransform); +SE_DECLARE_FUNC(js_renderer_NodeProxy_render); SE_DECLARE_FUNC(js_renderer_NodeProxy_updateLocalMatrix); SE_DECLARE_FUNC(js_renderer_NodeProxy_updateWorldMatrix); SE_DECLARE_FUNC(js_renderer_NodeProxy_getChildren); -SE_DECLARE_FUNC(js_renderer_NodeProxy_subWorldMatDirty); SE_DECLARE_FUNC(js_renderer_NodeProxy_disableVisit); SE_DECLARE_FUNC(js_renderer_NodeProxy_setCullingMask); -SE_DECLARE_FUNC(js_renderer_NodeProxy_addWorldMatDirty); SE_DECLARE_FUNC(js_renderer_NodeProxy_disaleUpdateWorldMatrix); SE_DECLARE_FUNC(js_renderer_NodeProxy_getAssembler); SE_DECLARE_FUNC(js_renderer_NodeProxy_getChildByName); @@ -103,6 +101,7 @@ SE_DECLARE_FUNC(js_renderer_NodeProxy_visit); SE_DECLARE_FUNC(js_renderer_NodeProxy_setOpacity); SE_DECLARE_FUNC(js_renderer_NodeProxy_destroyImmediately); SE_DECLARE_FUNC(js_renderer_NodeProxy_getRealOpacity); +SE_DECLARE_FUNC(js_renderer_NodeProxy_getDirty); SE_DECLARE_FUNC(js_renderer_NodeProxy_getOpacity); SE_DECLARE_FUNC(js_renderer_NodeProxy_enableVisit); SE_DECLARE_FUNC(js_renderer_NodeProxy_enableUpdateWorldMatrix);