Change ModelView to Model

[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 f61ad8a..ddd7319 100644 (file)
--- a/dali-scene3d/internal/controls/scene-view/scene-view-impl.h
+++ b/dali-scene3d/internal/controls/scene-view/scene-view-impl.h
@@ -30,8 +30,8 @@
 #include <dali/public-api/rendering/texture.h>
 
 // INTERNAL INCLUDES
-#include <dali-scene3d/public-api/controls/model-view/model-view.h>
 #include <dali-scene3d/public-api/controls/scene-view/scene-view.h>
+#include <dali-scene3d/public-api/controls/model/model.h>
 
 namespace Dali
 {
@@ -95,25 +95,25 @@ public:
   void SelectCamera(const std::string& name);
 
   /**
-   * @brief Register a ModelView.
-   * Some works like ibl setting should be applied on the only ModelView not the all child actors.
-   * SceneView contains child ModelView list to apply the works effectively.
+   * @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.
    *
-   * @param[in] modelView ModelView to be registered.
+   * @param[in] model Model to be registered.
    */
-  void RegisterModelView(Scene3D::ModelView modelView);
+  void RegisterModel(Scene3D::Model model);
 
   /**
-   * @brief Unregister a ModelView
+   * @brief Unregister a Model
    *
-   * @param[in] modelView ModelView to be unregistered.
+   * @param[in] model Model to be unregistered.
    */
-  void UnregisterModelView(Scene3D::ModelView modelView);
+  void UnregisterModel(Scene3D::Model model);
 
   /**
    * @copydoc SceneView::SetImageBasedLightSource()
    */
-  void SetImageBasedLightSource(const std::string& diffuse, const std::string& specular, float scaleFactor);
+  void SetImageBasedLightSource(const std::string& diffuseUrl, const std::string& specularUrl, float scaleFactor);
 
   /**
    * @copydoc SceneView::SetImageBasedLightScaleFactor()
@@ -209,13 +209,13 @@ private:
 
   /////////////////////////////////////////////////////////////
   // FrameBuffer and Rendertask to render child objects as a 3D Scene
-  CameraActor                     mDefaultCamera;
-  CameraActor                     mSelectedCamera;
-  std::vector<CameraActor>        mCameras;
-  std::vector<Scene3D::ModelView> mModels;
-  Dali::FrameBuffer               mRenderTarget;
-  Dali::Texture                   mTexture;
-  Dali::RenderTask                mRenderTask;
+  CameraActor                 mDefaultCamera;
+  CameraActor                 mSelectedCamera;
+  std::vector<CameraActor>    mCameras;
+  std::vector<Scene3D::Model> mModels;
+  Dali::FrameBuffer           mRenderTarget;
+  Dali::Texture               mTexture;
+  Dali::RenderTask            mRenderTask;
 
   Layer mRootLayer;