Make SceneView FBO multisampling + Sync utc harness

[platform/core/uifw/dali-toolkit.git] / dali-scene3d / internal / controls / scene-view / scene-view-impl.h

diff --git a/dali-scene3d/internal/controls/scene-view/scene-view-impl.h b/dali-scene3d/internal/controls/scene-view/scene-view-impl.h
index 480ffb0..f5e4f82 100644 (file)
--- a/dali-scene3d/internal/controls/scene-view/scene-view-impl.h
+++ b/dali-scene3d/internal/controls/scene-view/scene-view-impl.h
@@ -31,7 +31,7 @@
 #include <dali/public-api/rendering/texture.h>
 
 // INTERNAL INCLUDES
-#include <dali-scene3d/public-api/controls/model/model.h>
+#include <dali-scene3d/internal/common/image-based-light-observer.h>
 #include <dali-scene3d/public-api/controls/scene-view/scene-view.h>
 
 namespace Dali
@@ -96,20 +96,21 @@ public:
   void SelectCamera(const std::string& name);
 
   /**
-   * @brief Register a Model.
-   * Some works like ibl setting should be applied on the only Model not the all child actors.
-   * SceneView contains child Model list to apply the works effectively.
+   * @brief Register an item.
    *
-   * @param[in] model Model to be registered.
+   * Some works(e.g, lighting) of SceneView should be propagated to the child 3D items.
+   * SceneView can avoid unnecessary tree traversal to find 3D items by storing only 3D items as a list.
+   *
+   * @param[in] item scene observer to be registered.
    */
-  void RegisterModel(Scene3D::Model model);
+  void RegisterSceneItem(Scene3D::Internal::ImageBasedLightObserver* item);
 
   /**
-   * @brief Unregister a Model
+   * @brief Unregister an item
    *
-   * @param[in] model Model to be unregistered.
+   * @param[in] item scene observer to be unregistered.
    */
-  void UnregisterModel(Scene3D::Model model);
+  void UnregisterSceneItem(Scene3D::Internal::ImageBasedLightObserver* item);
 
   /**
    * @copydoc SceneView::SetImageBasedLightSource()
@@ -236,7 +237,7 @@ private:
   void OnWindowResized(Window window, Window::WindowSize size);
 
   /**
-   * @brief Update camera's projection orientation according to the screen orientation.
+   * @brief Updates camera's projection orientation according to the screen orientation.
    */
   void RotateCamera();
 
@@ -245,18 +246,19 @@ private:
 
   /////////////////////////////////////////////////////////////
   // FrameBuffer and Rendertask to render child objects as a 3D Scene
-  CameraActor                 mDefaultCamera;
-  CameraActor                 mSelectedCamera;
-  std::vector<CameraActor>    mCameras;
-  std::vector<Scene3D::Model> mModels;
-  Dali::FrameBuffer           mRenderTarget;
-  Dali::Texture               mTexture;
-  Dali::RenderTask            mRenderTask;
-  Layer                       mRootLayer;
-  int32_t                     mWindowOrientation;
-  Dali::Actor                 mSkybox;
-  Quaternion                  mSkyboxOrientation;
-  float                       mSkyboxIntensity{1.0f};
+  Dali::WeakHandle<Dali::Window>                           mWindow;
+  CameraActor                                              mDefaultCamera;
+  CameraActor                                              mSelectedCamera;
+  std::vector<CameraActor>                                 mCameras;
+  std::vector<Scene3D::Internal::ImageBasedLightObserver*> mItems;
+  Dali::FrameBuffer                                        mFrameBuffer;
+  Dali::Texture                                            mTexture;
+  Dali::RenderTask                                         mRenderTask;
+  Layer                                                    mRootLayer;
+  int32_t                                                  mWindowOrientation;
+  Dali::Actor                                              mSkybox;
+  Quaternion                                               mSkyboxOrientation;
+  float                                                    mSkyboxIntensity{1.0f};
 
   Dali::Texture mSpecularTexture;
   Dali::Texture mDiffuseTexture;