X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-scene3d%2Finternal%2Fcommon%2Fenvironment-map-load-task.h;h=0bb134f5889e07830a58bd0c239a431169aff838;hb=b8bbf945e69c6639367c65507c83bc932c3160ee;hp=8b1ac7cabc5504a526845dea21951be4a108eace;hpb=ddddc41f630dc695f84b23c3c5d7e79687e9082b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-scene3d/internal/common/environment-map-load-task.h b/dali-scene3d/internal/common/environment-map-load-task.h index 8b1ac7c..0bb134f 100644 --- a/dali-scene3d/internal/common/environment-map-load-task.h +++ b/dali-scene3d/internal/common/environment-map-load-task.h @@ -2,7 +2,7 @@ #define DALI_SCENE3D_ENVIRONMENT_MAP_LOAD_TASK_H /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2023 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,8 @@ // INTERNAL INCLUDES #include #include +#include +#include namespace Dali { @@ -44,7 +46,7 @@ public: * @param[in] environmentMapUrl The url of the environment map image file. * @param[in] callback The callback that is called when the operation is completed. */ - EnvironmentMapLoadTask(const std::string& environmentMapUrl, CallbackBase* callback); + EnvironmentMapLoadTask(const std::string& environmentMapUrl, Dali::Scene3D::EnvironmentMapType environmentMapType, CallbackBase* callback); /** * Destructor. @@ -69,12 +71,17 @@ public: bool HasSucceeded() const; /** - * Retrieves loaded Environment Map - * @return CubeData loaded from url. - * - * TODO: Supports Equirectangular environment map + * Retrieves loaded Ibl Texture + * @return Texture that is loaded from url. + * @note Do not call this method in worker thread. */ - Dali::Scene3D::Loader::CubeData GetEnvironmentMap() const; + Dali::Texture GetLoadedTexture(); + + /** + * Retrieves Mipmap levels of loaded Ibl texture + * @return mipmap levels of loaded Ibl texture + */ + uint32_t GetMipmapLevels(); private: // Undefined @@ -84,8 +91,9 @@ private: EnvironmentMapLoadTask& operator=(const EnvironmentMapLoadTask& task) = delete; private: - std::string mEnvironmentMapUrl; - Dali::Scene3D::Loader::CubeData mEnvironmentMapPixelData; + std::string mEnvironmentMapUrl; + Dali::Scene3D::Loader::EnvironmentMapData mEnvironmentMapData; + Dali::Scene3D::EnvironmentMapType mEnvironmentMapType{Dali::Scene3D::EnvironmentMapType::AUTO}; bool mIsReady; bool mHasSucceeded;