X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=inline;f=dali-scene-loader%2Fpublic-api%2Fenvironment-definition.h;h=0fcdee197a552563695121ed1b0ba704d74ddff5;hb=59d7a437c93f4864515c64d0aa3eacaebd293db6;hp=1b1906fed0bf8d5fdae6ec0f3e6078ffc17a70af;hpb=bd126b5d480c08bf7a995b2c4532e80e76ec4ad2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-scene-loader/public-api/environment-definition.h b/dali-scene-loader/public-api/environment-definition.h index 1b1906f..0fcdee1 100644 --- a/dali-scene-loader/public-api/environment-definition.h +++ b/dali-scene-loader/public-api/environment-definition.h @@ -1,7 +1,7 @@ #ifndef DALI_SCENE_LOADER_ENVIRONMENT_DEFINITION_H #define DALI_SCENE_LOADER_ENVIRONMENT_DEFINITION_H /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -17,19 +17,18 @@ * */ - // INTERNAL INCLUDES +// INTERNAL INCLUDES #include "dali-scene-loader/public-api/api.h" #include "dali-scene-loader/public-api/ktx-loader.h" // EXTERNAL INCLUDES -#include "dali/public-api/rendering/texture.h" #include "dali/public-api/math/quaternion.h" +#include "dali/public-api/rendering/texture.h" namespace Dali { namespace SceneLoader { - /** * @brief Defines an environment map with either or both of radiance * and irradiance maps. @@ -39,7 +38,8 @@ struct DALI_SCENE_LOADER_API EnvironmentDefinition struct Textures { Texture mDiffuse; // irradiance - Texture mSpecular; // radiance + Texture mSpecular; // radiance + Texture mBrdf; // pre-computed brdf bool IsLoaded() const { @@ -49,12 +49,13 @@ struct DALI_SCENE_LOADER_API EnvironmentDefinition struct RawData { - CubeData mDiffuse; - CubeData mSpecular; + CubeData mDiffuse; + CubeData mSpecular; + PixelData mBrdf; }; using EnvironmentData = std::pair; - using Vector = std::vector; + using Vector = std::vector; EnvironmentDefinition() = default; @@ -80,11 +81,13 @@ struct DALI_SCENE_LOADER_API EnvironmentDefinition public: // DATA std::string mDiffuseMapPath; std::string mSpecularMapPath; - Quaternion mCubeOrientation = Quaternion::IDENTITY; - float mIblIntensity = 1.0f; + Quaternion mCubeOrientation = Quaternion::IDENTITY; + Vector3 mYDirection = Vector3::ONE; + float mIblIntensity = 1.0f; + bool mUseBrdfTexture = false; }; -} -} +} // namespace SceneLoader +} // namespace Dali #endif //DALI_SCENE_LOADER_ENVIRONMENT_DEFINITION_H