[Tizen] Fixed actor relayout dimension dependencies

[platform/core/uifw/dali-core.git] / dali / internal / event / rendering / geometry-impl.cpp

diff --git a/dali/internal/event/rendering/geometry-impl.cpp b/dali/internal/event/rendering/geometry-impl.cpp
index 07ecda9..4b6ee13 100644 (file)
--- a/dali/internal/event/rendering/geometry-impl.cpp
+++ b/dali/internal/event/rendering/geometry-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -21,81 +21,64 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
 
-#include <dali/internal/event/common/object-impl-helper.h> // Dali::Internal::ObjectHelper
 #include <dali/internal/update/manager/update-manager.h>
 
 namespace Dali
 {
 namespace Internal
 {
-
 GeometryPtr Geometry::New()
 {
-  GeometryPtr geometry( new Geometry() );
+  GeometryPtr geometry(new Geometry());
   geometry->Initialize();
   return geometry;
 }
 
-std::size_t Geometry::AddVertexBuffer( PropertyBuffer& vertexBuffer )
-{
-  mVertexBuffers.push_back( &vertexBuffer );
-  SceneGraph::AddVertexBufferMessage( mEventThreadServices.GetUpdateManager(), *mRenderObject, *vertexBuffer.GetRenderObject() );
-  return mVertexBuffers.size() - 1u;
-}
-
-std::size_t Geometry::GetNumberOfVertexBuffers() const
+uint32_t Geometry::AddVertexBuffer(VertexBuffer& vertexBuffer)
 {
-  return mVertexBuffers.size();
+  mVertexBuffers.push_back(&vertexBuffer);
+  SceneGraph::AttachVertexBufferMessage(mEventThreadServices.GetUpdateManager(), *mRenderObject, *vertexBuffer.GetRenderObject());
+  return static_cast<uint32_t>(mVertexBuffers.size() - 1u);
 }
 
-void Geometry::RemoveVertexBuffer( std::size_t index )
+uint32_t Geometry::GetNumberOfVertexBuffers() const
 {
-  const Render::PropertyBuffer& renderPropertyBuffer = static_cast<const Render::PropertyBuffer&>( *(mVertexBuffers[index]->GetRenderObject()) );
-  SceneGraph::RemoveVertexBufferMessage( mEventThreadServices.GetUpdateManager(), *mRenderObject, renderPropertyBuffer );
-
-  mVertexBuffers.erase( mVertexBuffers.begin() + index );
+  return static_cast<uint32_t>(mVertexBuffers.size());
 }
 
-void Geometry::SetIndexBuffer( const unsigned short* indices, size_t count )
+void Geometry::RemoveVertexBuffer(uint32_t index)
 {
-  Dali::Vector<unsigned short> indexData;
-  if( indices && count )
-  {
-    indexData.Resize( count );
-    std::copy( indices, indices + count, indexData.Begin() );
-  }
+  const Render::VertexBuffer& renderVertexBuffer = static_cast<const Render::VertexBuffer&>(*(mVertexBuffers[index]->GetRenderObject()));
+  SceneGraph::RemoveVertexBufferMessage(mEventThreadServices.GetUpdateManager(), *mRenderObject, renderVertexBuffer);
 
-  SceneGraph::SetIndexBufferMessage( mEventThreadServices.GetUpdateManager(), *mRenderObject, indexData );
+  mVertexBuffers.erase(mVertexBuffers.begin() + index);
 }
 
-void Geometry::SetGeometryType( Dali::Geometry::GeometryType geometryType )
+void Geometry::SetIndexBuffer(const uint16_t* indices, uint32_t count)
 {
-  if( geometryType != mGeometryType )
+  Dali::Vector<uint16_t> indexData;
+  if(indices && count)
   {
-    SceneGraph::SetGeometryTypeMessage(mEventThreadServices.GetUpdateManager(), *mRenderObject, geometryType );
-
-    mGeometryType = geometryType;
+    indexData.Resize(count);
+    std::copy(indices, indices + count, indexData.Begin());
   }
-}
 
-Dali::Geometry::GeometryType Geometry::GetGeometryType() const
-{
-  return mGeometryType;
+  SceneGraph::SetIndexBufferMessage(mEventThreadServices.GetUpdateManager(), *mRenderObject, indexData);
 }
 
-void Geometry::SetRequiresDepthTesting( bool requiresDepthTest )
+void Geometry::SetType(Dali::Geometry::Type geometryType)
 {
-  if( requiresDepthTest != mRequiresDepthTest )
+  if(geometryType != mType)
   {
-    SceneGraph::SetGeometryRequiresDepthTestMessage(mEventThreadServices.GetUpdateManager(), *mRenderObject, requiresDepthTest );
+    SceneGraph::SetGeometryTypeMessage(mEventThreadServices.GetUpdateManager(), *mRenderObject, geometryType);
 
-    mRequiresDepthTest = requiresDepthTest;
+    mType = geometryType;
   }
 }
 
-bool Geometry::GetRequiresDepthTesting() const
+Dali::Geometry::Type Geometry::GetType() const
 {
-  return mRequiresDepthTest;
+  return mType;
 }
 
 const Render::Geometry* Geometry::GetRenderObject() const
@@ -104,27 +87,27 @@ const Render::Geometry* Geometry::GetRenderObject() const
 }
 
 Geometry::Geometry()
-: mEventThreadServices( *Stage::GetCurrent() ),
-  mRenderObject( NULL ),
-  mGeometryType(Dali::Geometry::TRIANGLES),
-  mRequiresDepthTest(false)
+: mEventThreadServices(EventThreadServices::Get()),
+  mRenderObject(nullptr),
+  mType(Dali::Geometry::TRIANGLES)
 {
 }
 
 void Geometry::Initialize()
 {
   mRenderObject = new Render::Geometry();
-  AddGeometry( mEventThreadServices.GetUpdateManager(), *mRenderObject );
+  OwnerPointer<Render::Geometry> transferOwnership(mRenderObject);
+  AddGeometry(mEventThreadServices.GetUpdateManager(), transferOwnership);
 }
 
 Geometry::~Geometry()
 {
-  if( EventThreadServices::IsCoreRunning() && mRenderObject )
+  if(EventThreadServices::IsCoreRunning() && mRenderObject)
   {
-    RemoveGeometry( mEventThreadServices.GetUpdateManager(), *mRenderObject );
+    RemoveGeometry(mEventThreadServices.GetUpdateManager(), *mRenderObject);
   }
 }
 
-
 } // namespace Internal
+
 } // namespace Dali