X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-scene-loader%2Finternal%2Fcontrols%2Fmodel-view%2Fmodel-view-impl.cpp;h=f3b135a23b203d975575ba18a59bbb2470b07cd8;hp=0004aac7ca8e14f2e3f52a9b493a62abc6b0a43d;hb=66ac5f38e4fc285c159381c80e5f1f25f07fba6d;hpb=59d7a437c93f4864515c64d0aa3eacaebd293db6

diff --git a/dali-scene-loader/internal/controls/model-view/model-view-impl.cpp b/dali-scene-loader/internal/controls/model-view/model-view-impl.cpp
index 0004aac..f3b135a 100644
--- a/dali-scene-loader/internal/controls/model-view/model-view-impl.cpp
+++ b/dali-scene-loader/internal/controls/model-view/model-view-impl.cpp
@@ -19,8 +19,6 @@
 #include "model-view-impl.h"
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/image-loading.h>
-#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/internal/controls/control/control-data-impl.h>
@@ -41,6 +39,8 @@
 #include <dali-scene-loader/public-api/scene-definition.h>
 #include <dali-scene-loader/public-api/shader-definition-factory.h>
 #include <dali-scene-loader/public-api/controls/model-view/model-view.h>
+#include <dali-scene-loader/public-api/cube-map-loader.h>
+#include <dali-scene-loader/public-api/cube-data.h>
 
 using namespace Dali;
 
@@ -115,22 +115,15 @@ struct BoundingVolume
 
 Texture LoadCubeMap(const std::string& cubeMapPath)
 {
-  std::filesystem::path modelPath(cubeMapPath);
-  std::string           extension = modelPath.extension();
-  std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
-
-  Texture cubeTexture;
-  if(extension == KTX_EXTENSION)
+  Texture               cubeTexture;
+  SceneLoader::CubeData cubeData;
+  if(SceneLoader::LoadCubeMapData(cubeMapPath, cubeData))
   {
-    SceneLoader::CubeData cubeData;
-    if(SceneLoader::LoadCubeMapData(cubeMapPath, cubeData))
-    {
-      cubeTexture = cubeData.CreateTexture();
-    }
-    else
-    {
-      DALI_LOG_ERROR("Fail to load cube map, %s\n", cubeMapPath.c_str());
-    }
+    cubeTexture = cubeData.CreateTexture();
+  }
+  else
+  {
+    DALI_LOG_ERROR("Fail to load cube map, %s\n", cubeMapPath.c_str());
   }
 
   return cubeTexture;