Revert "[Tizen] To do not reset camera properties when OnScene"

This reverts commit da9065811181b0b80265885749176c1ff40bc1c3.

diff --git a/dali/internal/event/actors/camera-actor-impl.cpp b/dali/internal/event/actors/camera-actor-impl.cpp
index 3e2c899..d69462a 100644 (file)
--- a/dali/internal/event/actors/camera-actor-impl.cpp
+++ b/dali/internal/event/actors/camera-actor-impl.cpp
@@ -47,7 +47,7 @@ namespace
 // clang-format off
 DALI_PROPERTY_TABLE_BEGIN
 DALI_PROPERTY( "type",                   STRING,   true,    false,   true,   Dali::CameraActor::Property::TYPE                  )
-DALI_PROPERTY( "projectionMode",         INTEGER,  true,    false,   true,   Dali::CameraActor::Property::PROJECTION_MODE       )
+DALI_PROPERTY( "projectionMode",         STRING,   true,    false,   true,   Dali::CameraActor::Property::PROJECTION_MODE       )
 DALI_PROPERTY( "fieldOfView",            FLOAT,    true,    false,   true,   Dali::CameraActor::Property::FIELD_OF_VIEW         )
 DALI_PROPERTY( "aspectRatio",            FLOAT,    true,    false,   true,   Dali::CameraActor::Property::ASPECT_RATIO          )
 DALI_PROPERTY( "nearPlaneDistance",      FLOAT,    true,    false,   true,   Dali::CameraActor::Property::NEAR_PLANE_DISTANCE   )
@@ -199,7 +199,7 @@ void CameraActor::OnSceneConnectionInternal()
 {
   // If the canvas size has not been set, then use the size of the scene to which we've been added
   // in order to set up the current projection
-  if(!mPropertyChanged && ((mCanvasSize.width < Math::MACHINE_EPSILON_1000) || (mCanvasSize.height < Math::MACHINE_EPSILON_1000)))
+  if((mCanvasSize.width < Math::MACHINE_EPSILON_1000) || (mCanvasSize.height < Math::MACHINE_EPSILON_1000))
   {
     if(mProjectionMode == Dali::Camera::ORTHOGRAPHIC_PROJECTION)
     {
@@ -287,10 +287,6 @@ void CameraActor::SetAspectRatio(float aspectRatio)
 {
   if(!Equals(aspectRatio, mAspectRatio))
   {
-    {
-      // This will be removed after CameraActor refactoring.
-      mPropertyChanged = true;
-    }
     mAspectRatio = aspectRatio;
 
     // sceneObject is being used in a separate thread; queue a message to set
@@ -592,8 +588,15 @@ void CameraActor::SetDefaultProperty(Property::Index index, const Property::Valu
       }
       case Dali::CameraActor::Property::PROJECTION_MODE:
       {
-        Dali::Camera::ProjectionMode projectionMode = Dali::Camera::ProjectionMode(propertyValue.Get<int>());
-        SetProjectionMode(projectionMode);
+        std::string s(propertyValue.Get<std::string>());
+        if(s == "PERSPECTIVE_PROJECTION")
+        {
+          SetProjectionMode(Dali::Camera::PERSPECTIVE_PROJECTION);
+        }
+        else if(s == "ORTHOGRAPHIC_PROJECTION")
+        {
+          SetProjectionMode(Dali::Camera::ORTHOGRAPHIC_PROJECTION);
+        }
         break;
       }
       case Dali::CameraActor::Property::FIELD_OF_VIEW:
@@ -697,7 +700,14 @@ Property::Value CameraActor::GetDefaultProperty(Property::Index index) const
       }
       case Dali::CameraActor::Property::PROJECTION_MODE:
       {
-        ret = mProjectionMode;
+        if(Dali::Camera::PERSPECTIVE_PROJECTION == mProjectionMode)
+        {
+          ret = "PERSPECTIVE_PROJECTION";
+        }
+        else if(Dali::Camera::ORTHOGRAPHIC_PROJECTION == mProjectionMode)
+        {
+          ret = "ORTHOGRAPHIC_PROJECTION";
+        }
         break;
       }
       case Dali::CameraActor::Property::FIELD_OF_VIEW:

diff --git a/dali/internal/event/actors/camera-actor-impl.h b/dali/internal/event/actors/camera-actor-impl.h
index fe012da..6d0bb17 100644 (file)
--- a/dali/internal/event/actors/camera-actor-impl.h
+++ b/dali/internal/event/actors/camera-actor-impl.h
@@ -267,7 +267,6 @@ private:                                  // Data
   float                        mTopClippingPlane;
   float                        mBottomClippingPlane;
   bool                         mInvertYAxis;
-  bool                         mPropertyChanged{false}; // This variable will be removed after CameraActor refactoring.
 };
 
 } // namespace Internal