projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add transition headers in dali-toolkit.h" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
transition-effects
/
cube-transition-effect.cpp
diff --git
a/dali-toolkit/devel-api/transition-effects/cube-transition-effect.cpp
b/dali-toolkit/devel-api/transition-effects/cube-transition-effect.cpp
index
6ba444e
..
01f7dd8
100644
(file)
--- a/
dali-toolkit/devel-api/transition-effects/cube-transition-effect.cpp
+++ b/
dali-toolkit/devel-api/transition-effects/cube-transition-effect.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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,10
+23,8
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
CubeTransitionEffect::CubeTransitionEffect()
{
}
CubeTransitionEffect::CubeTransitionEffect()
{
}
@@
-35,19
+33,25
@@
CubeTransitionEffect::~CubeTransitionEffect()
{
}
{
}
-CubeTransitionEffect::CubeTransitionEffect(Internal::CubeTransitionEffect* impl)
-: BaseHandle(impl)
+CubeTransitionEffect::CubeTransitionEffect(Internal::CubeTransitionEffect& implementation)
+: Control(implementation)
+{
+}
+
+CubeTransitionEffect::CubeTransitionEffect(Dali::Internal::CustomActor* internal)
+: Control(internal)
{
{
+ VerifyCustomActorPointer<Internal::CubeTransitionEffect>(internal);
}
}
-CubeTransitionEffect CubeTransitionEffect::DownCast(
BaseHandle handle
)
+CubeTransitionEffect CubeTransitionEffect::DownCast(
BaseHandle handle
)
{
{
- return C
ubeTransitionEffect( dynamic_cast< Dali::Toolkit::Internal::CubeTransitionEffect* >( handle.GetObjectPtr() )
);
+ return C
ontrol::DownCast<CubeTransitionEffect, Internal::CubeTransitionEffect>(handle
);
}
}
-void CubeTransitionEffect::SetTransitionDuration(
float duration
)
+void CubeTransitionEffect::SetTransitionDuration(
float duration
)
{
{
- GetImpl(*this).SetTransitionDuration(
duration
);
+ GetImpl(*this).SetTransitionDuration(
duration
);
}
float CubeTransitionEffect::GetTransitionDuration() const
}
float CubeTransitionEffect::GetTransitionDuration() const
@@
-55,9
+59,9
@@
float CubeTransitionEffect::GetTransitionDuration() const
return GetImpl(*this).GetTransitionDuration();
}
return GetImpl(*this).GetTransitionDuration();
}
-void CubeTransitionEffect::SetCubeDisplacement(
float displacement
)
+void CubeTransitionEffect::SetCubeDisplacement(
float displacement
)
{
{
- GetImpl(*this).SetCubeDisplacement(
displacement
);
+ GetImpl(*this).SetCubeDisplacement(
displacement
);
}
float CubeTransitionEffect::GetCubeDisplacement() const
}
float CubeTransitionEffect::GetCubeDisplacement() const
@@
-65,34
+69,29
@@
float CubeTransitionEffect::GetCubeDisplacement() const
return GetImpl(*this).GetCubeDisplacement();
}
return GetImpl(*this).GetCubeDisplacement();
}
-Actor CubeTransitionEffect::GetRoot()
-{
- return GetImpl(*this).GetRoot();
-}
-
-bool CubeTransitionEffect::IsTransiting()
+bool CubeTransitionEffect::IsTransitioning()
{
{
- return GetImpl(*this).IsTransiting();
+ return GetImpl(*this).IsTransiti
oni
ng();
}
}
-void CubeTransitionEffect::SetCurrent
Image(ImageActor imageActor
)
+void CubeTransitionEffect::SetCurrent
Texture(Texture texture
)
{
{
- GetImpl(*this).SetCurrent
Image( imageActor
);
+ GetImpl(*this).SetCurrent
Texture(texture
);
}
}
-void CubeTransitionEffect::SetTarget
Image(ImageActor imageActor
)
+void CubeTransitionEffect::SetTarget
Texture(Texture texture
)
{
{
- GetImpl(*this).SetTarget
Image( imageActor
);
+ GetImpl(*this).SetTarget
Texture(texture
);
}
}
-void CubeTransitionEffect::StartTransition(
bool toNextImage
)
+void CubeTransitionEffect::StartTransition(
bool toNextImage
)
{
{
- GetImpl(*this).StartTransition(
toNextImage
);
+ GetImpl(*this).StartTransition(
toNextImage
);
}
}
-void CubeTransitionEffect::StartTransition(
Vector2 panPosition, Vector2 panDisplacement
)
+void CubeTransitionEffect::StartTransition(
Vector2 panPosition, Vector2 panDisplacement
)
{
{
- GetImpl(*this).StartTransition(
panPosition, panDisplacement
);
+ GetImpl(*this).StartTransition(
panPosition, panDisplacement
);
}
void CubeTransitionEffect::PauseTransition()
}
void CubeTransitionEffect::PauseTransition()
@@
-112,7
+111,7
@@
void CubeTransitionEffect::StopTransition()
CubeTransitionEffect::TransitionCompletedSignalType& CubeTransitionEffect::TransitionCompletedSignal()
{
CubeTransitionEffect::TransitionCompletedSignalType& CubeTransitionEffect::TransitionCompletedSignal()
{
- return GetImpl(
*this
).TransitionCompletedSignal();
+ return GetImpl(
*this
).TransitionCompletedSignal();
}
} // namespace Toolkit
}
} // namespace Toolkit