X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-scene3d%2Fpublic-api%2Floader%2Fenvironment-definition.h;h=39aa53ac9361f47ccdacbefa7b29a04f92180e46;hb=HEAD;hp=36d8ae631e595389de9c3be7076b09870802d96a;hpb=5feee171a62b20f7d7b8cd1bcfdf5abb79bdd524;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-scene3d/public-api/loader/environment-definition.h b/dali-scene3d/public-api/loader/environment-definition.h index 36d8ae6..99931d7 100644 --- a/dali-scene3d/public-api/loader/environment-definition.h +++ b/dali-scene3d/public-api/loader/environment-definition.h @@ -1,7 +1,7 @@ #ifndef DALI_SCENE3D_LOADER_ENVIRONMENT_DEFINITION_H #define DALI_SCENE3D_LOADER_ENVIRONMENT_DEFINITION_H /* - * Copyright (c) 2023 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 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. @@ -29,8 +29,8 @@ namespace Dali::Scene3D::Loader { /** - * @brief Defines an environment map with either or both of radiance - * and irradiance maps. + * @brief Defines an environment map with either or both of radiance and irradiance maps. + * @SINCE_2_0.7 */ struct DALI_SCENE3D_API EnvironmentDefinition { @@ -65,30 +65,29 @@ struct DALI_SCENE3D_API EnvironmentDefinition EnvironmentDefinition(EnvironmentDefinition&&) = default; EnvironmentDefinition& operator=(EnvironmentDefinition&&) = default; - static Dali::Texture GetBrdfTexture(); - /** * @brief Loads raw pixel data for the given diffuse and specular maps. + * @SINCE_2_0.7 + * @return The raw data for the given diffuse and specular maps * @note This can be done on any thread. */ RawData LoadRaw(const std::string& environmentsPath); /** - * @brief Creates DALi cubemap Textures from the pixel data in @a raw, then - * returns them in a Textures object. + * @brief Creates DALi cubemap Textures from the pixel data in @a raw, then returns them in a Textures object. + * @SINCE_2_0.7 + * @return DALi cubemap Textures * @note This must only be called from the event thread. */ Textures Load(RawData&& raw); /** * @brief Get default intensity value. + * @SINCE_2_2.1 * @return Default intensity. (1.0f) */ static float GetDefaultIntensity(); -private: - static void LoadBrdfTexture(); - public: // DATA std::string mDiffuseMapPath; std::string mSpecularMapPath; @@ -97,11 +96,6 @@ public: // DATA Vector3 mYDirection = Vector3::ONE; float mIblIntensity = 1.0f; bool mUseBrdfTexture = false; - -private: - static PixelData mBrdfPixelData; - static Texture mBrdfTexture; - static bool mIsBrdfLoaded; }; } // namespace Dali::Scene3D::Loader