Merge "Update Scene3D demo after Scene3D Loader API change" into devel/master

[platform/core/uifw/dali-demo.git] / examples / scene3d / scene3d-example.cpp

diff --git a/examples/scene3d/scene3d-example.cpp b/examples/scene3d/scene3d-example.cpp
index d6f995b..8de8503 100644 (file)
--- a/examples/scene3d/scene3d-example.cpp
+++ b/examples/scene3d/scene3d-example.cpp
@@ -125,41 +125,6 @@ Actor CreateErrorMessage(std::string msg)
   return label;\r
 }\r
 \r
-void ConfigureCamera(const CameraParameters& params, CameraActor camera)\r
-{\r
-  if(params.isPerspective)\r
-  {\r
-    camera.SetProjectionMode(Camera::PERSPECTIVE_PROJECTION);\r
-    camera.SetNearClippingPlane(params.zNear);\r
-    camera.SetFarClippingPlane(params.zFar);\r
-    camera.SetFieldOfView(Radian(Degree(params.yFov)));\r
-  }\r
-  else\r
-  {\r
-    camera.SetProjectionMode(Camera::ORTHOGRAPHIC_PROJECTION);\r
-    camera.SetOrthographicProjection(params.orthographicSize.x,\r
-                                     params.orthographicSize.y,\r
-                                     params.orthographicSize.z,\r
-                                     params.orthographicSize.w,\r
-                                     params.zNear,\r
-                                     params.zFar);\r
-  }\r
-\r
-  // model\r
-  Vector3    camTranslation;\r
-  Vector3    camScale;\r
-  Quaternion camOrientation;\r
-  params.CalculateTransformComponents(camTranslation, camOrientation, camScale);\r
-\r
-  SetActorCentered(camera);\r
-  camera.SetInvertYAxis(true);\r
-  camera.SetProperty(Actor::Property::POSITION, camTranslation);\r
-  camera.SetProperty(Actor::Property::ORIENTATION, camOrientation);\r
-  camera.SetProperty(Actor::Property::SCALE, camScale);\r
-\r
-  camOrientation.Conjugate();\r
-}\r
-\r
 void ConfigureBlendShapeShaders(ResourceBundle& resources, const SceneDefinition& scene, Actor root, std::vector<BlendshapeShaderConfigurationRequest>&& requests)\r
 {\r
   std::vector<std::string> errors;\r
@@ -232,7 +197,8 @@ Actor LoadScene(std::string sceneName, CameraActor camera, std::vector<Animation
     cameraParameters.push_back(CameraParameters());\r
     cameraParameters[0].matrix.SetTranslation(CAMERA_DEFAULT_POSITION);\r
   }\r
-  ConfigureCamera(cameraParameters[0], camera);\r
+  cameraParameters[0].ConfigureCamera(camera);\r
+  SetActorCentered(camera);\r
 \r
   ViewProjection viewProjection = cameraParameters[0].GetViewProjection();\r
   Transforms     xforms{\r