X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Frender-tasks%2Fscene-graph-camera.cpp;h=5a4a5292ff99cb18a773e2bf0d5bead6ef128421;hb=df36176f354b67024161a57a1cbb234023772749;hp=c3dc3c5fd5909c286e7bb4b349c93747d347f100;hpb=e5a3eb7636c8b11f9e270bdfb9fe00ef39d33790;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/update/render-tasks/scene-graph-camera.cpp b/dali/internal/update/render-tasks/scene-graph-camera.cpp
index c3dc3c5..5a4a529 100644
--- a/dali/internal/update/render-tasks/scene-graph-camera.cpp
+++ b/dali/internal/update/render-tasks/scene-graph-camera.cpp
@@ -161,8 +161,7 @@ const Vector3 Camera::DEFAULT_TARGET_POSITION( 0.0f, 0.0f, 0.0f );
 Camera::Camera()
 : mUpdateViewFlag( UPDATE_COUNT ),
   mUpdateProjectionFlag( UPDATE_COUNT ),
-  mProjectionRotation( 0 ),
-  mNode( NULL ),
+  mNode( nullptr ),
   mType( DEFAULT_TYPE ),
   mProjectionMode( DEFAULT_MODE ),
   mInvertYAxis( DEFAULT_INVERT_Y_AXIS ),
@@ -177,8 +176,7 @@ Camera::Camera()
   mTargetPosition( DEFAULT_TARGET_POSITION ),
   mViewMatrix(),
   mProjectionMatrix(),
-  mInverseViewProjection( Matrix::IDENTITY ),
-  mFinalProjection( Matrix::IDENTITY )
+  mInverseViewProjection( Matrix::IDENTITY )
 {
 }
 
@@ -196,6 +194,11 @@ void Camera::SetNode( const Node* node )
   mNode = node;
 }
 
+const Node* Camera::GetNode() const
+{
+  return mNode;
+}
+
 void Camera::SetType( Dali::Camera::Type type )
 {
   mType = type;
@@ -267,6 +270,8 @@ void Camera::SetTargetPosition( const Vector3& targetPosition )
   mUpdateViewFlag = UPDATE_COUNT;
 }
 
+
+
 void VectorReflectedByPlane(Vector4 &out, Vector4 &in, Vector4 &plane)
 {
   float d = float(2.0) * plane.Dot(in);
@@ -328,12 +333,6 @@ void Camera::SetReflectByPlane( const Vector4& plane )
   mUpdateViewFlag = UPDATE_COUNT;
 }
 
-void Camera::RotateProjection( int rotationAngle )
-{
-  mProjectionRotation = rotationAngle;
-  mUpdateViewFlag = UPDATE_COUNT;
-}
-
 const Matrix& Camera::GetProjectionMatrix( BufferIndex bufferIndex ) const
 {
   return mProjectionMatrix[ bufferIndex ];
@@ -349,11 +348,6 @@ const Matrix& Camera::GetInverseViewProjectionMatrix( BufferIndex bufferIndex )
   return mInverseViewProjection[ bufferIndex ];
 }
 
-const Matrix& Camera::GetFinalProjectionMatrix( BufferIndex bufferIndex ) const
-{
-  return mFinalProjection[ bufferIndex ];
-}
-
 const PropertyInputImpl* Camera::GetProjectionMatrix() const
 {
   return &mProjectionMatrix;
@@ -663,38 +657,6 @@ uint32_t Camera::UpdateProjection( BufferIndex updateBufferIndex )
       }
 
       mProjectionMatrix.SetDirty( updateBufferIndex );
-
-      Matrix &finalProjection = mFinalProjection[ updateBufferIndex ];
-      finalProjection.SetIdentity();
-
-      Quaternion rotationAngle;
-      switch( mProjectionRotation )
-      {
-        case 90:
-        {
-          rotationAngle = Quaternion( Dali::ANGLE_90, Vector3::ZAXIS );
-          break;
-        }
-        case 180:
-        {
-          rotationAngle = Quaternion( Dali::ANGLE_180, Vector3::ZAXIS );
-          break;
-        }
-        case 270:
-        {
-          rotationAngle = Quaternion( Dali::ANGLE_270, Vector3::ZAXIS );
-          break;
-        }
-        default:
-          rotationAngle = Quaternion( Dali::ANGLE_0, Vector3::ZAXIS );
-          break;
-      }
-
-      Matrix rotation;
-      rotation.SetIdentity();
-      rotation.SetTransformComponents( Vector3( 1.0f, 1.0f, 1.0f ), rotationAngle, Vector3( 0.0f, 0.0f, 0.0f ) );
-
-      Matrix::Multiply( finalProjection, mProjectionMatrix.Get( updateBufferIndex ), rotation );
     }
     --mUpdateProjectionFlag;
   }