Change dali-scene-loader to dali-scene3d

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

diff --git a/dali-scene-loader/public-api/scene-definition.cpp b/dali-scene3d/public-api/loader/scene-definition.cpp
similarity index 98%
rename from dali-scene-loader/public-api/scene-definition.cpp
rename to dali-scene3d/public-api/loader/scene-definition.cpp
index ff8bdfa..6e26c0f 100644 (file)
--- a/dali-scene-loader/public-api/scene-definition.cpp
+++ b/dali-scene3d/public-api/loader/scene-definition.cpp
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -20,11 +20,11 @@
 #include "dali/public-api/animation/constraints.h"
 
 // INTERNAL
-#include "dali-scene-loader/internal/graphics/builtin-shader-extern-gen.h"
-#include "dali-scene-loader/public-api/blend-shape-details.h"
-#include "dali-scene-loader/public-api/scene-definition.h"
-#include "dali-scene-loader/public-api/skinning-details.h"
-#include "dali-scene-loader/public-api/utils.h"
+#include "dali-scene3d/internal/graphics/builtin-shader-extern-gen.h"
+#include "dali-scene3d/public-api/loader/blend-shape-details.h"
+#include "dali-scene3d/public-api/loader/scene-definition.h"
+#include "dali-scene3d/public-api/loader/skinning-details.h"
+#include "dali-scene3d/public-api/loader/utils.h"
 
 //#define DEBUG_SCENE_DEFINITION
 //#define DEBUG_JOINTS
@@ -39,7 +39,9 @@
 
 namespace Dali
 {
-namespace SceneLoader
+namespace Scene3D
+{
+namespace Loader
 {
 namespace
 {
@@ -122,7 +124,7 @@ void EnsureJointDebugShaderCreated()
 {
   if(0 == sNumScenes)
   {
-    sJointDebugShader = Shader::New(SHADER_SCENE_LOADER_JOINT_DEBUG_VERT, SHADER_SCENE_LOADER_JOINT_DEBUG_FRAG);
+    sJointDebugShader = Shader::New(SHADER_SCENE3D_JOINT_DEBUG_VERT, SHADER_SCENE3D_JOINT_DEBUG_FRAG);
   }
   ++sNumScenes;
 }
@@ -376,7 +378,7 @@ SceneDefinition::~SceneDefinition()
 #endif
 }
 
-uint32_t SceneLoader::SceneDefinition::AddRootNode(Index iNode)
+uint32_t Dali::Scene3D::Loader::SceneDefinition::AddRootNode(Index iNode)
 {
   if(iNode < mNodes.size())
   {
@@ -1194,5 +1196,6 @@ bool SceneDefinition::FindNode(const std::string& name, std::unique_ptr<NodeDefi
   return success;
 }
 
-} // namespace SceneLoader
+} // namespace Loader
+} // namespace Scene3D
 } // namespace Dali