X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Factors%2Fcamera-actor.cpp;h=fa8f08c3a98719b8568cd6e07aff93259164d95c;hb=0b501ba800a263b97d99adf224fc42d0c2aa8b37;hp=106a6c5ff374ad60b16c2e8a68d7e07bbbe8f6f3;hpb=7dcb0a38005dd8c6d71e466c1ea0ec4d7d57239f;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/public-api/actors/camera-actor.cpp b/dali/public-api/actors/camera-actor.cpp index 106a6c5..fa8f08c 100644 --- a/dali/public-api/actors/camera-actor.cpp +++ b/dali/public-api/actors/camera-actor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2023 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,18 +23,23 @@ namespace Dali { - CameraActor CameraActor::New() { - Internal::CameraActorPtr internal = Internal::CameraActor::New( Size::ZERO ); + Internal::CameraActorPtr internal = Internal::CameraActor::New(Size::ZERO); return CameraActor(internal.Get()); } +CameraActor CameraActor::New(const Size& size) +{ + Internal::CameraActorPtr internal = Internal::CameraActor::New(size); + + return CameraActor(internal.Get()); +} -CameraActor CameraActor::New( const Size& size ) +CameraActor CameraActor::New3DCamera() { - Internal::CameraActorPtr internal = Internal::CameraActor::New( size ); + Internal::CameraActorPtr internal = Internal::CameraActor::New(Size::ZERO, true); return CameraActor(internal.Get()); } @@ -44,20 +49,24 @@ CameraActor::CameraActor(Internal::CameraActor* internal) { } -CameraActor CameraActor::DownCast( BaseHandle handle ) +CameraActor CameraActor::DownCast(BaseHandle handle) { - return CameraActor( dynamic_cast(handle.GetObjectPtr()) ); + return CameraActor(dynamic_cast(handle.GetObjectPtr())); } -CameraActor::CameraActor() -{ -} +CameraActor::CameraActor() = default; -CameraActor::~CameraActor() -{ -} +CameraActor::~CameraActor() = default; + +CameraActor::CameraActor(const CameraActor& copy) = default; + +CameraActor& CameraActor::operator=(const CameraActor& rhs) = default; + +CameraActor::CameraActor(CameraActor&& rhs) noexcept = default; -void CameraActor::SetType( Dali::Camera::Type type ) +CameraActor& CameraActor::operator=(CameraActor&& rhs) noexcept = default; + +void CameraActor::SetType(Dali::Camera::Type type) { GetImplementation(*this).SetType(type); } @@ -67,9 +76,9 @@ Dali::Camera::Type CameraActor::GetType() const return GetImplementation(*this).GetType(); } -void CameraActor::SetProjectionMode( Dali::Camera::ProjectionMode mode ) +void CameraActor::SetProjectionMode(Dali::Camera::ProjectionMode mode) { - GetImplementation(*this).SetProjectionMode( mode ); + GetImplementation(*this).SetProjectionMode(mode); } Dali::Camera::ProjectionMode CameraActor::GetProjectionMode() const @@ -77,54 +86,54 @@ Dali::Camera::ProjectionMode CameraActor::GetProjectionMode() const return GetImplementation(*this).GetProjectionMode(); } -void CameraActor::SetFieldOfView( float fieldOfView ) +void CameraActor::SetFieldOfView(float fieldOfView) { GetImplementation(*this).SetFieldOfView(fieldOfView); } -float CameraActor::GetFieldOfView( ) +float CameraActor::GetFieldOfView() { return GetImplementation(*this).GetFieldOfView(); } -void CameraActor::SetAspectRatio( float aspectRatio ) +void CameraActor::SetAspectRatio(float aspectRatio) { GetImplementation(*this).SetAspectRatio(aspectRatio); } -float CameraActor::GetAspectRatio( ) +float CameraActor::GetAspectRatio() { return GetImplementation(*this).GetAspectRatio(); } -void CameraActor::SetNearClippingPlane( float nearClippingPlane ) +void CameraActor::SetNearClippingPlane(float nearClippingPlane) { GetImplementation(*this).SetNearClippingPlane(nearClippingPlane); } -float CameraActor::GetNearClippingPlane( ) +float CameraActor::GetNearClippingPlane() { return GetImplementation(*this).GetNearClippingPlane(); } -void CameraActor::SetFarClippingPlane( float farClippingPlane ) +void CameraActor::SetFarClippingPlane(float farClippingPlane) { GetImplementation(*this).SetFarClippingPlane(farClippingPlane); } -float CameraActor::GetFarClippingPlane( ) +float CameraActor::GetFarClippingPlane() { return GetImplementation(*this).GetFarClippingPlane(); } -void CameraActor::SetTargetPosition( const Vector3& targetPosition ) +void CameraActor::SetTargetPosition(const Vector3& targetPosition) { - GetImplementation(*this).SetTargetPosition(targetPosition); + GetImplementation(*this).SetTarget(targetPosition); } Vector3 CameraActor::GetTargetPosition() const { - return GetImplementation(*this).GetTargetPosition(); + return GetImplementation(*this).GetTarget(); } void CameraActor::SetInvertYAxis(bool invertYAxis) @@ -137,19 +146,14 @@ bool CameraActor::GetInvertYAxis() return GetImplementation(*this).GetInvertYAxis(); } -void CameraActor::SetPerspectiveProjection( const Size& size ) -{ - GetImplementation(*this).SetPerspectiveProjection( size ); -} - -void CameraActor::SetOrthographicProjection( const Vector2& size ) +void CameraActor::SetPerspectiveProjection(const Size& size) { - GetImplementation(*this).SetOrthographicProjection( size ); + GetImplementation(*this).SetPerspectiveProjection(size); } -void CameraActor::SetOrthographicProjection( float left, float right, float top, float bottom, float near, float far ) +void CameraActor::SetOrthographicProjection(const Size& size) { - GetImplementation(*this).SetOrthographicProjection( left, right, top, bottom, near, far ); + GetImplementation(*this).SetOrthographicProjection(size); } } // namespace Dali