X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-scene3d%2Finternal%2Fcontrols%2Fmodel-view%2Fmodel-view-impl.h;fp=dali-scene-loader%2Finternal%2Fcontrols%2Fmodel-view%2Fmodel-view-impl.h;h=14b31f9b823abb333ea16403ddb1ec615be69734;hb=f2ee13ccda8c768fddc68f5208b7dcfa54c07242;hp=75c062ae8e6a0f7b5062095e260361c90b84f3b0;hpb=a656457377ae913f2a81b33a506ef905cdf01ff8;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-scene-loader/internal/controls/model-view/model-view-impl.h b/dali-scene3d/internal/controls/model-view/model-view-impl.h
similarity index 85%
rename from dali-scene-loader/internal/controls/model-view/model-view-impl.h
rename to dali-scene3d/internal/controls/model-view/model-view-impl.h
index 75c062a..14b31f9 100644
--- a/dali-scene-loader/internal/controls/model-view/model-view-impl.h
+++ b/dali-scene3d/internal/controls/model-view/model-view-impl.h
@@ -1,5 +1,5 @@
-#ifndef DALI_SCENE_LOADER_INTERNAL_MODEL_VIEW_H
-#define DALI_SCENE_LOADER_INTERNAL_MODEL_VIEW_H
+#ifndef DALI_SCENE3D_INTERNAL_MODEL_VIEW_H
+#define DALI_SCENE3D_INTERNAL_MODEL_VIEW_H
 
 /*
  * Copyright (c) 2022 Samsung Electronics Co., Ltd.
@@ -19,13 +19,13 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/rendering/texture.h>
-#include <dali-toolkit/public-api/controls/control-impl.h>
 
 // INTERNAL INCLUDES
-#include <dali-scene-loader/public-api/controls/model-view/model-view.h>
+#include <dali-scene3d/public-api/controls/model-view/model-view.h>
 
 namespace Dali
 {
@@ -148,19 +148,19 @@ private:
   void SetImageBasedLight(Actor node);
 
 private:
-  std::string                  mModelPath;
-  std::string                  mResourcePath;
-  Dali::Layer                  mModelLayer;
-  Dali::Actor                  mModelRoot;
-  std::vector<AnimationData>   mAnimations;
-
-  Dali::Texture    mSpecularTexture;
-  Dali::Texture    mDiffuseTexture;
-  Vector3          mNaturalSize;
-  Vector3          mModelPivot;
-  float            mIblScaleFactor;
-  bool             mFitSize;
-  bool             mFitCenter;
+  std::string                mModelPath;
+  std::string                mResourcePath;
+  Dali::Layer                mModelLayer;
+  Dali::Actor                mModelRoot;
+  std::vector<AnimationData> mAnimations;
+
+  Dali::Texture mSpecularTexture;
+  Dali::Texture mDiffuseTexture;
+  Vector3       mNaturalSize;
+  Vector3       mModelPivot;
+  float         mIblScaleFactor;
+  bool          mFitSize;
+  bool          mFitCenter;
 };
 
 } // namespace Internal
@@ -180,8 +180,8 @@ inline const Dali::Scene3D::Internal::ModelView& GetImpl(const Dali::Scene3D::Mo
   return static_cast<const Dali::Scene3D::Internal::ModelView&>(handle);
 }
 
-} // namespace Toolkit
+} // namespace Scene3D
 
 } // namespace Dali
 
-#endif // DALI_SCENE_LOADER_INTERNAL_MODEL_VIEW_H
+#endif // DALI_SCENE3D_INTERNAL_MODEL_VIEW_H