From fd874098f9548606884d286a23e3e5cf16cead05 Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 11 Aug 2016 01:07:46 +0200 Subject: [PATCH] SDK/GraphicsComponent: Makes component watch over renderable destruction Allows to use persistent (not using the internal counter) InstancedRenderable Former-commit-id: cc511c6da80a57126f48c2f1dbc0f7c1b4ee0d18 [formerly 803948db3b98db6d47f8c2a3d6dee73274f90bb7] [formerly 86a3c484eac16f58263d2c22a8992d088af383c9 [formerly d0d78ebee97f2d309b28f734f176814f9c9a3d22]] Former-commit-id: f9b885450c133524597d2a81119af311f6755789 [formerly 195b15dc4c47f6783c91383ef5d9f01cf67abb42] Former-commit-id: 820d52038de469dc89d040f9718378249495d474 --- SDK/include/NDK/Components/GraphicsComponent.hpp | 9 +++++++++ SDK/include/NDK/Components/GraphicsComponent.inl | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/SDK/include/NDK/Components/GraphicsComponent.hpp b/SDK/include/NDK/Components/GraphicsComponent.hpp index 6e0e78604..ec16ba593 100644 --- a/SDK/include/NDK/Components/GraphicsComponent.hpp +++ b/SDK/include/NDK/Components/GraphicsComponent.hpp @@ -77,20 +77,29 @@ namespace Ndk renderable(std::move(renderable.renderable)), dataUpdated(renderable.dataUpdated), renderableInvalidationSlot(std::move(renderable.renderableInvalidationSlot)), + renderableReleaseSlot(std::move(renderable.renderableReleaseSlot)) { } + ~Renderable() + { + // Disconnect release slot before releasing instanced renderable reference + renderableReleaseSlot.Disconnect(); + } + Renderable& operator=(Renderable&& r) noexcept { data = std::move(r.data); dataUpdated = r.dataUpdated; renderable = std::move(r.renderable); renderableInvalidationSlot = std::move(r.renderableInvalidationSlot); + renderableReleaseSlot = std::move(r.renderableReleaseSlot); return *this; } NazaraSlot(Nz::InstancedRenderable, OnInstancedRenderableInvalidateData, renderableInvalidationSlot); + NazaraSlot(Nz::InstancedRenderable, OnInstancedRenderableRelease, renderableReleaseSlot); mutable Nz::InstancedRenderable::InstanceData data; Nz::InstancedRenderableRef renderable; diff --git a/SDK/include/NDK/Components/GraphicsComponent.inl b/SDK/include/NDK/Components/GraphicsComponent.inl index a835c845d..0d9cb7af4 100644 --- a/SDK/include/NDK/Components/GraphicsComponent.inl +++ b/SDK/include/NDK/Components/GraphicsComponent.inl @@ -42,7 +42,8 @@ namespace Ndk Renderable& r = m_renderables.back(); r.data.renderOrder = renderOrder; r.renderable = std::move(renderable); - r.renderableInvalidationSlot.Connect(r.renderable->OnInstancedRenderableInvalidateData, std::bind(&GraphicsComponent::InvalidateRenderableData, this, std::placeholders::_1, std::placeholders::_2, m_renderables.size()-1)); + r.renderableInvalidationSlot.Connect(r.renderable->OnInstancedRenderableInvalidateData, std::bind(&GraphicsComponent::InvalidateRenderableData, this, std::placeholders::_1, std::placeholders::_2, m_renderables.size() - 1)); + r.renderableReleaseSlot.Connect(r.renderable->OnInstancedRenderableRelease, this, &GraphicsComponent::Detach); InvalidateBoundingVolume(); }