Peter M. Groen / dali-demo

Commit af599038d0b1ce8d95ae912133e5ce2b249de74c

Authored by seungho
1 parent 5b365286

Change dali-scene-loader to dali-scene3d 

Change-Id: I71bdf5359b9bec2d42b4befadcb2561bd6019dc7
Signed-off-by: seungho <sbsh.baek@samsung.com>
Inline Side-by-side
Showing 12 changed files with 79 additions and 79 deletions
build/tizen/CMakeLists.txt
  View file @af59903
... ... @@ -215,19 +215,19 @@ IF( ENABLE_PKG_CONFIGURE )
215 215 SET(REQUIRED_CFLAGS "${REQUIRED_CFLAGS} ${flag}")
216 216 ENDFOREACH(flag)
217 217  
218   - pkg_check_modules(DALI_SCENE_LOADER dali2-scene-loader)
219   - IF( DALI_SCENE_LOADER_FOUND )
220   - FOREACH(flag ${DALI_SCENE_LOADER_CFLAGS})
  218 + pkg_check_modules(DALI_SCENE3D dali2-scene3d)
  219 + IF( DALI_SCENE3D_FOUND )
  220 + FOREACH(flag ${DALI_SCENE3D_CFLAGS})
221 221 SET(REQUIRED_CFLAGS "${REQUIRED_CFLAGS} ${flag}")
222 222 ENDFOREACH(flag)
223 223  
224   - SET( REQUIRED_CFLAGS "${REQUIRED_CFLAGS} -DDALI_SCENE_LOADER_AVAILABLE" )
  224 + SET( REQUIRED_CFLAGS "${REQUIRED_CFLAGS} -DDALI_SCENE3D_AVAILABLE" )
225 225  
226   - FOREACH(flag ${DALI_SCENE_LOADER_LDFLAGS})
  226 + FOREACH(flag ${DALI_SCENE3D_LDFLAGS})
227 227 SET(REQUIRED_PKGS_LDFLAGS "${REQUIRED_PKGS_LDFLAGS} ${flag}")
228 228 ENDFOREACH(flag)
229 229  
230   - SET( ENABLE_SCENE_LOADER "ON" )
  230 + SET( ENABLE_SCENE3D "ON" )
231 231 ENDIF()
232 232  
233 233 # 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.
277 277 FIND_PACKAGE( dali2-adaptor REQUIRED )
278 278 FIND_PACKAGE( dali2-toolkit REQUIRED )
279 279  
280   - FIND_PACKAGE( dali2-scene-loader )
  280 + FIND_PACKAGE( dali2-scene3d )
281 281  
282 282 # Set up the include dir
283 283 SET( INCLUDE_DIR $ENV{includedir} )
... ... @@ -326,12 +326,12 @@ IF( WIN32 OR APPLE ) # WIN32 includes x64 as well according to the cmake doc.
326 326 )
327 327 ENDIF()
328 328  
329   - IF (dali2-scene-loader_FOUND)
  329 + IF (dali2-scene3d_FOUND)
330 330 SET(REQUIRED_LIBS
331 331 ${REQUIRED_LIBS}
332   - dali2-scene-loader::dali2-scene-loader
  332 + dali2-scene3d::dali2-scene3d
333 333 )
334   - SET( ENABLE_SCENE_LOADER "ON" )
  334 + SET( ENABLE_SCENE3D "ON" )
