Peter M. Groen / dali-demo

Commit 6db6fafd29234b470768dc96676ee6127d097d0d

Authored by seungho
1 parent ea15277a

Fix Svace Issue about initialization of member variable 

 - scene3d-view-example

Change-Id: I0d5ec4383fb23bf6a15dca73cd5c90e2e1d29ada
Signed-off-by: seungho <sbsh.baek@samsung.com>
Inline Side-by-side
Showing 1 changed file with 11 additions and 13 deletions
examples/scene3d-view/scene3d-view-example.cpp
  View file @6db6faf
@@ -16,14 +16,14 @@ @@ -16,14 +16,14 @@
16 */ 16 */
17 17
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
  19 +#include <dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.h>
19 #include <dali/dali.h> 20 #include <dali/dali.h>
20 -#include <dali/integration-api/debug.h>  
21 -#include <dali/public-api/actors/camera-actor.h>  
22 #include <dali/devel-api/adaptor-framework/file-loader.h> 21 #include <dali/devel-api/adaptor-framework/file-loader.h>
  22 +#include <dali/devel-api/adaptor-framework/file-stream.h>
23 #include <dali/devel-api/adaptor-framework/image-loading.h> 23 #include <dali/devel-api/adaptor-framework/image-loading.h>
  24 +#include <dali/integration-api/debug.h>
  25 +#include <dali/public-api/actors/camera-actor.h>
24 #include <cstring> 26 #include <cstring>
25 -#include <dali-toolkit/devel-api/controls/scene3d-view/scene3d-view.h>  
26 -#include <dali/devel-api/adaptor-framework/file-stream.h>  
27 27
28 using namespace Dali; 28 using namespace Dali;
29 using namespace Dali::Toolkit; 29 using namespace Dali::Toolkit;
@@ -41,7 +41,6 @@ using namespace Dali::Toolkit; @@ -41,7 +41,6 @@ using namespace Dali::Toolkit;
41 41
42 namespace 42 namespace
43 { 43 {
44 -  
45 enum GLTF_MODEL_LIST 44 enum GLTF_MODEL_LIST
46 { 45 {
47 GLTF_ANIMATED_BOX = 0, 46 GLTF_ANIMATED_BOX = 0,
@@ -346,7 +345,6 @@ public: @@ -346,7 +345,6 @@ public:
346 {Vector3(-1.0f, -1.0f, 1.0f)}, 345 {Vector3(-1.0f, -1.0f, 1.0f)},
347 {Vector3(1.0f, -1.0f, 1.0f)}}; 346 {Vector3(1.0f, -1.0f, 1.0f)}};
348 347
349 -  
350 const std::string currentVShaderFile(VERTEX_SHADER_URL); 348 const std::string currentVShaderFile(VERTEX_SHADER_URL);
351 const std::string currentFShaderFile(FRAGMENT_SHADER_URL); 349 const std::string currentFShaderFile(FRAGMENT_SHADER_URL);
352 350
@@ -448,10 +446,10 @@ public: @@ -448,10 +446,10 @@ public:
448 uint32_t xOffset = cubeMap_index_x[faceIndex] * faceSize; 446 uint32_t xOffset = cubeMap_index_x[faceIndex] * faceSize;
449 uint32_t yOffset = cubeMap_index_y[faceIndex] * faceSize; 447 uint32_t yOffset = cubeMap_index_y[faceIndex] * faceSize;
450 448
451 - uint8_t* tempImageBuffer = CropBuffer(imageBuffer, bytesPerPixel, imageWidth, imageHeight, xOffset, yOffset, faceSize, faceSize); 449 + uint8_t* tempImageBuffer = CropBuffer(imageBuffer, bytesPerPixel, imageWidth, imageHeight, xOffset, yOffset, faceSize, faceSize);
452 if(tempImageBuffer) 450 if(tempImageBuffer)
453 { 451 {
454 - PixelData pixelData = PixelData::New(tempImageBuffer, faceSize * faceSize * bytesPerPixel, faceSize, faceSize, pixelBuffer.GetPixelFormat(), PixelData::FREE); 452 + PixelData pixelData = PixelData::New(tempImageBuffer, faceSize * faceSize * bytesPerPixel, faceSize, faceSize, pixelBuffer.GetPixelFormat(), PixelData::FREE);
455 texture.Upload(pixelData, CubeMapLayer::POSITIVE_X + faceIndex, 0, 0, 0, faceSize, faceSize); 453 texture.Upload(pixelData, CubeMapLayer::POSITIVE_X + faceIndex, 0, 0, 0, faceSize, faceSize);
456 } 454 }
457 } 455 }
@@ -481,7 +479,7 @@ public: @@ -481,7 +479,7 @@ public:
481 mSkyboxActor.SetProperty(Dali::Actor::Property::POSITION, mCameraPosition); 479 mSkyboxActor.SetProperty(Dali::Actor::Property::POSITION, mCameraPosition);
482 SetAnimation(); 480 SetAnimation();
483 mAnimationStop = false; 481 mAnimationStop = false;
484 - mWheelDelta = 1.0f; 482 + mWheelDelta = 1.0f;
485 } 483 }
486 484
487 /** 485 /**
@@ -619,20 +617,20 @@ private: @@ -619,20 +617,20 @@ private:
619 Actor mSkyboxActor; 617 Actor mSkyboxActor;
620 618
621 Animation mAnimation; 619 Animation mAnimation;
622 - bool mProcess; 620 + bool mProcess{false};
623 bool mAnimationStop; 621 bool mAnimationStop;
624 622
625 Timer mDoubleTapTime; 623 Timer mDoubleTapTime;
626 - bool mDoubleTap; 624 + bool mDoubleTap{false};
627 625
628 float mWheelDelta{1.0f}; 626 float mWheelDelta{1.0f};
629 627
630 - int32_t mCurrentGlTF; 628 + int32_t mCurrentGlTF{0};
631 }; 629 };
632 630
633 int32_t DALI_EXPORT_API main(int32_t argc, char** argv) 631 int32_t DALI_EXPORT_API main(int32_t argc, char** argv)
634 { 632 {
635 - Application application = Application::New(&argc, &argv); 633 + Application application = Application::New(&argc, &argv);
636 Scene3dViewController test(application); 634 Scene3dViewController test(application);
637 application.MainLoop(); 635 application.MainLoop();
638 return 0; 636 return 0;