X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-scene3d%2Fpublic-api%2Floader%2Fenvironment-definition.h;h=3c4ceeefd76b7450bc7d6b8afded843a38d24ed5;hb=f13bf919b3cb3103a0301f29c8b096f5c9b6c9bf;hp=a6f194619ceb7df18ec5e81be5132bb78ec6a552;hpb=d3ab7a4cc307562e687de2b2751f2f0a687c2835;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 a6f1946..3c4ceee 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) 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. @@ -17,20 +17,16 @@ * */ -// INTERNAL INCLUDES -#include "dali-scene3d/public-api/api.h" -#include "dali-scene3d/public-api/loader/cube-data.h" - // EXTERNAL INCLUDES -#include "dali/public-api/math/quaternion.h" -#include "dali/public-api/rendering/texture.h" +#include +#include #include -namespace Dali -{ -namespace Scene3D -{ -namespace Loader +// INTERNAL INCLUDES +#include +#include + +namespace Dali::Scene3D::Loader { /** * @brief Defines an environment map with either or both of radiance @@ -52,9 +48,9 @@ struct DALI_SCENE3D_API EnvironmentDefinition struct RawData { - CubeData mDiffuse; - CubeData mSpecular; - PixelData mBrdf; + EnvironmentMapData mDiffuse; + EnvironmentMapData mSpecular; + PixelData mBrdf; }; using EnvironmentData = std::pair; @@ -97,8 +93,6 @@ public: // DATA bool mUseBrdfTexture = false; }; -} // namespace Loader -} // namespace Scene3D -} // namespace Dali +} // namespace Dali::Scene3D::Loader -#endif //DALI_SCENE3D_LOADER_ENVIRONMENT_DEFINITION_H +#endif // DALI_SCENE3D_LOADER_ENVIRONMENT_DEFINITION_H