From 54c038f89af16e217a1cbc8b903644c7078142ae Mon Sep 17 00:00:00 2001 From: caryliu Date: Wed, 10 Jul 2019 21:11:05 +0800 Subject: [PATCH 1/3] Fix renderer error in shadow stage. --- native/cocos/renderer/memop/RecyclePool.hpp | 6 +-- .../cocos/renderer/renderer/BaseRenderer.cpp | 4 +- native/cocos/renderer/renderer/Camera.cpp | 43 ++++++++----------- native/cocos/renderer/renderer/Camera.h | 5 +-- .../renderer/renderer/ForwardRenderer.cpp | 18 ++++++-- native/cocos/renderer/renderer/Light.cpp | 2 +- .../js-bindings/manual/jsb_conversions.cpp | 17 ++++++-- .../manual/jsb_renderer_manual.cpp | 27 ++++++++---- 8 files changed, 74 insertions(+), 48 deletions(-) diff --git a/native/cocos/renderer/memop/RecyclePool.hpp b/native/cocos/renderer/memop/RecyclePool.hpp index 104014420c..ae715bbded 100644 --- a/native/cocos/renderer/memop/RecyclePool.hpp +++ b/native/cocos/renderer/memop/RecyclePool.hpp @@ -59,7 +59,7 @@ public: _data.clear(); } - const T* getData(const int index) const + const T* getData(size_t index) const { if (index >= _count) { @@ -70,7 +70,7 @@ public: return _data[index]; } - const int getLength() const + const size_t getLength() const { return _count; } @@ -117,7 +117,7 @@ public: _count -= 1; } private: - int _count = 0; + size_t _count = 0; RecycleFunc _func; std::vector _data; diff --git a/native/cocos/renderer/renderer/BaseRenderer.cpp b/native/cocos/renderer/renderer/BaseRenderer.cpp index 9274be0978..f4af742a87 100644 --- a/native/cocos/renderer/renderer/BaseRenderer.cpp +++ b/native/cocos/renderer/renderer/BaseRenderer.cpp @@ -135,7 +135,7 @@ void BaseRenderer::render(const View& view, const Scene* scene) std::vector stageItems; for (const auto& stage : view.stages) { - for (int i = 0, len = _drawItems->getLength(); i < len; i++) + for (size_t i = 0, len = _drawItems->getLength(); i < len; i++) { const DrawItem* item = _drawItems->getData(i); auto tech = item->effect->getTechnique(stage); @@ -158,7 +158,7 @@ void BaseRenderer::render(const View& view, const Scene* scene) // render stages std::unordered_map::iterator foundIter; - for (int i = 0, len = _stageInfos->getLength(); i < len; i++) + for (size_t i = 0, len = _stageInfos->getLength(); i < len; i++) { const StageInfo* stageInfo = _stageInfos->getData(i); foundIter = _stage2fn.find(stageInfo->stage); diff --git a/native/cocos/renderer/renderer/Camera.cpp b/native/cocos/renderer/renderer/Camera.cpp index 3e92db6c01..d958d2fb08 100644 --- a/native/cocos/renderer/renderer/Camera.cpp +++ b/native/cocos/renderer/renderer/Camera.cpp @@ -30,10 +30,6 @@ RENDERER_BEGIN Camera::Camera() { - _cachedView.color = _color; - _cachedView.depth = _depth; - _cachedView.clearFlags = _clearFlags; - _cachedView.stencil = _stencil; } Camera::~Camera() @@ -47,8 +43,6 @@ void Camera::setFrameBuffer(FrameBuffer* framebuffer) RENDERER_SAFE_RELEASE(_framebuffer); _framebuffer = framebuffer; RENDERER_SAFE_RETAIN(_framebuffer); - - _cachedView.frameBuffer = _framebuffer; } void Camera::setWorldMatrix(const Mat4& worldMatrix) @@ -64,25 +58,21 @@ void Camera::setWorldMatrix(const Mat4& worldMatrix) void Camera::setColor(float r, float g, float b, float a) { _color.set(r, g, b, a); - _cachedView.color = _color; } void Camera::setDepth(float depth) { _depth = depth; - _cachedView.depth = _depth; } void Camera::setStencil(int stencil) { _stencil = stencil; - _cachedView.stencil = _stencil; } void Camera::setClearFlags(uint8_t flags ) { _clearFlags = flags; - _cachedView.clearFlags = _clearFlags; } void Camera::setRect(float x, float y, float w, float h) @@ -93,7 +83,6 @@ void Camera::setRect(float x, float y, float w, float h) void Camera::setStages(const std::vector& stages) { _stages = stages; - _cachedView.stages = _stages; } @@ -110,41 +99,47 @@ void Camera::setNode(NodeProxy* node) } } -const View& Camera::extractView( int width, int height) +void Camera::extractView(View& out, int width, int height) { - // can optimize it if node's position is not changed - // rect - _cachedView.rect.set(_rect.x * width, + out.rect.set(_rect.x * width, _rect.y * height, _rect.w * width, _rect.h * height); + + // clear opts + out.color = _color; + out.depth = _depth; + out.stencil = _stencil; + out.clearFlags = _clearFlags; // view matrix //REFINE: _node->getWorldRT(&_worldRTInv); - _cachedView.matView.set(_worldRTInv.getInversed()); + out.matView.set(_worldRTInv.getInversed()); // projecton matrix float aspect = (float)width / height; if (ProjectionType::PERSPECTIVE == _projection) - Mat4::createPerspective(_fov / 3.1415926 * 180, aspect, _near, _far, &_cachedView.matProj); + Mat4::createPerspective(_fov / 3.1415926 * 180, aspect, _near, _far, &out.matProj); else { float x = _orthoHeight * aspect; float y = _orthoHeight; - Mat4::createOrthographicOffCenter(-x, x, -y, y, _near, _far, &_cachedView.matProj); + Mat4::createOrthographicOffCenter(-x, x, -y, y, _near, _far, &out.matProj); } // view projection - Mat4::multiply(_cachedView.matProj, _cachedView.matView, &_cachedView.matViewProj); - _cachedView.matInvViewPorj.set(_cachedView.matViewProj.getInversed()); + Mat4::multiply(out.matProj, out.matView, &out.matViewProj); + out.matInvViewPorj.set(out.matViewProj.getInversed()); + + // stages & framebuffer + out.stages = _stages; + out.frameBuffer = _framebuffer; // culling mask - _cachedView.cullingMask = _cullingMask; - _cachedView.cullingByID = true; - - return _cachedView; + out.cullingMask = _cullingMask; + out.cullingByID = true; } Vec3& Camera::screenToWorld(Vec3& out, const Vec3& screenPos, int width, int height) const diff --git a/native/cocos/renderer/renderer/Camera.h b/native/cocos/renderer/renderer/Camera.h index a2a924d9ea..a489ff5a2b 100644 --- a/native/cocos/renderer/renderer/Camera.h +++ b/native/cocos/renderer/renderer/Camera.h @@ -177,7 +177,7 @@ public: /** * @brief Extracts the camera info to view. */ - const View& extractView(int width, int height); + void extractView(View& view, int width, int height); /** * @brief Transform a screen position to world in the current camera projection. */ @@ -228,8 +228,7 @@ private: Mat4 _worldRTInv; Vec3 _worldPos; - - View _cachedView; + int _priority = 0; }; diff --git a/native/cocos/renderer/renderer/ForwardRenderer.cpp b/native/cocos/renderer/renderer/ForwardRenderer.cpp index 553a7c93f7..267cfed558 100644 --- a/native/cocos/renderer/renderer/ForwardRenderer.cpp +++ b/native/cocos/renderer/renderer/ForwardRenderer.cpp @@ -84,7 +84,17 @@ void ForwardRenderer::render(Scene* scene) scene->sortCameras(); auto& cameras = scene->getCameras(); for (auto camera : cameras) - BaseRenderer::render(camera->extractView(_width, _height), scene); + { + View* view = requestView(); + camera->extractView(*view, _width, _height); + } + + _views->getLength(); + + for (size_t i = 0, len = _views->getLength(); i < len; ++i) { + const View* view = _views->getData(i); + BaseRenderer::render(*view, scene); + } scene->removeModels(); } @@ -99,8 +109,9 @@ void ForwardRenderer::renderCamera(Camera* camera, Scene* scene) width = fb->getWidth(); height = fb->getHeight(); } - View view = camera->extractView(width, height); - BaseRenderer::render(view, scene); + View* view = requestView(); + camera->extractView(*view, width, height); + BaseRenderer::render(*view, scene); scene->removeModels(); } @@ -367,6 +378,7 @@ void ForwardRenderer::drawItems(const std::vector& items) slots.reserve(count); for (auto item : items) { + shadowMaps.clear(); for(int i = 0; i < count; i++) { Light* light = _shadowLights.at(i); diff --git a/native/cocos/renderer/renderer/Light.cpp b/native/cocos/renderer/renderer/Light.cpp index ebc224a243..b29de87ebd 100644 --- a/native/cocos/renderer/renderer/Light.cpp +++ b/native/cocos/renderer/renderer/Light.cpp @@ -197,7 +197,7 @@ void Light::generateShadowMap(DeviceGraphics* device) Texture2D::Options options; options.width = _shadowResolution; options.height = _shadowResolution; -// options.format = Texture2D::Format::RGBA8; + options.glFormat = GL_RGBA; options.wrapS = Texture2D::WrapMode::CLAMP; options.wrapT = Texture2D::WrapMode::CLAMP; _shadowMap->init(device, options); diff --git a/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp b/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp index 1d642aced9..4c90d3ff6d 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp @@ -1568,6 +1568,7 @@ bool ccvaluevector_to_EffectPass(const cocos2d::ValueVector& v, cocos2d::Vector< bool depthTest = false, depthWrite = false; cocos2d::renderer::DepthFunc depthFunc = cocos2d::renderer::DepthFunc::LESS; + bool stencilTest = false; uint8_t stencilMaskFront = 0xff, stencilWriteMaskFront = 0xff, stencilMaskBack = 0xff, stencilWriteMaskBack = 0xff; uint32_t stencilRefFront = 0, stencilRefBack = 0; cocos2d::renderer::StencilFunc stencilFuncFront = cocos2d::renderer::StencilFunc::ALWAYS, stencilFuncBack = cocos2d::renderer::StencilFunc::ALWAYS; @@ -1594,6 +1595,11 @@ bool ccvaluevector_to_EffectPass(const cocos2d::ValueVector& v, cocos2d::Vector< depthFunc = static_cast(state.at("depthFunc").asUnsignedInt()); } + if(state.find("stencilTest") != state.end()) + { + stencilTest = state.at("stencilTest").asBool(); + } + // front if(state.find("stencilFuncFront") != state.end()) { @@ -1667,10 +1673,13 @@ bool ccvaluevector_to_EffectPass(const cocos2d::ValueVector& v, cocos2d::Vector< } cobj->setDepth(depthTest, depthWrite, depthFunc); // depth func - // stencil front - cobj->setStencilFront(stencilFuncFront, stencilRefFront, stencilMaskFront, stencilFailOpFront, stencilZFailOpFront, stencilZPassOpFront, stencilWriteMaskFront); - // stencil back - cobj->setStencilBack(stencilFuncBack, stencilRefBack, stencilMaskBack, stencilFailOpBack, stencilZFailOpBack, stencilZPassOpBack, stencilWriteMaskBack); + + if (stencilTest) { + // stencil front + cobj->setStencilFront(stencilFuncFront, stencilRefFront, stencilMaskFront, stencilFailOpFront, stencilZFailOpFront, stencilZPassOpFront, stencilWriteMaskFront); + // stencil back + cobj->setStencilBack(stencilFuncBack, stencilRefBack, stencilMaskBack, stencilFailOpBack, stencilZFailOpBack, stencilZPassOpBack, stencilWriteMaskBack); + } } cobj->autorelease(); diff --git a/native/cocos/scripting/js-bindings/manual/jsb_renderer_manual.cpp b/native/cocos/scripting/js-bindings/manual/jsb_renderer_manual.cpp index e521f77eff..e6b07ff5eb 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_renderer_manual.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_renderer_manual.cpp @@ -562,15 +562,24 @@ SE_BIND_FUNC(js_renderer_Effect_init); static bool js_renderer_CustomProperties_setProperty(se::State& s) { cocos2d::renderer::CustomProperties* cobj = (cocos2d::renderer::CustomProperties*)s.nativeThisObject(); - CC_UNUSED bool ok = true; + SE_PRECONDITION2(cobj, false, "js_renderer_CustomProperties_setProperty : Invalid Native Object"); const auto& args = s.args(); - std::string arg0; - cocos2d::renderer::Technique::Parameter arg1; - ok &= seval_to_std_string(args[0], &arg0); - ok &= seval_to_TechniqueParameter(args[1], &arg1); - SE_PRECONDITION2(ok, false, "js_renderer_CustomProperties_setProperty : Error processing arguments"); - cobj->setProperty(arg0, arg1); - return true; + size_t argc = args.size(); + CC_UNUSED bool ok = true; + if (argc == 3) { + std::string arg0; + ok &= seval_to_std_string(args[0], &arg0); + SE_PRECONDITION2(ok, false, "js_renderer_CustomProperties_setProperty : Name Error"); + std::uint8_t arg1; + ok &= seval_to_uint8(args[1], &arg1); + cocos2d::renderer::Technique::Parameter arg2(arg0, static_cast(arg1)); + ok &= seval_to_TechniqueParameter_not_constructor(args[2], &arg2); + SE_PRECONDITION2(ok, false, "js_renderer_CustomProperties_setProperty : Error processing arguments"); + cobj->setProperty(arg0, arg2); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 2); + return false; } SE_BIND_FUNC(js_renderer_CustomProperties_setProperty); @@ -616,6 +625,8 @@ bool jsb_register_renderer_manual(se::Object* global) // Effect __jsb_cocos2d_renderer_Effect_proto->defineFunction("init", _SE(js_renderer_Effect_init)); + // CustomProperties + __jsb_cocos2d_renderer_CustomProperties_proto->defineFunction("setProperty", _SE(js_renderer_CustomProperties_setProperty)); return true; } From 1d71432cc52d5bf243b06df472ba201c0bec790f Mon Sep 17 00:00:00 2001 From: caryliu Date: Wed, 10 Jul 2019 21:15:13 +0800 Subject: [PATCH 2/3] delete unuse code. --- native/cocos/renderer/renderer/ForwardRenderer.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/native/cocos/renderer/renderer/ForwardRenderer.cpp b/native/cocos/renderer/renderer/ForwardRenderer.cpp index 267cfed558..062adc30dd 100644 --- a/native/cocos/renderer/renderer/ForwardRenderer.cpp +++ b/native/cocos/renderer/renderer/ForwardRenderer.cpp @@ -88,9 +88,7 @@ void ForwardRenderer::render(Scene* scene) View* view = requestView(); camera->extractView(*view, _width, _height); } - - _views->getLength(); - + for (size_t i = 0, len = _views->getLength(); i < len; ++i) { const View* view = _views->getData(i); BaseRenderer::render(*view, scene); From 573717c8f866764dad6a10d00c94d48816a67851 Mon Sep 17 00:00:00 2001 From: caryliu Date: Thu, 11 Jul 2019 10:15:26 +0800 Subject: [PATCH 3/3] add auto reference --- native/cocos/renderer/renderer/ForwardRenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/cocos/renderer/renderer/ForwardRenderer.cpp b/native/cocos/renderer/renderer/ForwardRenderer.cpp index 062adc30dd..a851280d5c 100644 --- a/native/cocos/renderer/renderer/ForwardRenderer.cpp +++ b/native/cocos/renderer/renderer/ForwardRenderer.cpp @@ -83,7 +83,7 @@ void ForwardRenderer::render(Scene* scene) updateLights(scene); scene->sortCameras(); auto& cameras = scene->getCameras(); - for (auto camera : cameras) + for (auto& camera : cameras) { View* view = requestView(); camera->extractView(*view, _width, _height);