projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Tizen] Add screen and client rotation itself function
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
common
/
scene-impl.h
diff --git
a/dali/internal/event/common/scene-impl.h
b/dali/internal/event/common/scene-impl.h
index
c524d62
..
ab55a3a
100644
(file)
--- 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
/*
#define DALI_INTERNAL_SCENE_H
/*
- * Copyright (c) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-23,7
+23,6
@@
#include <dali/public-api/math/vector2.h>
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/render-tasks/render-task-list.h>
#include <dali/public-api/math/vector2.h>
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/render-tasks/render-task-list.h>
-#include <dali/integration-api/render-surface.h>
#include <dali/internal/common/owner-pointer.h>
#include <dali/internal/event/actors/layer-impl.h>
#include <dali/internal/event/events/event-processor.h>
#include <dali/internal/common/owner-pointer.h>
#include <dali/internal/event/actors/layer-impl.h>
#include <dali/internal/event/events/event-processor.h>
@@
-35,13
+34,18
@@
namespace Dali
namespace Integration
{
namespace Integration
{
-
class
Event;
+
struct
Event;
}
namespace Internal
{
}
namespace Internal
{
+namespace SceneGraph
+{
+class Scene;
+}
+
class EventProcessor;
class Layer;
class LayerList;
class EventProcessor;
class Layer;
class LayerList;
@@
-62,7
+66,7
@@
public:
/**
* @copydoc Dali::Integration::Scene::New
*/
/**
* @copydoc Dali::Integration::Scene::New
*/
- static ScenePtr New(
const Size&
size );
+ static ScenePtr New(
Size
size );
/**
* virtual destructor
/**
* virtual destructor
@@
-115,19
+119,19
@@
public:
Dali::Layer GetLayer(uint32_t depth) const;
/**
Dali::Layer GetLayer(uint32_t depth) const;
/**
- * @copydoc Dali::Integration::Scene::SetSurface
- */
- void SetSurface( Integration::RenderSurface& surface );
-
- /**
* Notify the surface has been resized.
* Notify the surface has been resized.
+ *
+ * @param[in] width The new width of the set surface
+ * @param[in] height The new height of the set surface
+ * @param[in] orientation The orientation of the surface
+ * @param[in] forceUpdate The flag to update force
*/
*/
- void SurfaceResized();
+ void SurfaceResized(
float width, float height, int orientation, bool forceUpdate
);
/**
/**
- *
Notify the surface has been deleted.
+ *
@copydoc Dali::Integration::Scene::SurfaceReplaced
*/
*/
- void Surface
Delet
ed();
+ void Surface
Replac
ed();
/**
* @copydoc Dali::Integration::Scene::Discard
/**
* @copydoc Dali::Integration::Scene::Discard
@@
-135,12
+139,6
@@
public:
void Discard();
/**
void Discard();
/**
- * Retrieve the render surface the scene is binded to.
- * @return The render surface.
- */
- Integration::RenderSurface* GetSurface() const;
-
- /**
* Retrieve the ordered list of on-scene layers.
* @return The layer-list.
*/
* Retrieve the ordered list of on-scene layers.
* @return The layer-list.
*/
@@
-181,6
+179,13
@@
public:
Vector4 GetBackgroundColor() const;
/**
Vector4 GetBackgroundColor() const;
/**
+ * @brief Get the Scene scene graph object
+ *
+ * @return the Scene scene graph object
+ */
+ SceneGraph::Scene* GetSceneObject() const;
+
+ /**
* Used by the EventProcessor to emit key event signals.
* @param[in] event The key event.
*/
* Used by the EventProcessor to emit key event signals.
* @param[in] event The key event.
*/
@@
-263,12
+268,14
@@
public:
private:
// Constructor
private:
// Constructor
- Scene(
const Size& size
);
+ Scene();
/**
* Second-phase constructor.
/**
* Second-phase constructor.
+ *
+ * @param[in] size The size of the set surface
*/
*/
- void Initialize();
+ void Initialize(
Size size
);
// Undefined
Scene(const Scene&) = delete;
// Undefined
Scene(const Scene&) = delete;
@@
-277,16
+284,17
@@
private:
Scene& operator=(const Scene& rhs) = delete;
private:
Scene& operator=(const Scene& rhs) = delete;
private:
- Inte
gration::RenderSurface* mSurface
;
+ Inte
rnal::SceneGraph::Scene* mSceneObject
;
- // The scene-size may be different with the surface-size
Size mSize;
Size mSize;
- Size mSurfaceSize;
Vector2 mDpi;
Vector4 mBackgroundColor;
Vector2 mDpi;
Vector4 mBackgroundColor;
+ // The SurfaceOrientation
+ int mSurfaceOrientation;
+
LayerPtr mRootLayer;
// Ordered list of currently on-stage layers
LayerPtr mRootLayer;
// Ordered list of currently on-stage layers
@@
-297,9
+305,6
@@
private:
// The list of render-tasks
IntrusivePtr<RenderTaskList> mRenderTaskList;
// The list of render-tasks
IntrusivePtr<RenderTaskList> mRenderTaskList;
- // The frame buffer
- FrameBufferPtr mFrameBuffer;
-
bool mDepthTreeDirty:1; ///< True if the depth tree needs recalculating
EventProcessor mEventProcessor;
bool mDepthTreeDirty:1; ///< True if the depth tree needs recalculating
EventProcessor mEventProcessor;