/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
SceneHolder::~SceneHolder()
{
+ if(mScene)
+ {
+ // The scene graph object should be removed first.
+ mScene.RemoveSceneObject();
+ }
+
if(mAdaptor)
{
mAdaptor->RemoveObserver(*mLifeCycleObserver.get());
mAdaptor->RemoveWindow(this);
+ // The event queue is flushed and we wait for the completion of the surface removal
mAdaptor->DeleteSurface(*mSurface.get());
mAdaptor = nullptr;
if(mScene)
{
+ // We should remove the surface from the Core last
mScene.Discard();
}
}
return mScene ? mScene.GetRootLayer() : Dali::Layer();
}
+Dali::Layer SceneHolder::GetOverlayLayer()
+{
+ return mScene ? mScene.GetOverlayLayer() : Dali::Layer();
+}
+
uint32_t SceneHolder::GetId() const
{
return mId;
mScene.SurfaceReplaced();
- SurfaceResized();
+ PositionSize surfacePositionSize = surface->GetPositionSize();
+
+ SurfaceResized(static_cast<float>(surfacePositionSize.width), static_cast<float>(surfacePositionSize.height));
InitializeDpi();
mSurface->SetAdaptor(*mAdaptor);
mSurface->SetScene(mScene);
+ // Recreate the render target
+ CreateRenderTarget();
+
OnSurfaceSet(surface);
}
-void SceneHolder::SurfaceResized()
+void SceneHolder::SurfaceResized(float width, float height)
{
- PositionSize surfacePositionSize = mSurface->GetPositionSize();
- mScene.SurfaceResized(static_cast<float>(surfacePositionSize.width), static_cast<float>(surfacePositionSize.height));
+ mScene.SurfaceResized(width, height);
mSurface->SetFullSwapNextFrame();
+
+ // Recreate the render target
+ CreateRenderTarget();
}
Dali::RenderSurfaceInterface* SceneHolder::GetSurface() const
// Create the scene
PositionSize surfacePositionSize = mSurface->GetPositionSize();
- mScene = Dali::Integration::Scene::New(Size(static_cast<float>(surfacePositionSize.width), static_cast<float>(surfacePositionSize.height)));
+ int windowOrientation = mSurface->GetSurfaceOrientation();
+ int screenOrientation = mSurface->GetScreenOrientation();
+
+ mScene = Dali::Integration::Scene::New(Size(static_cast<float>(surfacePositionSize.width), static_cast<float>(surfacePositionSize.height)), windowOrientation, screenOrientation);
Internal::Adaptor::Adaptor& adaptorImpl = Internal::Adaptor::Adaptor::GetImplementation(adaptor);
mAdaptor = &adaptorImpl;
mSurface->SetAdaptor(*mAdaptor);
mSurface->SetScene(mScene);
+ // Create the render target
+ CreateRenderTarget();
+
OnAdaptorSet(adaptor);
}
+void SceneHolder::CreateRenderTarget()
+{
+ Graphics::RenderTargetCreateInfo rtInfo{};
+ rtInfo
+ .SetSurface(mSurface.get())
+ .SetExtent({static_cast<uint32_t>(mSurface->GetPositionSize().width), static_cast<uint32_t>(mSurface->GetPositionSize().height)})
+ .SetPreTransform(0 | Graphics::RenderTargetTransformFlagBits::TRANSFORM_IDENTITY_BIT);
+
+ mScene.SetSurfaceRenderTarget(rtInfo);
+}
+
void SceneHolder::Pause()
{
Reset();
OnResume();
}
+void SceneHolder::SurfaceRotated(float width, float height, int32_t windowOrientation, int32_t screenOrientation)
+{
+ mScene.SurfaceRotated(width, height, windowOrientation, screenOrientation);
+}
+
+void SceneHolder::SetRotationCompletedAcknowledgement()
+{
+ mScene.SetRotationCompletedAcknowledgement();
+}
+
void SceneHolder::FeedTouchPoint(Dali::Integration::Point& point, int timeStamp)
{
if(timeStamp < 1)
timeStamp = TimeService::GetMilliSeconds();
}
- RecalculateTouchPosition(point);
+ Vector2 convertedPosition = RecalculatePosition(point.GetScreenPosition());
+ point.SetScreenPosition(convertedPosition);
Integration::TouchEvent touchEvent;
Integration::HoverEvent hoverEvent;
// Keep the handle alive until the core events are processed.
Dali::BaseHandle sceneHolder(this);
+ Vector2 convertedPosition = RecalculatePosition(wheelEvent.point);
+ wheelEvent.point = convertedPosition;
+
mScene.QueueEvent(wheelEvent);
mAdaptor->ProcessCoreEvents();
}
{
mScene.AddFrameRenderedCallback(std::move(callback), frameId);
- DALI_LOG_INFO(gSceneHolderLogFilter, Debug::General, "SceneHolder::AddFrameRenderedCallback:: Added [%d]\n", frameId);
+ DALI_LOG_RELEASE_INFO("SceneHolder::AddFrameRenderedCallback:: Added [%d]\n", frameId);
}
void SceneHolder::AddFramePresentedCallback(std::unique_ptr<CallbackBase> callback, int32_t frameId)
{
mScene.AddFramePresentedCallback(std::move(callback), frameId);
- DALI_LOG_INFO(gSceneHolderLogFilter, Debug::General, "SceneHolder::AddFramePresentedCallback:: Added [%d]\n", frameId);
+ DALI_LOG_RELEASE_INFO("SceneHolder::AddFramePresentedCallback:: Added [%d]\n", frameId);
}
Dali::Integration::SceneHolder SceneHolder::Get(Dali::Actor actor)