Change dali-scene-loader to dali-scene3d

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

diff --git a/dali-scene-loader/public-api/node-definition.h b/dali-scene3d/public-api/loader/node-definition.h
similarity index 89%
rename from dali-scene-loader/public-api/node-definition.h
rename to dali-scene3d/public-api/loader/node-definition.h
index 7b70931..a86d7e9 100644 (file)
--- a/dali-scene-loader/public-api/node-definition.h
+++ b/dali-scene3d/public-api/loader/node-definition.h
@@ -1,5 +1,5 @@
-#ifndef DALI_SCENE_LOADER_NODE_DEFINITION_H_
-#define DALI_SCENE_LOADER_NODE_DEFINITION_H_
+#ifndef DALI_SCENE3D_LOADER_NODE_DEFINITION_H_
+#define DALI_SCENE3D_LOADER_NODE_DEFINITION_H_
 /*
  * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
@@ -18,9 +18,9 @@
  */
 
 // INTERNAL INCLUDES
-#include "dali-scene-loader/public-api/customization.h"
-#include "dali-scene-loader/public-api/matrix-stack.h"
-#include "dali-scene-loader/public-api/resource-bundle.h"
+#include "dali-scene3d/public-api/loader/customization.h"
+#include "dali-scene3d/public-api/loader/matrix-stack.h"
+#include "dali-scene3d/public-api/loader/resource-bundle.h"
 
 // EXTERNAL INCLUDES
 #include <functional>
@@ -33,14 +33,16 @@
 
 namespace Dali
 {
-namespace SceneLoader
+namespace Scene3D
+{
+namespace Loader
 {
 class ViewProjection;
 
 /**
  * @brief Interface to report (const) resource ids to.
  */
-class DALI_SCENE_LOADER_API IResourceReceiver
+class DALI_SCENE3D_API IResourceReceiver
 {
 public:
   virtual ~IResourceReceiver() = default;
@@ -53,7 +55,7 @@ public:
  * @note These are supposed to be transient. Obviously, the references collected
  *  this way must not outlive the objects that they came from.
  */
-class DALI_SCENE_LOADER_API IResourceReflector
+class DALI_SCENE3D_API IResourceReflector
 {
 public:
   virtual ~IResourceReflector() = default;
@@ -66,7 +68,7 @@ public:
  *  set up after the Actors were created. The target of the constraint
  *  is the node definition that carries it.
  */
-struct DALI_SCENE_LOADER_API ConstraintDefinition
+struct DALI_SCENE3D_API ConstraintDefinition
 {
   std::string mProperty;  ///< name of the property to constrain.
   Index       mSourceIdx; ///< index of the node to serve as the source of the constraint.
@@ -87,7 +89,7 @@ struct DALI_SCENE_LOADER_API ConstraintDefinition
   }
 };
 
-struct DALI_SCENE_LOADER_API Transforms
+struct DALI_SCENE3D_API Transforms
 {
   MatrixStack           modelStack;
   const ViewProjection& viewProjection;
@@ -97,7 +99,7 @@ struct DALI_SCENE_LOADER_API Transforms
  * @brief Information about a skeleton and the shader that needs to be configured with it.
  * @note Multiple skeletons shalt not share the same shader.
  */
-struct DALI_SCENE_LOADER_API SkinningShaderConfigurationRequest
+struct DALI_SCENE3D_API SkinningShaderConfigurationRequest
 {
   Index  mSkeletonIdx;
   Shader mShader;
@@ -111,7 +113,7 @@ struct DALI_SCENE_LOADER_API SkinningShaderConfigurationRequest
 /**
  * @brief Needed to configure blend shape properties.
  */
-struct DALI_SCENE_LOADER_API BlendshapeShaderConfigurationRequest
+struct DALI_SCENE3D_API BlendshapeShaderConfigurationRequest
 {
   std::string mNodeName;
   Index       mMeshIdx;
@@ -126,7 +128,7 @@ struct DALI_SCENE_LOADER_API BlendshapeShaderConfigurationRequest
 /**
  * @brief Request for creating a constraint, output from NodeDefinition::OnCreate.
  */
-struct DALI_SCENE_LOADER_API ConstraintRequest
+struct DALI_SCENE3D_API ConstraintRequest
 {
   const ConstraintDefinition* const mConstraint; ///< Definition of the constraint to create.
   Actor                             mTarget;     ///< Target of the constraint.
@@ -137,7 +139,7 @@ struct DALI_SCENE_LOADER_API ConstraintRequest
  *  and slots for customization and rendering logic, which are mutually exclusive in the
  *  current implementation.
  */
-struct DALI_SCENE_LOADER_API NodeDefinition
+struct DALI_SCENE3D_API NodeDefinition
 {
 public: // TYPES
   using Vector = std::vector<NodeDefinition>;
@@ -154,7 +156,7 @@ public: // TYPES
     std::vector<BlendshapeShaderConfigurationRequest> mBlendshapeRequests;
   };
 
-  class DALI_SCENE_LOADER_API Renderable
+  class DALI_SCENE3D_API Renderable
   {
   public: // DATA
     Index mShaderIdx = INVALID_INDEX;
@@ -268,7 +270,7 @@ public: // DATA
   Index              mParentIdx = INVALID_INDEX;
 };
 
-class DALI_SCENE_LOADER_API ModelNode : public NodeDefinition::Renderable
+class DALI_SCENE3D_API ModelNode : public NodeDefinition::Renderable
 {
 public: // DATA
   Vector4 mColor       = Color::WHITE;
@@ -285,7 +287,7 @@ public: // METHODS
 /**
  * @brief Parameters for an Arc node.
  */
-class DALI_SCENE_LOADER_API ArcNode : public ModelNode
+class DALI_SCENE3D_API ArcNode : public ModelNode
 {
 public: // DATA
   bool  mAntiAliasing      = true;
@@ -300,7 +302,8 @@ public: // METHODS
   void OnCreate(const NodeDefinition& node, NodeDefinition::CreateParams& params, Actor& actor) const override;
 };
 
-} // namespace SceneLoader
+} // namespace Loader
+} // namespace Scene3D
 } // namespace Dali
 
-#endif //DALI_SCENE_LOADER_NODE_DEFINITION_H_
+#endif //DALI_SCENE3D_LOADER_NODE_DEFINITION_H_