Change dali-scene-loader to dali-scene3d

Change-Id: I71bdf5359b9bec2d42b4befadcb2561bd6019dc7
Signed-off-by: seungho <sbsh.baek@samsung.com>

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 5f20ac9..5198d34 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -215,19 +215,19 @@ IF( ENABLE_PKG_CONFIGURE )
         SET(REQUIRED_CFLAGS "${REQUIRED_CFLAGS} ${flag}")
   ENDFOREACH(flag)
 
-  pkg_check_modules(DALI_SCENE_LOADER dali2-scene-loader)
-  IF( DALI_SCENE_LOADER_FOUND )
-    FOREACH(flag ${DALI_SCENE_LOADER_CFLAGS})
+  pkg_check_modules(DALI_SCENE3D dali2-scene3d)
+  IF( DALI_SCENE3D_FOUND )
+    FOREACH(flag ${DALI_SCENE3D_CFLAGS})
       SET(REQUIRED_CFLAGS "${REQUIRED_CFLAGS} ${flag}")
     ENDFOREACH(flag)
 
-    SET( REQUIRED_CFLAGS "${REQUIRED_CFLAGS} -DDALI_SCENE_LOADER_AVAILABLE" )
+    SET( REQUIRED_CFLAGS "${REQUIRED_CFLAGS} -DDALI_SCENE3D_AVAILABLE" )
 
-    FOREACH(flag ${DALI_SCENE_LOADER_LDFLAGS})
+    FOREACH(flag ${DALI_SCENE3D_LDFLAGS})
       SET(REQUIRED_PKGS_LDFLAGS "${REQUIRED_PKGS_LDFLAGS} ${flag}")
     ENDFOREACH(flag)
 
-    SET( ENABLE_SCENE_LOADER "ON" )
+    SET( ENABLE_SCENE3D "ON" )
   ENDIF()
 
   # if build as tizen platform, use capi-appfw-app-control
@@ -277,7 +277,7 @@ IF( WIN32 OR APPLE ) # WIN32 includes x64 as well according to the cmake doc.
   FIND_PACKAGE( dali2-adaptor REQUIRED )
   FIND_PACKAGE( dali2-toolkit REQUIRED )
 
-  FIND_PACKAGE( dali2-scene-loader )
+  FIND_PACKAGE( dali2-scene3d )
 
   # Set up the include dir
   SET( INCLUDE_DIR $ENV{includedir} )
@@ -326,12 +326,12 @@ IF( WIN32 OR APPLE ) # WIN32 includes x64 as well according to the cmake doc.
     )
   ENDIF()
 
-  IF (dali2-scene-loader_FOUND)
+  IF (dali2-scene3d_FOUND)
     SET(REQUIRED_LIBS
       ${REQUIRED_LIBS}
-      dali2-scene-loader::dali2-scene-loader
+      dali2-scene3d::dali2-scene3d
     )
