Commit 7d492b4e79e048551fe185fdaf4ed2d695a55146
1 parent
6ef0038f
Add glb in scene3d-model-example
Change-Id: I68225fe93327a3d15767b4b58122c2c2e1b9efe1 Signed-off-by: seungho baek <sbsh.baek@samsung.com>
Showing
3 changed files
with
5 additions
and
5 deletions
examples/scene3d-model/scene3d-model-example.cpp
| @@ -49,11 +49,11 @@ static constexpr int32_t NUM_OF_GLTF_MODELS = 7; | @@ -49,11 +49,11 @@ static constexpr int32_t NUM_OF_GLTF_MODELS = 7; | ||
| 49 | const char* gltf_list[7] = | 49 | const char* gltf_list[7] = |
| 50 | { | 50 | { |
| 51 | /** | 51 | /** |
| 52 | - * For the BoxAnimated.gltf and its Assets | 52 | + * For the BoxAnimated.glb |
| 53 | * Donated by Cesium for glTF testing. | 53 | * Donated by Cesium for glTF testing. |
| 54 | * Take from https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/BoxAnimated | 54 | * Take from https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/BoxAnimated |
| 55 | */ | 55 | */ |
| 56 | - "BoxAnimated.gltf", | 56 | + "BoxAnimated.glb", |
| 57 | /** | 57 | /** |
| 58 | * For the Lantern.gltf and its Assets | 58 | * For the Lantern.gltf and its Assets |
| 59 | * Donated by Microsoft for glTF testing | 59 | * Donated by Microsoft for glTF testing |
| @@ -69,12 +69,12 @@ const char* gltf_list[7] = | @@ -69,12 +69,12 @@ const char* gltf_list[7] = | ||
| 69 | */ | 69 | */ |
| 70 | "BoomBox.gltf", | 70 | "BoomBox.gltf", |
| 71 | /** | 71 | /** |
| 72 | - * For the DamagedHelmet.gltf and its Assets | 72 | + * For the DamagedHelmet.glb |
| 73 | * Battle Damaged Sci-fi Helmet - PBR by theblueturtle_, published under a | 73 | * Battle Damaged Sci-fi Helmet - PBR by theblueturtle_, published under a |
| 74 | * Creative Commons Attribution-NonCommercial license | 74 | * Creative Commons Attribution-NonCommercial license |
| 75 | * https://sketchfab.com/models/b81008d513954189a063ff901f7abfe4 | 75 | * https://sketchfab.com/models/b81008d513954189a063ff901f7abfe4 |
| 76 | */ | 76 | */ |
| 77 | - "DamagedHelmet.gltf", | 77 | + "DamagedHelmet.glb", |
| 78 | /** | 78 | /** |
| 79 | * For the microphone.gltf and its Assets | 79 | * For the microphone.gltf and its Assets |
| 80 | * Microphone GXL 066 Bafhcteks by Gistold, published under a | 80 | * Microphone GXL 066 Bafhcteks by Gistold, published under a |
| @@ -295,7 +295,7 @@ public: | @@ -295,7 +295,7 @@ public: | ||
| 295 | mReadyToLoad = true; | 295 | mReadyToLoad = true; |
| 296 | if(mModel.GetAnimationCount() > 0) | 296 | if(mModel.GetAnimationCount() > 0) |
| 297 | { | 297 | { |
| 298 | - Animation animation = (mCurrentGlTF == 0u) ? mModel.GetAnimation(0u) : mModel.GetAnimation("idleToSquatClip_0"); | 298 | + Animation animation = (std::string("exercise_model.dli") == gltf_list[mCurrentGlTF]) ? mModel.GetAnimation("idleToSquatClip_0") : mModel.GetAnimation(0u); |
| 299 | animation.Play(); | 299 | animation.Play(); |
| 300 | animation.SetLoopCount(0); | 300 | animation.SetLoopCount(0); |
| 301 | } | 301 | } |
resources/models/BoxAnimated.glb
0 → 100644
No preview for this file type
resources/models/DamagedHelmet.glb
0 → 100644
No preview for this file type