X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Frender-tasks%2Fscene-graph-camera.cpp;h=f6ecce5a4a8b5d8c60d850ed225c3926037b26de;hb=b6baf315bc1b7c7f57e32e5efe81f655691ffaca;hp=7aca9cbe66e19b31ca03e167fa37555897ae67aa;hpb=38e4fc0d4a151428c20ee7df2a673c2286fb2106;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 7aca9cb..f6ecce5 100644 --- a/dali/internal/update/render-tasks/scene-graph-camera.cpp +++ b/dali/internal/update/render-tasks/scene-graph-camera.cpp @@ -157,7 +157,6 @@ const Vector3 Camera::DEFAULT_TARGET_POSITION( 0.0f, 0.0f, 0.0f ); Camera::Camera() : mUpdateViewFlag( UPDATE_COUNT ), mUpdateProjectionFlag( UPDATE_COUNT ), - mProjectionRotation( 0 ), mNode( NULL ), mType( DEFAULT_TYPE ), mProjectionMode( DEFAULT_MODE ), @@ -173,8 +172,7 @@ Camera::Camera() mTargetPosition( DEFAULT_TARGET_POSITION ), mViewMatrix(), mProjectionMatrix(), - mInverseViewProjection( Matrix::IDENTITY ), - mFinalProjection( Matrix::IDENTITY ) + mInverseViewProjection( Matrix::IDENTITY ) { } @@ -263,12 +261,6 @@ void Camera::SetTargetPosition( const Vector3& targetPosition ) mUpdateViewFlag = UPDATE_COUNT; } -void Camera::RotateProjection( int rotationAngle ) -{ - mProjectionRotation = rotationAngle; - mUpdateViewFlag = UPDATE_COUNT; -} - const Matrix& Camera::GetProjectionMatrix( BufferIndex bufferIndex ) const { return mProjectionMatrix[ bufferIndex ]; @@ -284,11 +276,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; @@ -521,38 +508,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; }