X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-scene3d%2Fpublic-api%2Floader%2Fresource-bundle.h;fp=dali-scene-loader%2Fpublic-api%2Fresource-bundle.h;h=1537f72dd05a568ea87ebd4a9e78c58d802b4643;hp=b1e09363f362fd236533fab5827ee1dba1d76a56;hb=f2ee13ccda8c768fddc68f5208b7dcfa54c07242;hpb=a656457377ae913f2a81b33a506ef905cdf01ff8 diff --git a/dali-scene-loader/public-api/resource-bundle.h b/dali-scene3d/public-api/loader/resource-bundle.h similarity index 81% rename from dali-scene-loader/public-api/resource-bundle.h rename to dali-scene3d/public-api/loader/resource-bundle.h index b1e0936..1537f72 100644 --- a/dali-scene-loader/public-api/resource-bundle.h +++ b/dali-scene3d/public-api/loader/resource-bundle.h @@ -1,7 +1,7 @@ -#ifndef DALI_SCENE_LOADER_RESOURCE_BUNDLE_H_ -#define DALI_SCENE_LOADER_RESOURCE_BUNDLE_H_ +#ifndef DALI_SCENE3D_LOADERERERERER_RESOURCE_BUNDLE_H_ +#define DALI_SCENE3D_LOADERERERERER_RESOURCE_BUNDLE_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,11 +18,11 @@ */ // INTERNAL -#include "dali-scene-loader/public-api/environment-definition.h" -#include "dali-scene-loader/public-api/material-definition.h" -#include "dali-scene-loader/public-api/mesh-definition.h" -#include "dali-scene-loader/public-api/shader-definition.h" -#include "dali-scene-loader/public-api/skeleton-definition.h" +#include "dali-scene3d/public-api/loader/environment-definition.h" +#include "dali-scene3d/public-api/loader/material-definition.h" +#include "dali-scene3d/public-api/loader/mesh-definition.h" +#include "dali-scene3d/public-api/loader/shader-definition.h" +#include "dali-scene3d/public-api/loader/skeleton-definition.h" // EXTERNAL #include @@ -33,12 +33,14 @@ namespace Dali { -namespace SceneLoader +namespace Scene3D +{ +namespace Loader { /* * @brief The types of resources that .dli may define. */ -struct DALI_SCENE_LOADER_API ResourceType +struct DALI_SCENE3D_API ResourceType { enum Value { @@ -54,7 +56,7 @@ struct DALI_SCENE_LOADER_API ResourceType /* * @return The string value corresponding to the given resource @a type. */ -DALI_SCENE_LOADER_API const char* GetResourceTypeName(ResourceType::Value type); +DALI_SCENE3D_API const char* GetResourceTypeName(ResourceType::Value type); using ResourceRefCounts = std::vector>; @@ -63,7 +65,7 @@ using ResourceRefCounts = std::vector>; * could be created from them, directly indexible into with values from a dli * document. */ -class DALI_SCENE_LOADER_API ResourceBundle +class DALI_SCENE3D_API ResourceBundle { public: struct Options @@ -122,7 +124,8 @@ public: // DATA SkeletonDefinition::Vector mSkeletons; }; -} // namespace SceneLoader +} // namespace Loader +} // namespace Scene3D } // namespace Dali -#endif //DALI_SCENE_LOADER_RESOURCE_BUNDLE_H_ +#endif //DALI_SCENE3D_LOADERERERERER_RESOURCE_BUNDLE_H_