X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fcommon%2Fscene-impl.h;h=cda29a234bcd719f5c00726dce0e1cceb0fc1465;hb=eacc080fe975c523d722dd17c044652317ddd6e8;hp=44a5e3bbec71949e6bf626a6378a2e5f6afcffd2;hpb=3089b50ce759a73de9598fb1c59106711d4dd107;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/common/scene-impl.h b/dali/internal/event/common/scene-impl.h old mode 100755 new mode 100644 index 44a5e3b..cda29a2 --- a/dali/internal/event/common/scene-impl.h +++ b/dali/internal/event/common/scene-impl.h @@ -2,7 +2,7 @@ #define DALI_INTERNAL_SCENE_H /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -20,79 +20,28 @@ // INTERNAL INCLUDES #include -#include -#include -#include #include #include #include #include +#include +#include +#include namespace Dali { - namespace Integration { - struct Event; } namespace Internal { - namespace SceneGraph { class Scene; - -struct DirtyRect -{ - DirtyRect(Node* node, Render::Renderer* renderer, int frame, Rect& rect) - : node(node), - renderer(renderer), - frame(frame), - rect(rect), - visited(true) - { - } - - DirtyRect() - : node(nullptr), - renderer(nullptr), - frame(0), - rect(), - visited(true) - { - } - - bool operator<(const DirtyRect& rhs) const - { - if (node == rhs.node) - { - if (renderer == rhs.renderer) - { - return frame > rhs.frame; // Most recent rects come first - } - else - { - return renderer < rhs.renderer; - } - } - else - { - return node < rhs.node; - } - } - - Node* node; - Render::Renderer* renderer; - int frame; - - Rect rect; - bool visited; -}; - -} +} // namespace SceneGraph class EventProcessor; class Layer; @@ -102,19 +51,18 @@ class RenderTaskList; class FrameBuffer; using FrameBufferPtr = IntrusivePtr; -using ScenePtr = IntrusivePtr; +using ScenePtr = IntrusivePtr; /** * @brief Scene creates a "world" that can be bound to a surface for rendering. */ class Scene : public BaseObject, public RenderTaskDefaults { - public: /** * @copydoc Dali::Integration::Scene::New */ - static ScenePtr New(Size size, int orientation = 0); + static ScenePtr New(Size size, int32_t windowOrientation = 0, int32_t screenOrientation = 0); /** * virtual destructor @@ -139,7 +87,7 @@ public: /** * @copydoc Dali::Integration::Scene::SetDpi */ - void SetDpi( Vector2 dpi ); + void SetDpi(Vector2 dpi); /** * @copydoc Dali::Integration::Scene::GetDpi @@ -157,6 +105,11 @@ public: Dali::Layer GetRootLayer() const; /** + * @copydoc Dali::Integration::Scene::GetOverlayLayer + */ + Dali::Layer GetOverlayLayer(); + + /** * @copydoc Dali::Integration::Scene::GetLayerCount */ uint32_t GetLayerCount() const; @@ -172,7 +125,7 @@ public: * @param[in] width The new width of the set surface * @param[in] height The new height of the set surface */ - void SurfaceResized( float width, float height ); + void SurfaceResized(float width, float height); /** * @copydoc Dali::Integration::Scene::SurfaceReplaced @@ -199,7 +152,7 @@ public: * This function is called when an event is queued. * @param[in] event A event to queue. */ - void QueueEvent( const Integration::Event& event ); + void QueueEvent(const Integration::Event& event); /** * This function is called by Core when events are processed. @@ -216,7 +169,7 @@ public: * @brief Sets the background color of the render surface. * @param[in] color The new background color */ - void SetBackgroundColor( const Vector4& color ); + void SetBackgroundColor(const Vector4& color); /** * @brief Gets the background color of the render surface. @@ -238,16 +191,45 @@ public: * * @param[in] width The width of rotated surface * @param[in] height The height of rotated surface - * @param[in] orientation The orientation of rotated surface + * @param[in] windowOrientation the current window orientation + * @param[in] screenOrientation the current screen orientation */ - void SurfaceRotated(float width, float height, int orientation); + void SurfaceRotated(float width, float height, int32_t windowOrientation, int32_t screenOrientation); /** - * @brief Get surface's current orientation - * - * @return surface orientation + * @copydoc Dali::Integration::Scene::SetRotationCompletedAcknowledgement + */ + void SetRotationCompletedAcknowledgement(); + + /** + * @copydoc Dali::Integration::Scene::IsRotationCompletedAcknowledgementSet + */ + bool IsRotationCompletedAcknowledgementSet() const; + + /** + * @copydoc Dali::Integration::Scene::GetCurrentSurfaceOrientation + */ + int32_t GetCurrentSurfaceOrientation() const; + + /** + * @copydoc Dali::Integration::Scene::GetCurrentScreenOrientation */ - int GetSurfaceOrientation(); + int32_t GetCurrentScreenOrientation() const; + + /** + * @copydoc Dali::Integration::Scene::GetCurrentSurfaceRect + */ + const Rect& GetCurrentSurfaceRect() const; + + /** + * @copydoc Dali::Integration::Scene::IsSurfaceRectChanged + */ + bool IsSurfaceRectChanged() const; + + /** + * @copydoc Dali::Integration::Scene::SetSurfaceRenderTarget + */ + void SetSurfaceRenderTarget(const Graphics::RenderTargetCreateInfo& renderTargetCreateInfo); /** * Used by the EventProcessor to emit key event signals. @@ -263,6 +245,13 @@ public: bool EmitKeyEventGeneratedSignal(const Dali::KeyEvent& event); /** + * Used by the KeyEventProcessor to emit InterceptKeyEventSignal signals. + * @param[in] event The key event. + * @return The return is true if KeyEvent is consumed, otherwise false. + */ + bool EmitInterceptKeyEventSignal(const Dali::KeyEvent& event); + + /** * Emits the event processing finished signal. * * @see Dali::Scene::SignalEventProcessingFinished() @@ -273,45 +262,57 @@ public: * Emits the touched signal. * @param[in] touch The touch event details. */ - void EmitTouchedSignal( const Dali::TouchEvent& touch ); + void EmitTouchedSignal(const Dali::TouchEvent& touch); /** * Used by the EventProcessor to emit wheel event signals. * @param[in] event The wheel event. */ - void EmitWheelEventSignal( const Dali::WheelEvent& event ); + void EmitWheelEventSignal(const Dali::WheelEvent& event); + + /** + * Used by the WheelEventProcessor to emit WheelEventGenerated signals. + * @param[in] event The wheel event. + * @return The return is true if WheelEvent is consumed, otherwise false. + */ + bool EmitWheelEventGeneratedSignal(const Dali::WheelEvent& event); /** * @copydoc Dali::Integration::Scene::AddFrameRenderedCallback */ - void AddFrameRenderedCallback( std::unique_ptr< CallbackBase > callback, int32_t frameId ); + void AddFrameRenderedCallback(std::unique_ptr callback, int32_t frameId); /** * @copydoc Dali::Integration::Scene::AddFramePresentedCallback */ - void AddFramePresentedCallback( std::unique_ptr< CallbackBase > callback, int32_t frameId ); + void AddFramePresentedCallback(std::unique_ptr callback, int32_t frameId); /** * @copydoc Dali::Integration::Scene::GetFrameRenderedCallback */ - void GetFrameRenderedCallback( Dali::Integration::Scene::FrameCallbackContainer& callbacks ); + void GetFrameRenderedCallback(Dali::Integration::Scene::FrameCallbackContainer& callbacks); /** * @copydoc Dali::Integration::Scene::GetFramePresentedCallback */ - void GetFramePresentedCallback( Dali::Integration::Scene::FrameCallbackContainer& callbacks ); + void GetFramePresentedCallback(Dali::Integration::Scene::FrameCallbackContainer& callbacks); /** * @copydoc Integration::Scene::KeyEventSignal() */ Integration::Scene::KeyEventSignalType& KeyEventSignal(); - /** + /** * @copydoc Integration::Scene::KeyEventGeneratedSignal() */ Integration::Scene::KeyEventGeneratedSignalType& KeyEventGeneratedSignal(); /** + * @copydoc Integration::Scene::InterceptKeyEventSignal() + */ + Integration::Scene::KeyEventGeneratedSignalType& InterceptKeyEventSignal(); + + /** * @copydoc Integration::Scene::SignalEventProcessingFinished() */ Integration::Scene::EventProcessingFinishedSignalType& EventProcessingFinishedSignal(); @@ -327,14 +328,11 @@ public: Integration::Scene::WheelEventSignalType& WheelEventSignal(); /** - * @brief Get ItemsDirtyRects - * - * @return the ItemsDirtyRects + * @copydoc Integration::Scene::WheelEventGeneratedSignal() */ - std::vector& GetItemsDirtyRects(); + Integration::Scene::WheelEventGeneratedSignalType& WheelEventGeneratedSignal(); public: - /** * From RenderTaskDefaults; retrieve the default root actor. * @return The default root actor. @@ -345,10 +343,9 @@ public: * From RenderTaskDefaults; retrieve the default camera actor. * @return The default camera actor. */ - CameraActor& GetDefaultCameraActor() override; + CameraActor& GetDefaultCameraActor() const override; private: - // Constructor Scene(); @@ -356,9 +353,10 @@ private: * Second-phase constructor. * * @param[in] size The size of the set surface - * @param[in] orientation The orientation of the set surface for this scene + * @param[in] windowOrientation The rotated angle of the set surface for this scene + * @param[in] screenOrientation The rotated angle of the screen */ - void Initialize(Size size, int orientation); + void Initialize(Size size, int32_t windowOrientation, int32_t screenOrientation); // Undefined Scene(const Scene&) = delete; @@ -371,9 +369,10 @@ private: * * @param[in] width The width of rotated surface * @param[in] height The height of rotated surface - * @param[in] orientation The orientation of rotated surface + * @param[in] windowOrientation the current window orientation + * @param[in] screenOrientation the current screen orientation */ - void ChangedSurface(float width, float height, int orientation); + void ChangedSurface(float width, float height, int32_t windowOrientation, int32_t screenOrientation); private: Internal::SceneGraph::Scene* mSceneObject; @@ -386,6 +385,8 @@ private: LayerPtr mRootLayer; + LayerPtr mOverlayLayer; + // Ordered list of currently on-stage layers OwnerPointer mLayerList; @@ -394,16 +395,20 @@ private: // The list of render-tasks IntrusivePtr mRenderTaskList; - bool mDepthTreeDirty:1; ///< True if the depth tree needs recalculating + bool mDepthTreeDirty : 1; ///< True if the depth tree needs recalculating EventProcessor mEventProcessor; // The Surface's orientation - int mSurfaceOrientation; + int32_t mSurfaceOrientation; + + // The Screen's orientation + int32_t mScreenOrientation; // The key event signal - Integration::Scene::KeyEventSignalType mKeyEventSignal; - Integration::Scene::KeyEventGeneratedSignalType mKeyEventGeneratedSignal; + Integration::Scene::KeyEventSignalType mKeyEventSignal; + Integration::Scene::KeyEventGeneratedSignalType mKeyEventGeneratedSignal; + Integration::Scene::KeyEventGeneratedSignalType mInterceptKeyEventSignal; // The event processing finished signal Integration::Scene::EventProcessingFinishedSignalType mEventProcessingFinishedSignal; @@ -412,28 +417,27 @@ private: Integration::Scene::TouchEventSignalType mTouchedSignal; // The wheel event signal - Integration::Scene::WheelEventSignalType mWheelEventSignal; - - std::vector mItemsDirtyRects; + Integration::Scene::WheelEventSignalType mWheelEventSignal; + Integration::Scene::WheelEventGeneratedSignalType mWheelEventGeneratedSignal; }; -} // Internal +} // namespace Internal // Get impl of handle inline Internal::Scene& GetImplementation(Dali::Integration::Scene& scene) { - DALI_ASSERT_ALWAYS( scene && "Scene handle is empty" ); + DALI_ASSERT_ALWAYS(scene && "Scene handle is empty"); Dali::RefObject& object = scene.GetBaseObject(); return static_cast(object); } inline const Internal::Scene& GetImplementation(const Dali::Integration::Scene& scene) { - DALI_ASSERT_ALWAYS( scene && "Scene handle is empty" ); + DALI_ASSERT_ALWAYS(scene && "Scene handle is empty"); const Dali::RefObject& object = scene.GetBaseObject(); return static_cast(object); } -} // Dali +} // namespace Dali #endif // DALI_INTERNAL_SCENE_H