-    SET( ENABLE_SCENE_LOADER "ON" )
+    SET( ENABLE_SCENE3D "ON" )
   ENDIF()
 ELSEIF( UNIX )
   SET( REQUIRED_LIBS
@@ -357,8 +357,8 @@ IF( ENABLE_TRACE )
   SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DTRACE_ENABLED")
 ENDIF()
 
-IF( ENABLE_SCENE_LOADER )
-  SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DDALI_SCENE_LOADER_AVAILABLE")
+IF( ENABLE_SCENE3D )
+  SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DDALI_SCENE3D_AVAILABLE")
 ENDIF()
 
 IF( UNIX )
@@ -468,4 +468,4 @@ MESSAGE( " Folder  DEMO_LOCALE_DIR : [" ${DEMO_LOCALE_DIR} "]" )
 MESSAGE( " Folder DEMO_EXAMPLE_BIN : [" ${DEMO_EXAMPLE_BIN} "]" )
 MESSAGE( " Folder        DEMO_LANG : [" ${DEMO_LANG} "]" )
 MESSAGE( " Current Build Platform  : [" ${CURRENT_BUILD_PLATFORM} "]" )
-MESSAGE( " Scene Loader Enabled    : [" ${ENABLE_SCENE_LOADER} "]" )
+MESSAGE( " Scene3D Enabled    : [" ${ENABLE_SCENE3D} "]" )

diff --git a/build/tizen/examples/CMakeLists.txt b/build/tizen/examples/CMakeLists.txt
index 1692226..3edebb6 100644 (file)
--- a/build/tizen/examples/CMakeLists.txt
+++ b/build/tizen/examples/CMakeLists.txt
@@ -13,10 +13,10 @@ MACRO(SUBDIRLIST result curdir)
 ENDMACRO()
 SUBDIRLIST(SUBDIRS ${EXAMPLES_SRC_DIR})
 
-SET(SCENE_LOADER_DIR "scene-loader")
-IF (NOT "${ENABLE_SCENE_LOADER}" )
-  IF ( ${SCENE_LOADER_DIR} IN_LIST SUBDIRS )
-    LIST( REMOVE_ITEM SUBDIRS ${SCENE_LOADER_DIR} )
+SET(SCENE3D_DIR "scene3d")
+IF (NOT "${ENABLE_SCENE3D}" )
+  IF ( ${SCENE3D_DIR} IN_LIST SUBDIRS )
+    LIST( REMOVE_ITEM SUBDIRS ${SCENE3D_DIR} )
   ENDIF()
 ENDIF()
 

diff --git a/com.samsung.dali-demo.xml b/com.samsung.dali-demo.xml
index 40fb016..fde96a5 100644 (file)
--- a/com.samsung.dali-demo.xml
+++ b/com.samsung.dali-demo.xml
@@ -277,8 +277,8 @@
        <ui-application appid="scene3d-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/scene3d-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
                <label>Scene3d View</label>
        </ui-application>
-       <ui-application appid="scene-loader.example" exec="/usr/apps/com.samsung.dali-demo/bin/scene-loader.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
-               <label>Scene Loader</label>
+       <ui-application appid="scene3d.example" exec="/usr/apps/com.samsung.dali-demo/bin/scene3d.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
+               <label>Scene3D</label>
        </ui-application>
        <ui-application appid="scroll-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/scroll-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
                <label>Scroll View</label>

diff --git a/demo/dali-demo.cpp b/demo/dali-demo.cpp
index b8fea35..0dd09b9 100644 (file)
--- a/demo/dali-demo.cpp
+++ b/demo/dali-demo.cpp
@@ -59,9 +59,9 @@ int DALI_EXPORT_API main(int argc, char** argv)
   demo.AddExample(Example("rendering-skybox.example", DALI_DEMO_STR_TITLE_SKYBOX));
   demo.AddExample(Example("rendering-basic-pbr.example", DALI_DEMO_STR_TITLE_PBR));
   demo.AddExample(Example("scene3d-view.example", DALI_DEMO_STR_TITLE_SCENE3D_VIEW));
-#ifdef DALI_SCENE_LOADER_AVAILABLE
-  demo.AddExample(Example("scene-loader.example", DALI_DEMO_STR_TITLE_SCENE_LOADER));
-#endif //DALI_SCENE_LOADER_AVAILABLE
+#ifdef DALI_SCENE3D_AVAILABLE
+  demo.AddExample(Example("scene3d.example", DALI_DEMO_STR_TITLE_SCENE3D));
+#endif //DALI_SCENE3D_AVAILABLE
   demo.AddExample(Example("shadows-and-lights.example", DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS));
   demo.AddExample(Example("sparkle.example", DALI_DEMO_STR_TITLE_SPARKLE));
   demo.AddExample(Example("waves.example", DALI_DEMO_STR_TITLE_WAVES));

diff --git a/examples/scene-loader/main.cpp b/examples/scene3d/main.cpp
similarity index 88%
rename from examples/scene-loader/main.cpp
rename to examples/scene3d/main.cpp
index 630aa26..bae3cad 100644 (file)
--- a/examples/scene-loader/main.cpp
+++ b/examples/scene3d/main.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  *\r
  */\r
-#include "scene-loader-example.h"\r
+#include "scene3d-example.h"\r
 \r
 #include "dali/dali.h"\r
 \r
@@ -23,7 +23,7 @@ using namespace Dali;
 int DALI_EXPORT_API main(int argc, char** argv)\r
 {\r
   auto               app = Application::New(&argc, &argv, DEMO_THEME_PATH);\r
-  SceneLoaderExample sceneLoader(app);\r
+  Scene3DExample scene3D(app);\r
   app.MainLoop();\r
   return 0;\r
 }\r

diff --git a/examples/scene-loader/scene-loader-example.cpp b/examples/scene3d/scene3d-example.cpp
similarity index 85%
rename from examples/scene-loader/scene-loader-example.cpp
rename to examples/scene3d/scene3d-example.cpp
index 417ba6b..2c634c8 100644 (file)
--- a/examples/scene-loader/scene-loader-example.cpp
+++ b/examples/scene3d/scene3d-example.cpp
@@ -14,16 +14,16 @@
  * limitations under the License.\r
  *\r
  */\r
-#include "scene-loader-example.h"\r
+#include "scene3d-example.h"\r
 #include <dali-toolkit/dali-toolkit.h>\r
 #include <dirent.h>\r
 #include <cstring>\r
 #include <string_view>\r
-#include "dali-scene-loader/public-api/dli-loader.h"\r
-#include "dali-scene-loader/public-api/gltf2-loader.h"\r
-#include "dali-scene-loader/public-api/light-parameters.h"\r
-#include "dali-scene-loader/public-api/load-result.h"\r
-#include "dali-scene-loader/public-api/shader-definition-factory.h"\r
+#include "dali-scene3d/public-api/loader/dli-loader.h"\r
+#include "dali-scene3d/public-api/loader/gltf2-loader.h"\r
+#include "dali-scene3d/public-api/loader/light-parameters.h"\r
+#include "dali-scene3d/public-api/loader/load-result.h"\r
+#include "dali-scene3d/public-api/loader/shader-definition-factory.h"\r
 #include "dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h"\r
 #include "dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h"\r
 #include "dali-toolkit/public-api/controls/text-controls/text-label.h"\r
@@ -33,11 +33,11 @@
 #include "dali/public-api/events/key-event.h"\r
 #include "dali/public-api/object/property-array.h"\r
 #include "dali/public-api/render-tasks/render-task-list.h"\r
-#include "scene-loader-extension.h"\r
+#include "scene3d-extension.h"\r
 \r
 using namespace Dali;\r
 using namespace Dali::Toolkit;\r
-using namespace Dali::SceneLoader;\r
+using namespace Dali::Scene3D::Loader;\r
 \r
 namespace\r
 {\r
@@ -282,9 +282,9 @@ Actor LoadScene(std::string sceneName, CameraActor camera, std::vector<Animation
 \r
 } // namespace\r
 \r
-SceneLoaderExample::SceneLoaderExample(Dali::Application& app)\r
+Scene3DExample::Scene3DExample(Dali::Application& app)\r
 : mApp(app),\r
-  mSceneLoaderExtension(new SceneLoaderExtension())\r
+  mScene3DExtension(new Scene3DExtension())\r
 {\r
   if(!std::getenv("DALI_APPLICATION_PACKAGE"))\r
   {\r
@@ -298,13 +298,13 @@ SceneLoaderExample::SceneLoaderExample(Dali::Application& app)
     }\r
   }\r
 \r
-  app.InitSignal().Connect(this, &SceneLoaderExample::OnInit);\r
-  app.TerminateSignal().Connect(this, &SceneLoaderExample::OnTerminate);\r
+  app.InitSignal().Connect(this, &Scene3DExample::OnInit);\r
+  app.TerminateSignal().Connect(this, &Scene3DExample::OnTerminate);\r
 }\r
 \r
-SceneLoaderExample::~SceneLoaderExample() = default;\r
+Scene3DExample::~Scene3DExample() = default;\r
 \r
-void SceneLoaderExample::OnInit(Application& app)\r
+void Scene3DExample::OnInit(Application& app)\r
 {\r
   // get scenes\r
   auto resPath    = Application::GetResourcePath();\r
@@ -363,9 +363,9 @@ void SceneLoaderExample::OnInit(Application& app)
   mItemView   = items;\r
 \r
   mItemView.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);\r
-  KeyboardFocusManager::Get().PreFocusChangeSignal().Connect(this, &SceneLoaderExample::OnKeyboardPreFocusChange);\r
-  KeyboardFocusManager::Get().FocusedActorEnterKeySignal().Connect(this, &SceneLoaderExample::OnKeyboardFocusedActorActivated);\r
-  KeyboardFocusManager::Get().FocusChangedSignal().Connect(this, &SceneLoaderExample::OnKeyboardFocusChanged);\r
+  KeyboardFocusManager::Get().PreFocusChangeSignal().Connect(this, &Scene3DExample::OnKeyboardPreFocusChange);\r
+  KeyboardFocusManager::Get().FocusedActorEnterKeySignal().Connect(this, &Scene3DExample::OnKeyboardFocusedActorActivated);\r
+  KeyboardFocusManager::Get().FocusChangedSignal().Connect(this, &Scene3DExample::OnKeyboardFocusChanged);\r
 \r
   SetActorCentered(KeyboardFocusManager::Get().GetFocusIndicatorActor());\r
 \r
@@ -376,18 +376,18 @@ void SceneLoaderExample::OnInit(Application& app)
   mSceneCamera = camera;\r
 \r
   // event handling\r
-  window.KeyEventSignal().Connect(this, &SceneLoaderExample::OnKey);\r
+  window.KeyEventSignal().Connect(this, &Scene3DExample::OnKey);\r
 \r
-  tapDetector.DetectedSignal().Connect(this, &SceneLoaderExample::OnTap);\r
+  tapDetector.DetectedSignal().Connect(this, &Scene3DExample::OnTap);\r
   mTapDetector = tapDetector;\r
 \r
   // activate layout\r
   mItemView.ActivateLayout(0, windowSize, 0.f);\r
 \r
-  mSceneLoaderExtension->SetSceneLoader(this);\r
+  mScene3DExtension->SetSceneLoader(this);\r
 }\r
 \r
