X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-scene3d%2Fpublic-api%2Floader%2Fmesh-definition.h;fp=dali-scene-loader%2Fpublic-api%2Fmesh-definition.h;h=445fbe71fc4c17e4cdeae8a3e73a1f5740208b36;hp=b4b2c7d2abe4fd94e3329e656862c4f32e4f8eb5;hb=f2ee13ccda8c768fddc68f5208b7dcfa54c07242;hpb=a656457377ae913f2a81b33a506ef905cdf01ff8 diff --git a/dali-scene-loader/public-api/mesh-definition.h b/dali-scene3d/public-api/loader/mesh-definition.h similarity index 93% rename from dali-scene-loader/public-api/mesh-definition.h rename to dali-scene3d/public-api/loader/mesh-definition.h index b4b2c7d..445fbe7 100644 --- a/dali-scene-loader/public-api/mesh-definition.h +++ b/dali-scene3d/public-api/loader/mesh-definition.h @@ -1,5 +1,5 @@ -#ifndef DALI_SCENE_LOADER_MESH_DEFINITION_H -#define DALI_SCENE_LOADER_MESH_DEFINITION_H +#ifndef DALI_SCENE3D_LOADER_MESH_DEFINITION_H +#define DALI_SCENE3D_LOADER_MESH_DEFINITION_H /* * Copyright (c) 2022 Samsung Electronics Co., Ltd. * @@ -18,11 +18,11 @@ */ // INTERNAL INCLUDES -#include "dali-scene-loader/public-api/api.h" -#include "dali-scene-loader/public-api/blend-shape-details.h" -#include "dali-scene-loader/public-api/index.h" -#include "dali-scene-loader/public-api/mesh-geometry.h" -#include "dali-scene-loader/public-api/utils.h" +#include "dali-scene3d/public-api/api.h" +#include "dali-scene3d/public-api/loader/blend-shape-details.h" +#include "dali-scene3d/public-api/loader/index.h" +#include "dali-scene3d/public-api/loader/mesh-geometry.h" +#include "dali-scene3d/public-api/loader/utils.h" // EXTERNAL INCLUDES #include @@ -30,14 +30,16 @@ namespace Dali { -namespace SceneLoader +namespace Scene3D +{ +namespace Loader { /** * @brief Defines a mesh with its attributes, the primitive type to render it as, * and the file to load it from with the offset and length information for the * individual attribute buffers. */ -struct DALI_SCENE_LOADER_API MeshDefinition +struct DALI_SCENE3D_API MeshDefinition { using Vector = std::vector>; @@ -271,7 +273,8 @@ public: // DATA Index mSkeletonIdx = INVALID_INDEX; }; -} // namespace SceneLoader +} // namespace Loader +} // namespace Scene3D } // namespace Dali -#endif //DALI_SCENE_LOADER_MESH_DEFINITION_H +#endif //DALI_SCENE3D_LOADER_MESH_DEFINITION_H