335 335 ENDIF()
336 336 ELSEIF( UNIX )
337 337 SET( REQUIRED_LIBS
... ... @@ -357,8 +357,8 @@ IF( ENABLE_TRACE )
357 357 SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DTRACE_ENABLED")
358 358 ENDIF()
359 359  
360   -IF( ENABLE_SCENE_LOADER )
361   - SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DDALI_SCENE_LOADER_AVAILABLE")
  360 +IF( ENABLE_SCENE3D )
  361 + SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DDALI_SCENE3D_AVAILABLE")
362 362 ENDIF()
363 363  
364 364 IF( UNIX )
... ... @@ -468,4 +468,4 @@ MESSAGE( &quot; Folder DEMO_LOCALE_DIR : [&quot; ${DEMO_LOCALE_DIR} &quot;]&quot; )
468 468 MESSAGE( " Folder DEMO_EXAMPLE_BIN : [" ${DEMO_EXAMPLE_BIN} "]" )
469 469 MESSAGE( " Folder DEMO_LANG : [" ${DEMO_LANG} "]" )
470 470 MESSAGE( " Current Build Platform : [" ${CURRENT_BUILD_PLATFORM} "]" )
471   -MESSAGE( " Scene Loader Enabled : [" ${ENABLE_SCENE_LOADER} "]" )
  471 +MESSAGE( " Scene3D Enabled : [" ${ENABLE_SCENE3D} "]" )
... ...
build/tizen/examples/CMakeLists.txt
  View file @af59903
... ... @@ -13,10 +13,10 @@ MACRO(SUBDIRLIST result curdir)
13 13 ENDMACRO()
14 14 SUBDIRLIST(SUBDIRS ${EXAMPLES_SRC_DIR})
15 15  
16   -SET(SCENE_LOADER_DIR "scene-loader")
17   -IF (NOT "${ENABLE_SCENE_LOADER}" )
18   - IF ( ${SCENE_LOADER_DIR} IN_LIST SUBDIRS )
19   - LIST( REMOVE_ITEM SUBDIRS ${SCENE_LOADER_DIR} )
  16 +SET(SCENE3D_DIR "scene3d")
  17 +IF (NOT "${ENABLE_SCENE3D}" )
  18 + IF ( ${SCENE3D_DIR} IN_LIST SUBDIRS )
  19 + LIST( REMOVE_ITEM SUBDIRS ${SCENE3D_DIR} )
20 20 ENDIF()
21 21 ENDIF()
22 22  
... ...
com.samsung.dali-demo.xml
  View file @af59903
... ... @@ -277,8 +277,8 @@
277 277 <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">
278 278 <label>Scene3d View</label>
279 279 </ui-application>
280   - <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">
281   - <label>Scene Loader</label>
  280 + <ui-application appid="scene3d.example" exec="/usr/apps/com.samsung.dali-demo/bin/scene3d.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
  281 + <label>Scene3D</label>
282 282 </ui-application>
283 283 <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">
284 284 <label>Scroll View</label>
... ...
demo/dali-demo.cpp
  View file @af59903
... ... @@ -59,9 +59,9 @@ int DALI_EXPORT_API main(int argc, char** argv)
59 59 demo.AddExample(Example("rendering-skybox.example", DALI_DEMO_STR_TITLE_SKYBOX));
60 60 demo.AddExample(Example("rendering-basic-pbr.example", DALI_DEMO_STR_TITLE_PBR));
61 61 demo.AddExample(Example("scene3d-view.example", DALI_DEMO_STR_TITLE_SCENE3D_VIEW));
62   -#ifdef DALI_SCENE_LOADER_AVAILABLE
63   - demo.AddExample(Example("scene-loader.example", DALI_DEMO_STR_TITLE_SCENE_LOADER));
64   -#endif //DALI_SCENE_LOADER_AVAILABLE
  62 +#ifdef DALI_SCENE3D_AVAILABLE
  63 + demo.AddExample(Example("scene3d.example", DALI_DEMO_STR_TITLE_SCENE3D));
  64 +#endif //DALI_SCENE3D_AVAILABLE
65 65 demo.AddExample(Example("shadows-and-lights.example", DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS));
66 66 demo.AddExample(Example("sparkle.example", DALI_DEMO_STR_TITLE_SPARKLE));
67 67 demo.AddExample(Example("waves.example", DALI_DEMO_STR_TITLE_WAVES));
... ...
examples/scene-loader/main.cpp renamed to examples/scene3d/main.cpp
  View file @af59903
... ... @@ -14,7 +14,7 @@
14 14 * limitations under the License.
15 15 *
16 16 */
17   -#include "scene-loader-example.h"
  17 +#include "scene3d-example.h"
18 18  
19 19 #include "dali/dali.h"
20 20  
... ... @@ -23,7 +23,7 @@ using namespace Dali;
23 23 int DALI_EXPORT_API main(int argc, char** argv)
24 24 {
25 25 auto app = Application::New(&argc, &argv, DEMO_THEME_PATH);
26   - SceneLoaderExample sceneLoader(app);
  26 + Scene3DExample scene3D(app);
27 27 app.MainLoop();
28 28 return 0;
29 29 }
... ...
examples/scene-loader/scene-loader-example.cpp renamed to examples/scene3d/scene3d-example.cpp
  View file @af59903
... ... @@ -14,16 +14,16 @@
14 14 * limitations under the License.
15 15 *
16 16 */
17   -#include "scene-loader-example.h"
  17 +#include "scene3d-example.h"
18 18 #include <dali-toolkit/dali-toolkit.h>
19 19 #include <dirent.h>
20 20 #include <cstring>
21 21 #include <string_view>
22   -#include "dali-scene-loader/public-api/dli-loader.h"
23   -#include "dali-scene-loader/public-api/gltf2-loader.h"
24   -#include "dali-scene-loader/public-api/light-parameters.h"
25   -#include "dali-scene-loader/public-api/load-result.h"
26   -#include "dali-scene-loader/public-api/shader-definition-factory.h"
  22 +#include "dali-scene3d/public-api/loader/dli-loader.h"
  23 +#include "dali-scene3d/public-api/loader/gltf2-loader.h"
  24 +#include "dali-scene3d/public-api/loader/light-parameters.h"
  25 +#include "dali-scene3d/public-api/loader/load-result.h"
  26 +#include "dali-scene3d/public-api/loader/shader-definition-factory.h"
27 27 #include "dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h"
28 28 #include "dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h"
29 29 #include "dali-toolkit/public-api/controls/text-controls/text-label.h"
... ... @@ -33,11 +33,11 @@
33 33 #include "dali/public-api/events/key-event.h"
34 34 #include "dali/public-api/object/property-array.h"
35 35 #include "dali/public-api/render-tasks/render-task-list.h"
36   -#include "scene-loader-extension.h"
  36 +#include "scene3d-extension.h"
37 37  
38 38 using namespace Dali;
39 39 using namespace Dali::Toolkit;
40   -using namespace Dali::SceneLoader;
  40 +using namespace Dali::Scene3D::Loader;
41 41  
42 42 namespace
43 43 {
... ... @@ -282,9 +282,9 @@ Actor LoadScene(std::string sceneName, CameraActor camera, std::vector&lt;Animation
282 282  
283 283 } // namespace
284 284  
285   -SceneLoaderExample::SceneLoaderExample(Dali::Application& app)
  285 +Scene3DExample::Scene3DExample(Dali::Application& app)
286 286 : mApp(app),
287   - mSceneLoaderExtension(new SceneLoaderExtension())
  287 + mScene3DExtension(new Scene3DExtension())
288 288 {
289 289 if(!std::getenv("DALI_APPLICATION_PACKAGE"))
290 290 {
... ... @@ -298,13 +298,13 @@ SceneLoaderExample::SceneLoaderExample(Dali::Application&amp; app)
298 298 }
299 299 }
300 300  
301   - app.InitSignal().Connect(this, &SceneLoaderExample::OnInit);
302   - app.TerminateSignal().Connect(this, &SceneLoaderExample::OnTerminate);
  301 + app.InitSignal().Connect(this, &Scene3DExample::OnInit);
  302 + app.TerminateSignal().Connect(this, &Scene3DExample::OnTerminate);
303 303 }
304 304  
305   -SceneLoaderExample::~SceneLoaderExample() = default;
  305 +Scene3DExample::~Scene3DExample() = default;
306 306  
307   -void SceneLoaderExample::OnInit(Application& app)
  307 +void Scene3DExample::OnInit(Application& app)
308 308 {
309 309 // get scenes
310 310 auto resPath = Application::GetResourcePath();
... ... @@ -363,9 +363,9 @@ void SceneLoaderExample::OnInit(Application&amp; app)
363 363 mItemView = items;
364 364  
365 365 mItemView.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
366   - KeyboardFocusManager::Get().PreFocusChangeSignal().Connect(this, &SceneLoaderExample::OnKeyboardPreFocusChange);
367   - KeyboardFocusManager::Get().FocusedActorEnterKeySignal().Connect(this, &SceneLoaderExample::OnKeyboardFocusedActorActivated);
368   - KeyboardFocusManager::Get().FocusChangedSignal().Connect(this, &SceneLoaderExample::OnKeyboardFocusChanged);
  366 + KeyboardFocusManager::Get().PreFocusChangeSignal().Connect(this, &Scene3DExample::OnKeyboardPreFocusChange);
  367 + KeyboardFocusManager::Get().FocusedActorEnterKeySignal().Connect(this, &Scene3DExample::OnKeyboardFocusedActorActivated);
  368 + KeyboardFocusManager::Get().FocusChangedSignal().Connect(this, &Scene3DExample::OnKeyboardFocusChanged);
369 369  
370 370 SetActorCentered(KeyboardFocusManager::Get().GetFocusIndicatorActor());
371 371  
... ... @@ -376,18 +376,18 @@ void SceneLoaderExample::OnInit(Application&amp; app)
376 376 mSceneCamera = camera;
377 377  
378 378 // event handling
379   - window.KeyEventSignal().Connect(this, &SceneLoaderExample::OnKey);
  379 + window.KeyEventSignal().Connect(this, &Scene3DExample::OnKey);
380 380  
381   - tapDetector.DetectedSignal().Connect(this, &SceneLoaderExample::OnTap);
  381 + tapDetector.DetectedSignal().Connect(this, &Scene3DExample::OnTap);
382 382 mTapDetector = tapDetector;
383 383  
384 384 // activate layout
385 385 mItemView.ActivateLayout(0, windowSize, 0.f);
386 386  
387   - mSceneLoaderExtension->SetSceneLoader(this);
  387 + mScene3DExtension->SetSceneLoader(this);
388 388 }
389 389  
390   -Actor SceneLoaderExample::OnKeyboardPreFocusChange(Actor current, Actor proposed, Control::KeyboardFocus::Direction direction)
  390 +Actor Scene3DExample::OnKeyboardPreFocusChange(Actor current, Actor proposed, Control::KeyboardFocus::Direction direction)
391 391 {
392 392 if(!current && !proposed)
393 393 {
... ... @@ -397,7 +397,7 @@ Actor SceneLoaderExample::OnKeyboardPreFocusChange(Actor current, Actor proposed
397 397 return proposed;
398 398 }
399 399  
400   -void SceneLoaderExample::OnKeyboardFocusedActorActivated(Actor activatedActor)
  400 +void Scene3DExample::OnKeyboardFocusedActorActivated(Actor activatedActor)
401 401 {
402 402 if(activatedActor)
403 403 {
... ... @@ -405,7 +405,7 @@ void SceneLoaderExample::OnKeyboardFocusedActorActivated(Actor activatedActor)
405 405 }
406 406 }
407 407  
408   -void SceneLoaderExample::OnKeyboardFocusChanged(Actor originalFocusedActor, Actor currentFocusedActor)
  408 +void Scene3DExample::OnKeyboardFocusChanged(Actor originalFocusedActor, Actor currentFocusedActor)
409 409 {
410 410 if(currentFocusedActor)
411 411 {
... ... @@ -414,7 +414,7 @@ void SceneLoaderExample::OnKeyboardFocusChanged(Actor originalFocusedActor, Acto
414 414 }
415 415 }
416 416  
417   -void SceneLoaderExample::OnTerminate(Application& app)
  417 +void Scene3DExample::OnTerminate(Application& app)
418 418 {
419 419 mTapDetector.Reset();
420 420 mPanDetector.Reset();
... ... @@ -430,7 +430,7 @@ void SceneLoaderExample::OnTerminate(Application&amp; app)
430 430 mItemFactory.reset();
431 431 }
432 432  
433   -void SceneLoaderExample::OnKey(const KeyEvent& e)
  433 +void Scene3DExample::OnKey(const KeyEvent& e)
434 434 {
435 435 if(e.GetState() == KeyEvent::UP)
436 436 {
... ... @@ -455,12 +455,12 @@ void SceneLoaderExample::OnKey(const KeyEvent&amp; e)
455 455 }
456 456 else
457 457 {
458   - mSceneLoaderExtension->OnKey(e);
  458 + mScene3DExtension->OnKey(e);
459 459 }
460 460 }
461 461 }
462 462  
463   -void SceneLoaderExample::OnPan(Actor actor, const PanGesture& pan)
  463 +void Scene3DExample::OnPan(Actor actor, const PanGesture& pan)
464 464 {
465 465 auto windowSize = mApp.GetWindow().GetSize();
466 466 Vector2 size{float(windowSize.GetWidth()), float(windowSize.GetHeight())};
... ... @@ -476,7 +476,7 @@ void SceneLoaderExample::OnPan(Actor actor, const PanGesture&amp; pan)
476 476 mScene.SetProperty(Actor::Property::ORIENTATION, q * q0);
477 477 }
478 478  
479   -void SceneLoaderExample::OnTap(Dali::Actor actor, const Dali::TapGesture& tap)
  479 +void Scene3DExample::OnTap(Dali::Actor actor, const Dali::TapGesture& tap)
480 480 {
481 481 mActivatedActor = actor;
482 482  
... ... @@ -499,7 +499,7 @@ void SceneLoaderExample::OnTap(Dali::Actor actor, const Dali::TapGesture&amp; tap)
499 499 mSceneRender = sceneRender;
500 500  
501 501 mPanDetector = PanGestureDetector::New();
502   - mPanDetector.DetectedSignal().Connect(this, &SceneLoaderExample::OnPan);
  502 + mPanDetector.DetectedSignal().Connect(this, &Scene3DExample::OnPan);
503 503 mPanDetector.Attach(mNavigationView);
504 504 }
505 505 catch(const DaliException& e)
... ... @@ -509,5 +509,5 @@ void SceneLoaderExample::OnTap(Dali::Actor actor, const Dali::TapGesture&amp; tap)
509 509  
510 510 mNavigationView.Push(mScene);
511 511  
512   - mSceneLoaderExtension->ConnectTouchSignals();
  512 + mScene3DExtension->ConnectTouchSignals();
513 513 }
... ...
examples/scene-loader/scene-loader-example.h renamed to examples/scene3d/scene3d-example.h
  View file @af59903
... ... @@ -18,10 +18,10 @@
18 18 */
19 19  
20 20 #include <memory>
21   -#include "dali-scene-loader/public-api/animation-definition.h"
22   -#include "dali-scene-loader/public-api/camera-parameters.h"
23   -#include "dali-scene-loader/public-api/node-definition.h"
24   -#include "dali-scene-loader/public-api/scene-definition.h"
  21 +#include "dali-scene3d/public-api/loader/animation-definition.h"
  22 +#include "dali-scene3d/public-api/loader/camera-parameters.h"
  23 +#include "dali-scene3d/public-api/loader/node-definition.h"
  24 +#include "dali-scene3d/public-api/loader/scene-definition.h"
25 25 #include "dali-toolkit/devel-api/controls/navigation-view/navigation-view.h"
26 26 #include "dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h"
27 27 #include "dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h"
... ... @@ -33,13 +33,13 @@
33 33 #include "dali/public-api/render-tasks/render-task.h"
34 34 #include "dali/public-api/signals/connection-tracker.h"
35 35  
36   -class SceneLoaderExtension;
  36 +class Scene3DExtension;
37 37  
38   -class SceneLoaderExample : public Dali::ConnectionTracker
  38 +class Scene3DExample : public Dali::ConnectionTracker
39 39 {
40 40 public:
41   - SceneLoaderExample(Dali::Application& app);
42   - ~SceneLoaderExample();
  41 + Scene3DExample(Dali::Application& app);
  42 + ~Scene3DExample();
43 43  
44 44 private: // data
45 45 Dali::Application& mApp;
... ... @@ -65,10 +65,10 @@ private: // data
65 65 public:
66 66 Dali::Actor mScene;
67 67  
68   - std::vector<Dali::SceneLoader::AnimationDefinition> mSceneAnimations;
  68 + std::vector<Dali::Scene3D::Loader::AnimationDefinition> mSceneAnimations;
69 69 Dali::Animation mCurrentAnimation;
70 70  
71   - std::unique_ptr<SceneLoaderExtension> mSceneLoaderExtension;
  71 + std::unique_ptr<Scene3DExtension> mScene3DExtension;
72 72  
73 73 private: // methods
74 74 void OnInit(Dali::Application& app);
... ...
examples/scene-loader/scene-loader-extension.h renamed to examples/scene3d/scene3d-extension.h
  View file @af59903
... ... @@ -19,20 +19,20 @@
19 19 #include <dali/dali.h>
20 20 #include <cstring>
21 21  
22   -class SceneLoaderExtension : public Dali::ConnectionTracker
  22 +class Scene3DExtension : public Dali::ConnectionTracker
23 23 {
24 24 public:
25   - SceneLoaderExtension()
  25 + Scene3DExtension()
26 26 : mSceneLoader(nullptr),
27 27 mCurrentAnimationIndex(ANIMATION_IDLE)
28 28 {
29 29 }
30 30  
31   - ~SceneLoaderExtension() = default; // Nothing to do in destructor
  31 + ~Scene3DExtension() = default; // Nothing to do in destructor
32 32  
33   - void SetSceneLoader(SceneLoaderExample* sceneLoader)
  33 + void SetSceneLoader(Scene3DExample* scene3D)
34 34 {
35   - mSceneLoader = sceneLoader;
  35 + mSceneLoader = scene3D;
36 36 }
37 37  
38 38 void ConnectTouchSignals()
... ... @@ -102,7 +102,7 @@ private:
102 102 {
103 103 mCurrentAnimationIndex = animationIndex;
104 104 mSceneLoader->mCurrentAnimation = mSceneLoader->mSceneAnimations[animationIndex].ReAnimate(getActor);
105   - mSceneLoader->mCurrentAnimation.FinishedSignal().Connect(this, &SceneLoaderExtension::OnAnimationFinished);
  105 + mSceneLoader->mCurrentAnimation.FinishedSignal().Connect(this, &Scene3DExtension::OnAnimationFinished);
106 106 mSceneLoader->mCurrentAnimation.Play();
107 107 }
108 108 }
... ... @@ -117,7 +117,7 @@ private:
117 117 auto actor = mSceneLoader->mScene.FindChildByName(actorName);
118 118 if(actor)
119 119 {
120   - actor.TouchedSignal().Connect(this, &SceneLoaderExtension::OnTouch);
  120 + actor.TouchedSignal().Connect(this, &Scene3DExtension::OnTouch);
121 121 }
122 122 }
123 123 }
... ... @@ -216,6 +216,6 @@ private:
216 216 inline static const std::string ICON_JUMPING_JACK = "JumpingJack";
217 217 inline static const std::string ICON_LUNGE = "Lunge";
218 218  
219   - SceneLoaderExample* mSceneLoader;
  219 + Scene3DExample* mSceneLoader;
220 220 unsigned int mCurrentAnimationIndex;
221 221 };
... ...
packaging/com.samsung.dali-demo.spec
  View file @af59903