-Actor SceneLoaderExample::OnKeyboardPreFocusChange(Actor current, Actor proposed, Control::KeyboardFocus::Direction direction)\r
+Actor Scene3DExample::OnKeyboardPreFocusChange(Actor current, Actor proposed, Control::KeyboardFocus::Direction direction)\r
 {\r
   if(!current && !proposed)\r
   {\r
@@ -397,7 +397,7 @@ Actor SceneLoaderExample::OnKeyboardPreFocusChange(Actor current, Actor proposed
   return proposed;\r
 }\r
 \r
-void SceneLoaderExample::OnKeyboardFocusedActorActivated(Actor activatedActor)\r
+void Scene3DExample::OnKeyboardFocusedActorActivated(Actor activatedActor)\r
 {\r
   if(activatedActor)\r
   {\r
@@ -405,7 +405,7 @@ void SceneLoaderExample::OnKeyboardFocusedActorActivated(Actor activatedActor)
   }\r
 }\r
 \r
-void SceneLoaderExample::OnKeyboardFocusChanged(Actor originalFocusedActor, Actor currentFocusedActor)\r
+void Scene3DExample::OnKeyboardFocusChanged(Actor originalFocusedActor, Actor currentFocusedActor)\r
 {\r
   if(currentFocusedActor)\r
   {\r
@@ -414,7 +414,7 @@ void SceneLoaderExample::OnKeyboardFocusChanged(Actor originalFocusedActor, Acto
   }\r
 }\r
 \r
-void SceneLoaderExample::OnTerminate(Application& app)\r
+void Scene3DExample::OnTerminate(Application& app)\r
 {\r
   mTapDetector.Reset();\r
   mPanDetector.Reset();\r
@@ -430,7 +430,7 @@ void SceneLoaderExample::OnTerminate(Application& app)
   mItemFactory.reset();\r
 }\r
 \r
-void SceneLoaderExample::OnKey(const KeyEvent& e)\r
+void Scene3DExample::OnKey(const KeyEvent& e)\r
 {\r
   if(e.GetState() == KeyEvent::UP)\r
   {\r
@@ -455,12 +455,12 @@ void SceneLoaderExample::OnKey(const KeyEvent& e)
     }\r
     else\r
     {\r
-      mSceneLoaderExtension->OnKey(e);\r
+      mScene3DExtension->OnKey(e);\r
     }\r
   }\r
 }\r
 \r
-void SceneLoaderExample::OnPan(Actor actor, const PanGesture& pan)\r
+void Scene3DExample::OnPan(Actor actor, const PanGesture& pan)\r
 {\r
   auto    windowSize = mApp.GetWindow().GetSize();\r
   Vector2 size{float(windowSize.GetWidth()), float(windowSize.GetHeight())};\r
@@ -476,7 +476,7 @@ void SceneLoaderExample::OnPan(Actor actor, const PanGesture& pan)
   mScene.SetProperty(Actor::Property::ORIENTATION, q * q0);\r
 }\r
 \r
-void SceneLoaderExample::OnTap(Dali::Actor actor, const Dali::TapGesture& tap)\r
+void Scene3DExample::OnTap(Dali::Actor actor, const Dali::TapGesture& tap)\r
 {\r
   mActivatedActor = actor;\r
 \r
@@ -499,7 +499,7 @@ void SceneLoaderExample::OnTap(Dali::Actor actor, const Dali::TapGesture& tap)
     mSceneRender = sceneRender;\r
 \r
     mPanDetector = PanGestureDetector::New();\r
-    mPanDetector.DetectedSignal().Connect(this, &SceneLoaderExample::OnPan);\r
+    mPanDetector.DetectedSignal().Connect(this, &Scene3DExample::OnPan);\r
     mPanDetector.Attach(mNavigationView);\r
   }\r
   catch(const DaliException& e)\r
@@ -509,5 +509,5 @@ void SceneLoaderExample::OnTap(Dali::Actor actor, const Dali::TapGesture& tap)
 \r
   mNavigationView.Push(mScene);\r
 \r
-  mSceneLoaderExtension->ConnectTouchSignals();\r
+  mScene3DExtension->ConnectTouchSignals();\r
 }\r

diff --git a/examples/scene-loader/scene-loader-example.h b/examples/scene3d/scene3d-example.h
similarity index 80%
rename from examples/scene-loader/scene-loader-example.h
rename to examples/scene3d/scene3d-example.h
index a516dbe..eda40d5 100644 (file)
--- a/examples/scene-loader/scene-loader-example.h
+++ b/examples/scene3d/scene3d-example.h
@@ -18,10 +18,10 @@
  */\r
 \r
 #include <memory>\r
-#include "dali-scene-loader/public-api/animation-definition.h"\r
-#include "dali-scene-loader/public-api/camera-parameters.h"\r
-#include "dali-scene-loader/public-api/node-definition.h"\r
-#include "dali-scene-loader/public-api/scene-definition.h"\r
+#include "dali-scene3d/public-api/loader/animation-definition.h"\r
+#include "dali-scene3d/public-api/loader/camera-parameters.h"\r
+#include "dali-scene3d/public-api/loader/node-definition.h"\r
+#include "dali-scene3d/public-api/loader/scene-definition.h"\r
 #include "dali-toolkit/devel-api/controls/navigation-view/navigation-view.h"\r
 #include "dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h"\r
 #include "dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h"\r
@@ -33,13 +33,13 @@
 #include "dali/public-api/render-tasks/render-task.h"\r
 #include "dali/public-api/signals/connection-tracker.h"\r
 \r
-class SceneLoaderExtension;\r
+class Scene3DExtension;\r
 \r
-class SceneLoaderExample : public Dali::ConnectionTracker\r
+class Scene3DExample : public Dali::ConnectionTracker\r
 {\r
 public:\r
-  SceneLoaderExample(Dali::Application& app);\r
-  ~SceneLoaderExample();\r
+  Scene3DExample(Dali::Application& app);\r
+  ~Scene3DExample();\r
 \r
 private: // data\r
   Dali::Application& mApp;\r
@@ -65,10 +65,10 @@ private: // data
 public:\r
   Dali::Actor mScene;\r
 \r
-  std::vector<Dali::SceneLoader::AnimationDefinition> mSceneAnimations;\r
+  std::vector<Dali::Scene3D::Loader::AnimationDefinition> mSceneAnimations;\r
   Dali::Animation                                     mCurrentAnimation;\r
 \r
-  std::unique_ptr<SceneLoaderExtension> mSceneLoaderExtension;\r
+  std::unique_ptr<Scene3DExtension> mScene3DExtension;\r
 \r
 private: // methods\r
   void OnInit(Dali::Application& app);\r

diff --git a/examples/scene-loader/scene-loader-extension.h b/examples/scene3d/scene3d-extension.h
similarity index 90%
rename from examples/scene-loader/scene-loader-extension.h
rename to examples/scene3d/scene3d-extension.h
index e937234..d4cc6ca 100644 (file)
--- a/examples/scene-loader/scene-loader-extension.h
+++ b/examples/scene3d/scene3d-extension.h
@@ -19,20 +19,20 @@
 #include <dali/dali.h>\r
 #include <cstring>\r
 \r
-class SceneLoaderExtension : public Dali::ConnectionTracker\r
+class Scene3DExtension : public Dali::ConnectionTracker\r
 {\r
 public:\r
-  SceneLoaderExtension()\r
+  Scene3DExtension()\r
   : mSceneLoader(nullptr),\r
     mCurrentAnimationIndex(ANIMATION_IDLE)\r
   {\r
   }\r
 \r
-  ~SceneLoaderExtension() = default; // Nothing to do in destructor\r
+  ~Scene3DExtension() = default; // Nothing to do in destructor\r
 \r
-  void SetSceneLoader(SceneLoaderExample* sceneLoader)\r
+  void SetSceneLoader(Scene3DExample* scene3D)\r
   {\r
-    mSceneLoader = sceneLoader;\r
+    mSceneLoader = scene3D;\r
   }\r
 \r
   void ConnectTouchSignals()\r
@@ -102,7 +102,7 @@ private:
       {\r
         mCurrentAnimationIndex          = animationIndex;\r
         mSceneLoader->mCurrentAnimation = mSceneLoader->mSceneAnimations[animationIndex].ReAnimate(getActor);\r
-        mSceneLoader->mCurrentAnimation.FinishedSignal().Connect(this, &SceneLoaderExtension::OnAnimationFinished);\r
+        mSceneLoader->mCurrentAnimation.FinishedSignal().Connect(this, &Scene3DExtension::OnAnimationFinished);\r
         mSceneLoader->mCurrentAnimation.Play();\r
       }\r
     }\r
@@ -117,7 +117,7 @@ private:
       auto actor = mSceneLoader->mScene.FindChildByName(actorName);\r
       if(actor)\r
       {\r
-        actor.TouchedSignal().Connect(this, &SceneLoaderExtension::OnTouch);\r
+        actor.TouchedSignal().Connect(this, &Scene3DExtension::OnTouch);\r
       }\r
     }\r
   }\r
