Change dali-scene-loader to dali-scene3d

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

diff --git a/dali-scene-loader/public-api/gltf2-loader.cpp b/dali-scene3d/public-api/loader/gltf2-loader.cpp
similarity index 98%
rename from dali-scene-loader/public-api/gltf2-loader.cpp
rename to dali-scene3d/public-api/loader/gltf2-loader.cpp
index 8af87a1..918bb35 100644 (file)
--- a/dali-scene-loader/public-api/gltf2-loader.cpp
+++ b/dali-scene3d/public-api/loader/gltf2-loader.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  *
  */
-#include "dali-scene-loader/public-api/gltf2-loader.h"
+#include "dali-scene3d/public-api/loader/gltf2-loader.h"
 #include <fstream>
-#include "dali-scene-loader/internal/gltf2-asset.h"
-#include "dali-scene-loader/public-api/load-result.h"
-#include "dali-scene-loader/public-api/resource-bundle.h"
-#include "dali-scene-loader/public-api/scene-definition.h"
-#include "dali-scene-loader/public-api/shader-definition-factory.h"
-#include "dali-scene-loader/public-api/utils.h"
+#include "dali-scene3d/internal/loader/gltf2-asset.h"
+#include "dali-scene3d/public-api/loader/load-result.h"
+#include "dali-scene3d/public-api/loader/resource-bundle.h"
+#include "dali-scene3d/public-api/loader/scene-definition.h"
+#include "dali-scene3d/public-api/loader/shader-definition-factory.h"
+#include "dali-scene3d/public-api/loader/utils.h"
 #include "dali/public-api/math/quaternion.h"
 
 #define ENUM_STRING_MAPPING(t, x) \
@@ -34,7 +34,9 @@ namespace js = json;
 
 namespace Dali
 {
-namespace SceneLoader
+namespace Scene3D
+{
+namespace Loader
 {
 namespace
 {
@@ -911,7 +913,7 @@ float LoadKeyFrames(const std::string& path, const gt::Animation::Channel& chann
   return duration;
 }
 
-float LoadBlendShapeKeyFrames(const std::string& path, const gt::Animation::Channel& channel, const std::string& nodeName, uint32_t& propertyIndex, std::vector<SceneLoader::AnimatedProperty>& properties)
+float LoadBlendShapeKeyFrames(const std::string& path, const gt::Animation::Channel& channel, const std::string& nodeName, uint32_t& propertyIndex, std::vector<Dali::Scene3D::Loader::AnimatedProperty>& properties)
 {
   const gltf2::Accessor& input  = *channel.mSampler->mInput;
   const gltf2::Accessor& output = *channel.mSampler->mOutput;
@@ -1169,7 +1171,7 @@ void SetDefaultEnvironmentMap(const gt::Document& doc, ConversionContext& cctx)
 {
   EnvironmentDefinition envDef;
   envDef.mUseBrdfTexture = true;
-  envDef.mIblIntensity = DEFAULT_INTENSITY;
+  envDef.mIblIntensity   = DEFAULT_INTENSITY;
   cctx.mOutput.mResources.mEnvironmentMaps.push_back({std::move(envDef), EnvironmentDefinition::Textures()});
 }
 
@@ -1217,7 +1219,6 @@ void LoadGltfScene(const std::string& url, ShaderDefinitionFactory& shaderFactor
     isMRendererModel      = (doc.mAsset.mGenerator.find(MRENDERER_MODEL_IDENTIFICATION) != std::string_view::npos);
   }
 
-
   gt::SetRefReaderObject(doc);
   DOCUMENT_READER.Read(rootObj, doc);
 
@@ -1236,5 +1237,6 @@ void LoadGltfScene(const std::string& url, ShaderDefinitionFactory& shaderFactor
   SetDefaultEnvironmentMap(doc, cctx);
 }
 
-} // namespace SceneLoader
+} // namespace Loader
+} // namespace Scene3D
 } // namespace Dali