X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-scene3d%2Fpublic-api%2Floader%2Fcube-map-loader.cpp;h=f3a5aa0b85ac42e72e3aefc576ec398db3db0157;hb=d0ecd061af4a237b98a1bc3bdd4f8ffcbc5e9549;hp=c4aae09730e544bdfbe3f07425608974acb8a4d9;hpb=be6d328a84a8d9bd43056b24ff13d739ea2ab435;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-scene3d/public-api/loader/cube-map-loader.cpp b/dali-scene3d/public-api/loader/cube-map-loader.cpp index c4aae09..f3a5aa0 100644 --- a/dali-scene3d/public-api/loader/cube-map-loader.cpp +++ b/dali-scene3d/public-api/loader/cube-map-loader.cpp @@ -23,6 +23,7 @@ #include // EXTERNAL INCLUDES +#include #include namespace Dali @@ -36,13 +37,29 @@ namespace Scene3D { namespace Loader { -bool LoadCubeMapData(const std::string& path, CubeData& cubedata) +bool LoadCubeMapData(const std::string& cubeMapUrl, CubeData& cubedata) { - std::filesystem::path modelPath(path); + std::filesystem::path modelPath(cubeMapUrl); std::string extension = modelPath.extension(); std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower); - return (extension == KTX_EXTENSION) ? Dali::Scene3D::Loader::LoadKtxData(path, cubedata) : Dali::Scene3D::Loader::LoadCubeData(path, cubedata); + return (extension == KTX_EXTENSION) ? Dali::Scene3D::Loader::LoadKtxData(cubeMapUrl, cubedata) : Dali::Scene3D::Loader::LoadCubeData(cubeMapUrl, cubedata); +} + +Texture LoadCubeMap(const std::string& cubeMapUrl) +{ + Texture cubeTexture; + Dali::Scene3D::Loader::CubeData cubeData; + if(Dali::Scene3D::Loader::LoadCubeMapData(cubeMapUrl, cubeData)) + { + cubeTexture = cubeData.CreateTexture(); + } + else + { + DALI_LOG_ERROR("Fail to load cube map, %s\n", cubeMapUrl.c_str()); + } + + return cubeTexture; } } // namespace Loader