@@ -216,6 +216,6 @@ private:
   inline static const std::string ICON_JUMPING_JACK = "JumpingJack";\r
   inline static const std::string ICON_LUNGE        = "Lunge";\r
 \r
-  SceneLoaderExample* mSceneLoader;\r
+  Scene3DExample* mSceneLoader;\r
   unsigned int        mCurrentAnimationIndex;\r
 };\r

diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index 4a18bf6..d4f10f2 100755 (executable)
--- a/packaging/com.samsung.dali-demo.spec
+++ b/packaging/com.samsung.dali-demo.spec
@@ -22,7 +22,7 @@ BuildRequires:  gettext-tools
 BuildRequires:  pkgconfig(dali2-core)
 BuildRequires:  pkgconfig(dali2-adaptor)
 BuildRequires:  pkgconfig(dali2-toolkit)
-BuildRequires:  pkgconfig(dali2-scene-loader)
+BuildRequires:  pkgconfig(dali2-scene3d)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(gles20)
 BuildRequires:  pkgconfig(glesv2)

diff --git a/resources/po/en_GB.po b/resources/po/en_GB.po
index 52ea76b..81f75ce 100755 (executable)
--- a/resources/po/en_GB.po
+++ b/resources/po/en_GB.po
@@ -205,8 +205,8 @@ msgstr "Reflection"
 msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
 msgstr "Renderer Stencil"
 
