diff --git a/src/dawn/scene/components/display/Camera.cpp b/src/dawn/scene/components/display/Camera.cpp index 9b979ffc..d540e5ed 100644 --- a/src/dawn/scene/components/display/Camera.cpp +++ b/src/dawn/scene/components/display/Camera.cpp @@ -81,13 +81,11 @@ void Camera::onStart() { auto rt = this->getRenderTarget(); this->projectionNeedsUpdating = true; this->eventRenderTargetResized.invoke(rt->getWidth(), rt->getHeight()); - this->event2RenderTargetResized.invoke(rt->getWidth(), rt->getHeight()); // Subscribe to new render target resized. return evtResized = useEventLegacy([&](RenderTarget *rt, float_t w, float_t h){ this->projectionNeedsUpdating = true; this->eventRenderTargetResized.invoke(w, h); - this->event2RenderTargetResized.invoke(w, h); }, rt->eventRenderTargetResized); }, renderTarget); @@ -105,6 +103,5 @@ void Camera::onStart() { evtResized = useEventLegacy([&](RenderTarget *rt, float_t w, float_t h){ this->projectionNeedsUpdating = true; this->eventRenderTargetResized.invoke(w, h); - this->event2RenderTargetResized.invoke(w, h); }, getRenderTarget()->eventRenderTargetResized); } \ No newline at end of file diff --git a/src/dawn/scene/components/display/Camera.hpp b/src/dawn/scene/components/display/Camera.hpp index 42bf638b..77112cc6 100644 --- a/src/dawn/scene/components/display/Camera.hpp +++ b/src/dawn/scene/components/display/Camera.hpp @@ -40,8 +40,7 @@ namespace Dawn { StateProperty clipNear; StateProperty clipFar; - Event eventRenderTargetResized; - StateEvent event2RenderTargetResized; + StateEvent eventRenderTargetResized; /** * Create a new Camera Component. diff --git a/src/dawn/scene/components/display/PixelPerfectCamera.cpp b/src/dawn/scene/components/display/PixelPerfectCamera.cpp index d5ed5fc6..afba4121 100644 --- a/src/dawn/scene/components/display/PixelPerfectCamera.cpp +++ b/src/dawn/scene/components/display/PixelPerfectCamera.cpp @@ -57,7 +57,7 @@ void PixelPerfectCamera::onStart() { useEvent([&](float_t w, float_t h){ this->updateDimensions(); - }, this->camera->event2RenderTargetResized); + }, this->camera->eventRenderTargetResized); useEffect([&]{ this->updateDimensions(); diff --git a/src/dawn/scene/components/scene/SubSceneCameraAlign.cpp b/src/dawn/scene/components/scene/SubSceneCameraAlign.cpp index d92a68b2..df0283c2 100644 --- a/src/dawn/scene/components/scene/SubSceneCameraAlign.cpp +++ b/src/dawn/scene/components/scene/SubSceneCameraAlign.cpp @@ -50,7 +50,7 @@ void SubSceneCameraAlign::onStart() { return evtCameraResized = useEvent([&](float_t w, float_t h){ this->realign(); - }, this->camera->event2RenderTargetResized); + }, this->camera->eventRenderTargetResized); }, this->camera); auto renderEffect = useEffectWithTeardown([&]{ diff --git a/src/dawn/scene/components/ui/UICanvas.cpp b/src/dawn/scene/components/ui/UICanvas.cpp index 3c5677d3..0e831b30 100644 --- a/src/dawn/scene/components/ui/UICanvas.cpp +++ b/src/dawn/scene/components/ui/UICanvas.cpp @@ -55,7 +55,7 @@ void UICanvas::onStart() { (*it)->updatePositions(); ++it; } - }, camera->event2RenderTargetResized); + }, camera->eventRenderTargetResized); }, camera); useEffectWithTeardown([&]{