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
Merge "Ensure BaseHandle class move noexcept (core public-api)" into devel/master
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
rendering
/
geometry.cpp
diff --git
a/dali/public-api/rendering/geometry.cpp
b/dali/public-api/rendering/geometry.cpp
index
b1d0766
..
1316497
100644
(file)
--- a/
dali/public-api/rendering/geometry.cpp
+++ b/
dali/public-api/rendering/geometry.cpp
@@
-16,45
+16,40
@@
*/
// CLASS HEADER
*/
// CLASS HEADER
-#include <dali/public-api/rendering/geometry.h>
// Dali::Geometry
+#include <dali/public-api/rendering/geometry.h> // Dali::Geometry
// INTERNAL INCLUDES
#include <dali/internal/event/rendering/geometry-impl.h> // Dali::Internal::Geometry
namespace Dali
{
// INTERNAL INCLUDES
#include <dali/internal/event/rendering/geometry-impl.h> // Dali::Internal::Geometry
namespace Dali
{
-
Geometry Geometry::New()
{
Internal::GeometryPtr geometry = Internal::Geometry::New();
Geometry Geometry::New()
{
Internal::GeometryPtr geometry = Internal::Geometry::New();
- return Geometry(
geometry.Get()
);
+ return Geometry(
geometry.Get()
);
}
}
-Geometry::Geometry()
-{
-}
+Geometry::Geometry() = default;
-Geometry::~Geometry()
-{
-}
+Geometry::~Geometry() = default;
-Geometry::Geometry(
const Geometry& handle
) = default;
+Geometry::Geometry(
const Geometry& handle
) = default;
-Geometry Geometry::DownCast(
BaseHandle handle
)
+Geometry Geometry::DownCast(
BaseHandle handle
)
{
{
- return Geometry(
dynamic_cast<Dali::Internal::Geometry*>(handle.GetObjectPtr()));
+ return Geometry(dynamic_cast<Dali::Internal::Geometry*>(handle.GetObjectPtr()));
}
}
-Geometry& Geometry::operator=(
const Geometry& handle
) = default;
+Geometry& Geometry::operator=(
const Geometry& handle
) = default;
-Geometry::Geometry(
Geometry&& rhs ) =
default;
+Geometry::Geometry(
Geometry&& rhs) noexcept =
default;
-Geometry& Geometry::operator=(
Geometry&& rhs ) =
default;
+Geometry& Geometry::operator=(
Geometry&& rhs) noexcept =
default;
-std::size_t Geometry::AddVertexBuffer(
PropertyBuffer& vertexBuffer
)
+std::size_t Geometry::AddVertexBuffer(
VertexBuffer& vertexBuffer
)
{
{
- DALI_ASSERT_ALWAYS(
vertexBuffer && "VertexBuffer is not initialized ");
- return GetImplementation(*this).AddVertexBuffer(
GetImplementation( vertexBuffer )
);
+ DALI_ASSERT_ALWAYS(vertexBuffer && "VertexBuffer is not initialized ");
+ return GetImplementation(*this).AddVertexBuffer(
GetImplementation(vertexBuffer)
);
}
std::size_t Geometry::GetNumberOfVertexBuffers() const
}
std::size_t Geometry::GetNumberOfVertexBuffers() const
@@
-62,19
+57,24
@@
std::size_t Geometry::GetNumberOfVertexBuffers() const
return GetImplementation(*this).GetNumberOfVertexBuffers();
}
return GetImplementation(*this).GetNumberOfVertexBuffers();
}
-void Geometry::RemoveVertexBuffer( std::size_t index )
+void Geometry::RemoveVertexBuffer(std::size_t index)
+{
+ GetImplementation(*this).RemoveVertexBuffer(static_cast<uint32_t>(index));
+}
+
+void Geometry::SetIndexBuffer(const uint16_t* indices, size_t count)
{
{
- GetImplementation(*this).
RemoveVertexBuffer( static_cast<uint32_t>( index )
);
+ GetImplementation(*this).
SetIndexBuffer(indices, static_cast<uint32_t>(count)
);
}
}
-void Geometry::SetIndexBuffer(
const uint16_t* indices, size_t count
)
+void Geometry::SetIndexBuffer(
const uint32_t* indices, size_t count
)
{
{
- GetImplementation(*this).SetIndexBuffer(
indices, static_cast<uint32_t>( count )
);
+ GetImplementation(*this).SetIndexBuffer(
indices, static_cast<uint32_t>(count)
);
}
}
-void Geometry::SetType(
Type geometryType
)
+void Geometry::SetType(
Type geometryType
)
{
{
- GetImplementation(*this).SetType(
geometryType
);
+ GetImplementation(*this).SetType(
geometryType
);
}
Geometry::Type Geometry::GetType() const
}
Geometry::Type Geometry::GetType() const
@@
-82,8
+82,8
@@
Geometry::Type Geometry::GetType() const
return GetImplementation(*this).GetType();
}
return GetImplementation(*this).GetType();
}
-Geometry::Geometry(
Internal::Geometry* pointer
)
-: BaseHandle(
pointer
)
+Geometry::Geometry(
Internal::Geometry* pointer
)
+: BaseHandle(
pointer
)
{
}
{
}