Change dali-scene-loader to dali-scene3d

[platform/core/uifw/dali-toolkit.git] / dali-scene3d / public-api / loader / material-definition.h

diff --git a/dali-scene-loader/public-api/material-definition.h b/dali-scene3d/public-api/loader/material-definition.h
similarity index 91%
rename from dali-scene-loader/public-api/material-definition.h
rename to dali-scene3d/public-api/loader/material-definition.h
index 2c9ed6c..d96d888 100644 (file)
--- a/dali-scene-loader/public-api/material-definition.h
+++ b/dali-scene3d/public-api/loader/material-definition.h
@@ -1,7 +1,7 @@
-#ifndef DALI_SCENE_LOADER_MATERIAL_DEFINITION_H
-#define DALI_SCENE_LOADER_MATERIAL_DEFINITION_H
+#ifndef DALI_SCENE3D_LOADER_MATERIAL_DEFINITION_H
+#define DALI_SCENE3D_LOADER_MATERIAL_DEFINITION_H
 /*
- * Copyright (c) 2021 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.
@@ -18,10 +18,10 @@
  */
 
 // INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/api.h"
-#include "dali-scene-loader/public-api/environment-definition.h"
-#include "dali-scene-loader/public-api/index.h"
-#include "dali-scene-loader/public-api/utils.h"
+#include "dali-scene3d/public-api/api.h"
+#include "dali-scene3d/public-api/loader/environment-definition.h"
+#include "dali-scene3d/public-api/loader/index.h"
+#include "dali-scene3d/public-api/loader/utils.h"
 
 // EXTERNAL INCLUDES
 #include <cmath>
@@ -30,12 +30,14 @@
 
 namespace Dali
 {
-namespace SceneLoader
+namespace Scene3D
+{
+namespace Loader
 {
 /**
  * @brief Helper enum for encoding and decoding sampler states.
  */
-struct DALI_SCENE_LOADER_API SamplerFlags
+struct DALI_SCENE3D_API SamplerFlags
 {
   using Type = uint8_t;
 
@@ -109,7 +111,7 @@ struct DALI_SCENE_LOADER_API SamplerFlags
 /**
  * @brief Defines a texture from a combination of an image URI and its sampler definition.
  */
-struct DALI_SCENE_LOADER_API TextureDefinition
+struct DALI_SCENE3D_API TextureDefinition
 {
   std::string        mImageUri;
   SamplerFlags::Type mSamplerFlags;
@@ -123,7 +125,7 @@ struct DALI_SCENE_LOADER_API TextureDefinition
  *  scene). Textures from the environment are added last when the DALi TextureSet
  *  is being created.
  */
-struct DALI_SCENE_LOADER_API MaterialDefinition
+struct DALI_SCENE3D_API MaterialDefinition
 {
   enum Flags : uint32_t
   {
@@ -236,7 +238,8 @@ public: // DATA
   std::vector<TextureStage> mTextureStages;
 };
 
-} // namespace SceneLoader
+} // namespace Loader
+} // namespace Scene3D
 } // namespace Dali
 
-#endif //DALI_SCENE_LOADER_MATERIAL_DEFINITION_H
+#endif //DALI_SCENE3D_LOADER_MATERIAL_DEFINITION_H