Peter M. Groen / dali-demo

Commit b9aeca68e82975b574420bee1fd660f4c228e56c

Authored by David Steele
Committed by Gerrit Code Review
2 parents 75e58c40 647c202f

Merge "Use dali-scene3d.h instead of partial includes" into devel/master

Inline Side-by-side
Showing 1 changed file with 2 additions and 5 deletions
examples/scene3d-model/scene3d-model-example.cpp
  View file @b9aeca6
1 /* 1 /*
2 - * Copyright (c) 2022 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2023 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 * 15 *
16 */ 16 */
17 17
  18 +#include <dali-scene3d/dali-scene3d.h>
18 #include <dali-toolkit/dali-toolkit.h> 19 #include <dali-toolkit/dali-toolkit.h>
19 #include <dali/dali.h> 20 #include <dali/dali.h>
20 #include <dali/devel-api/adaptor-framework/file-loader.h> 21 #include <dali/devel-api/adaptor-framework/file-loader.h>
@@ -24,9 +25,6 @@ @@ -24,9 +25,6 @@
24 #include <dali/public-api/actors/camera-actor.h> 25 #include <dali/public-api/actors/camera-actor.h>
25 #include <cstring> 26 #include <cstring>
26 27
27 -#include <dali-scene3d/public-api/controls/model/model.h>  
28 -#include <dali-scene3d/public-api/loader/environment-map-loader.h>  
29 -  
30 using namespace Dali; 28 using namespace Dali;
31 using namespace Dali::Toolkit; 29 using namespace Dali::Toolkit;
32 30
@@ -43,7 +41,6 @@ using namespace Dali::Toolkit; @@ -43,7 +41,6 @@ using namespace Dali::Toolkit;
43 41
44 namespace 42 namespace
45 { 43 {
46 -  
47 static constexpr int32_t NUM_OF_GLTF_MODELS = 7; 44 static constexpr int32_t NUM_OF_GLTF_MODELS = 7;
48 45
49 const char* gltf_list[7] = 46 const char* gltf_list[7] =