-msgid "DALI_DEMO_STR_TITLE_SCENE_LOADER"
-msgstr "Scene Loader"
+msgid "DALI_DEMO_STR_TITLE_SCENE3D"
+msgstr "Scene3D"
 
 msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
 msgstr "Script-based UI"

diff --git a/resources/po/en_US.po b/resources/po/en_US.po
index 9545053..0e4341e 100755 (executable)
--- a/resources/po/en_US.po
+++ b/resources/po/en_US.po
@@ -211,8 +211,8 @@ msgstr "Refraction"
 msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
 msgstr "Renderer Stencil"
 
-msgid "DALI_DEMO_STR_TITLE_SCENE_LOADER"
-msgstr "Scene Loader"
+msgid "DALI_DEMO_STR_TITLE_SCENE3D"
+msgstr "Scene3D"
 
 msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
 msgstr "Script-based UI"

diff --git a/shared/dali-demo-strings.h b/shared/dali-demo-strings.h
index d84effd..8639183 100644 (file)
--- a/shared/dali-demo-strings.h
+++ b/shared/dali-demo-strings.h
@@ -116,7 +116,7 @@ extern "C"
 #define DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING")
 #define DALI_DEMO_STR_TITLE_RENDERER_STENCIL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RENDERER_STENCIL")
 #define DALI_DEMO_STR_TITLE_SCENE3D_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCENE3D_VIEW")
-#define DALI_DEMO_STR_TITLE_SCENE_LOADER dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCENE_LOADER")
+#define DALI_DEMO_STR_TITLE_SCENE3D dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCENE3D")
 #define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI")
 #define DALI_DEMO_STR_TITLE_SCROLL_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCROLL_VIEW")
 #define DALI_DEMO_STR_TITLE_SIMPLE_SCROLL_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SIMPLE_SCROLL_VIEW")
@@ -228,7 +228,7 @@ extern "C"
 #define DALI_DEMO_STR_TITLE_RENDERING_RADIAL_PROGRESS "Radial Progress"
 #define DALI_DEMO_STR_TITLE_RENDERER_STENCIL "Renderer Stencils"
 #define DALI_DEMO_STR_TITLE_SCENE3D_VIEW "Scene3D View glTF"
-#define DALI_DEMO_STR_TITLE_SCENE_LOADER "Scene Loader"
+#define DALI_DEMO_STR_TITLE_SCENE3D "Scene3D"
 #define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI "Script Based UI"
 #define DALI_DEMO_STR_TITLE_SCROLL_VIEW "Scroll View"
 #define DALI_DEMO_STR_TITLE_SIMPLE_SCROLL_VIEW "Simple Scroll View"