... ... @@ -22,7 +22,7 @@ BuildRequires: gettext-tools
22 22 BuildRequires: pkgconfig(dali2-core)
23 23 BuildRequires: pkgconfig(dali2-adaptor)
24 24 BuildRequires: pkgconfig(dali2-toolkit)
25   -BuildRequires: pkgconfig(dali2-scene-loader)
  25 +BuildRequires: pkgconfig(dali2-scene3d)
26 26 BuildRequires: pkgconfig(libtzplatform-config)
27 27 BuildRequires: pkgconfig(gles20)
28 28 BuildRequires: pkgconfig(glesv2)
... ...
resources/po/en_GB.po
  View file @af59903
... ... @@ -205,8 +205,8 @@ msgstr &quot;Reflection&quot;
205 205 msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
206 206 msgstr "Renderer Stencil"
207 207  
208   -msgid "DALI_DEMO_STR_TITLE_SCENE_LOADER"
209   -msgstr "Scene Loader"
  208 +msgid "DALI_DEMO_STR_TITLE_SCENE3D"
  209 +msgstr "Scene3D"
210 210  
211 211 msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
212 212 msgstr "Script-based UI"
... ...
resources/po/en_US.po
  View file @af59903
... ... @@ -211,8 +211,8 @@ msgstr &quot;Refraction&quot;
211 211 msgid "DALI_DEMO_STR_TITLE_RENDERER_STENCIL"
212 212 msgstr "Renderer Stencil"
213 213  
214   -msgid "DALI_DEMO_STR_TITLE_SCENE_LOADER"
215   -msgstr "Scene Loader"
  214 +msgid "DALI_DEMO_STR_TITLE_SCENE3D"
  215 +msgstr "Scene3D"
