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 22f0793..1316497 100644 (file)
--- a/dali/public-api/rendering/geometry.cpp
+++ b/dali/public-api/rendering/geometry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -16,48 +16,40 @@
  */
 
 // 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
 {
-
 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 )
-: BaseHandle( handle )
-{
-}
+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 )
-{
-  BaseHandle::operator=( handle );
-  return *this;
-}
+Geometry& Geometry::operator=(const Geometry& handle) = default;
+
+Geometry::Geometry(Geometry&& rhs) noexcept = 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
@@ -65,28 +57,33 @@ std::size_t Geometry::GetNumberOfVertexBuffers() const
   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( index );
+  GetImplementation(*this).SetIndexBuffer(indices, static_cast<uint32_t>(count));
 }
 
-void Geometry::SetIndexBuffer( const unsigned short* indices, size_t count )
+void Geometry::SetIndexBuffer(const uint32_t* indices, size_t count)
 {
-  GetImplementation(*this).SetIndexBuffer( indices, count );
+  GetImplementation(*this).SetIndexBuffer(indices, static_cast<uint32_t>(count));
 }
 
-void Geometry::SetGeometryType( GeometryType geometryType )
+void Geometry::SetType(Type geometryType)
 {
-  GetImplementation(*this).SetGeometryType( geometryType );
+  GetImplementation(*this).SetType(geometryType);
 }
 
-Geometry::GeometryType Geometry::GetGeometryType() const
+Geometry::Type Geometry::GetType() const
 {
-  return GetImplementation(*this).GetGeometryType();
+  return GetImplementation(*this).GetType();
 }
 
-Geometry::Geometry( Internal::Geometry* pointer )
-: BaseHandle( pointer )
+Geometry::Geometry(Internal::Geometry* pointer)
+: BaseHandle(pointer)
 {
 }