projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure BaseHandle class move noexcept (core public-api)
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
actors
/
camera-actor.cpp
diff --git
a/dali/public-api/actors/camera-actor.cpp
b/dali/public-api/actors/camera-actor.cpp
index
e3a0807
..
fa8f08c
100644
(file)
--- a/
dali/public-api/actors/camera-actor.cpp
+++ b/
dali/public-api/actors/camera-actor.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
14
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
23
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.
*
* 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
{
namespace Dali
{
-
CameraActor CameraActor::New()
{
CameraActor CameraActor::New()
{
- Internal::CameraActorPtr internal = Internal::CameraActor::New(
Size::ZERO
);
+ Internal::CameraActorPtr internal = Internal::CameraActor::New(
Size::ZERO
);
return CameraActor(internal.Get());
}
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::New
3DCamera(
)
{
{
- Internal::CameraActorPtr internal = Internal::CameraActor::New(
size
);
+ Internal::CameraActorPtr internal = Internal::CameraActor::New(
Size::ZERO, true
);
return CameraActor(internal.Get());
}
return CameraActor(internal.Get());
}
@@
-44,31
+49,24
@@
CameraActor::CameraActor(Internal::CameraActor* internal)
{
}
{
}
-CameraActor CameraActor::DownCast(
BaseHandle handle
)
+CameraActor CameraActor::DownCast(
BaseHandle handle
)
{
{
- return CameraActor(
dynamic_cast<Dali::Internal::CameraActor*>(handle.GetObjectPtr())
);
+ return CameraActor(
dynamic_cast<Dali::Internal::CameraActor*>(handle.GetObjectPtr())
);
}
}
-CameraActor::CameraActor()
-{
-}
+CameraActor::CameraActor() = default;
-CameraActor::~CameraActor()
-{
-}
+CameraActor::~CameraActor() = default;
-CameraActor::CameraActor(const CameraActor& copy)
-: Actor(copy)
-{
-}
+CameraActor::CameraActor(const CameraActor& copy) = default;
-CameraActor& CameraActor::operator=(const CameraActor& rhs)
-{
- BaseHandle::operator=(rhs);
- return *this;
-}
+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);
}
{
GetImplementation(*this).SetType(type);
}
@@
-78,9
+76,9
@@
Dali::Camera::Type CameraActor::GetType() const
return GetImplementation(*this).GetType();
}
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
}
Dali::Camera::ProjectionMode CameraActor::GetProjectionMode() const
@@
-88,54
+86,54
@@
Dali::Camera::ProjectionMode CameraActor::GetProjectionMode() const
return GetImplementation(*this).GetProjectionMode();
}
return GetImplementation(*this).GetProjectionMode();
}
-void CameraActor::SetFieldOfView(
float fieldOfView
)
+void CameraActor::SetFieldOfView(
float fieldOfView
)
{
GetImplementation(*this).SetFieldOfView(fieldOfView);
}
{
GetImplementation(*this).SetFieldOfView(fieldOfView);
}
-float CameraActor::GetFieldOfView(
)
+float CameraActor::GetFieldOfView()
{
return GetImplementation(*this).GetFieldOfView();
}
{
return GetImplementation(*this).GetFieldOfView();
}
-void CameraActor::SetAspectRatio(
float aspectRatio
)
+void CameraActor::SetAspectRatio(
float aspectRatio
)
{
GetImplementation(*this).SetAspectRatio(aspectRatio);
}
{
GetImplementation(*this).SetAspectRatio(aspectRatio);
}
-float CameraActor::GetAspectRatio(
)
+float CameraActor::GetAspectRatio()
{
return GetImplementation(*this).GetAspectRatio();
}
{
return GetImplementation(*this).GetAspectRatio();
}
-void CameraActor::SetNearClippingPlane(
float nearClippingPlane
)
+void CameraActor::SetNearClippingPlane(
float nearClippingPlane
)
{
GetImplementation(*this).SetNearClippingPlane(nearClippingPlane);
}
{
GetImplementation(*this).SetNearClippingPlane(nearClippingPlane);
}
-float CameraActor::GetNearClippingPlane(
)
+float CameraActor::GetNearClippingPlane()
{
return GetImplementation(*this).GetNearClippingPlane();
}
{
return GetImplementation(*this).GetNearClippingPlane();
}
-void CameraActor::SetFarClippingPlane(
float farClippingPlane
)
+void CameraActor::SetFarClippingPlane(
float farClippingPlane
)
{
GetImplementation(*this).SetFarClippingPlane(farClippingPlane);
}
{
GetImplementation(*this).SetFarClippingPlane(farClippingPlane);
}
-float CameraActor::GetFarClippingPlane(
)
+float CameraActor::GetFarClippingPlane()
{
return GetImplementation(*this).GetFarClippingPlane();
}
{
return GetImplementation(*this).GetFarClippingPlane();
}
-void CameraActor::SetTargetPosition(
const Vector3& targetPosition
)
+void CameraActor::SetTargetPosition(
const Vector3& targetPosition
)
{
{
- GetImplementation(*this).SetTarget
Position
(targetPosition);
+ GetImplementation(*this).SetTarget(targetPosition);
}
Vector3 CameraActor::GetTargetPosition() const
{
}
Vector3 CameraActor::GetTargetPosition() const
{
- return GetImplementation(*this).GetTarget
Position
();
+ return GetImplementation(*this).GetTarget();
}
void CameraActor::SetInvertYAxis(bool invertYAxis)
}
void CameraActor::SetInvertYAxis(bool invertYAxis)
@@
-148,19
+146,14
@@
bool CameraActor::GetInvertYAxis()
return GetImplementation(*this).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).Set
OrthographicProjection( size
);
+ GetImplementation(*this).Set
PerspectiveProjection(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
}
} // namespace Dali