216 216  
217 217 msgid "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI"
218 218 msgstr "Script-based UI"
... ...
shared/dali-demo-strings.h
  View file @af59903
... ... @@ -116,7 +116,7 @@ extern &quot;C&quot;
116 116 #define DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING")
117 117 #define DALI_DEMO_STR_TITLE_RENDERER_STENCIL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_RENDERER_STENCIL")
118 118 #define DALI_DEMO_STR_TITLE_SCENE3D_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCENE3D_VIEW")
119   -#define DALI_DEMO_STR_TITLE_SCENE_LOADER dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCENE_LOADER")
  119 +#define DALI_DEMO_STR_TITLE_SCENE3D dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCENE3D")
120 120 #define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI")
121 121 #define DALI_DEMO_STR_TITLE_SCROLL_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_SCROLL_VIEW")
122 122 #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 &quot;C&quot;
228 228 #define DALI_DEMO_STR_TITLE_RENDERING_RADIAL_PROGRESS "Radial Progress"
229 229 #define DALI_DEMO_STR_TITLE_RENDERER_STENCIL "Renderer Stencils"
230 230 #define DALI_DEMO_STR_TITLE_SCENE3D_VIEW "Scene3D View glTF"
231   -#define DALI_DEMO_STR_TITLE_SCENE_LOADER "Scene Loader"
  231 +#define DALI_DEMO_STR_TITLE_SCENE3D "Scene3D"
232 232 #define DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI "Script Based UI"
233 233 #define DALI_DEMO_STR_TITLE_SCROLL_VIEW "Scroll View"
234 234 #define DALI_DEMO_STR_TITLE_SIMPLE_SCROLL_VIEW "Simple Scroll View"
... ...