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
[dali_1.9.29] Merge branch 'devel/master'
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
animation
/
path.cpp
diff --git
a/dali/public-api/animation/path.cpp
b/dali/public-api/animation/path.cpp
index
4b868bd
..
f16b7ba
100644
(file)
--- a/
dali/public-api/animation/path.cpp
+++ b/
dali/public-api/animation/path.cpp
@@
-16,23
+16,22
@@
*/
// CLASS HEADER
*/
// CLASS HEADER
-#include <dali/public-api/animation/path.h>
#include <dali/internal/event/animation/path-impl.h>
#include <dali/internal/event/animation/path-impl.h>
+#include <dali/public-api/animation/path.h>
// INTERNAL INCLUDES
namespace Dali
{
// INTERNAL INCLUDES
namespace Dali
{
-
Path Path::New()
{
Internal::Path* internal = Internal::Path::New();
return Path(internal);
}
Path Path::New()
{
Internal::Path* internal = Internal::Path::New();
return Path(internal);
}
-Path Path::DownCast(
BaseHandle handle
)
+Path Path::DownCast(
BaseHandle handle
)
{
{
- return Path(
dynamic_cast<Dali::Internal::Path*>(handle.GetObjectPtr())
);
+ return Path(
dynamic_cast<Dali::Internal::Path*>(handle.GetObjectPtr())
);
}
Path::Path()
}
Path::Path()
@@
-52,39
+51,38
@@
Path::Path(Internal::Path* internal)
Path& Path::operator=(const Path& rhs) = default;
Path& Path::operator=(const Path& rhs) = default;
-Path::Path(
Path&& rhs
) = default;
+Path::Path(
Path&& rhs
) = default;
-Path& Path::operator=(
Path&& rhs
) = default;
+Path& Path::operator=(
Path&& rhs
) = default;
-void Path::AddPoint(const Vector3& point
)
+void Path::AddPoint(const Vector3& point)
{
{
- GetImplementation(*this).AddPoint(
point
);
+ GetImplementation(*this).AddPoint(
point
);
}
}
-void Path::AddControlPoint(const Vector3& point
)
+void Path::AddControlPoint(const Vector3& point)
{
{
- GetImplementation(*this).AddControlPoint(
point
);
+ GetImplementation(*this).AddControlPoint(
point
);
}
}
-void Path::GenerateControlPoints(
float curvature
)
+void Path::GenerateControlPoints(
float curvature
)
{
{
- GetImplementation(*this).GenerateControlPoints(
curvature
);
+ GetImplementation(*this).GenerateControlPoints(
curvature
);
}
}
-
-void Path::Sample( float progress, Vector3& position, Vector3& tangent ) const
+void Path::Sample(float progress, Vector3& position, Vector3& tangent) const
{
{
- GetImplementation(*this).Sample(
progress, position, tangent
);
+ GetImplementation(*this).Sample(
progress, position, tangent
);
}
}
-Vector3& Path::GetPoint(
size_t index
)
+Vector3& Path::GetPoint(
size_t index
)
{
{
- return GetImplementation(*this).GetPoint(
static_cast<uint32_t>( index )
);
+ return GetImplementation(*this).GetPoint(
static_cast<uint32_t>(index)
);
}
}
-Vector3& Path::GetControlPoint(
size_t index
)
+Vector3& Path::GetControlPoint(
size_t index
)
{
{
- return GetImplementation(*this).GetControlPoint(
static_cast<uint32_t>( index )
);
+ return GetImplementation(*this).GetControlPoint(
static_cast<uint32_t>(index)
);
}
size_t Path::GetPointCount() const
}
size_t Path::GetPointCount() const
@@
-92,4
+90,4
@@
size_t Path::GetPointCount() const
return GetImplementation(*this).GetPointCount();
}
return GetImplementation(*this).GetPointCount();
}
-} // Dali
+} //
namespace
Dali