/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
// 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
return geometry;
}
-std::size_t Geometry::AddVertexBuffer( PropertyBuffer& vertexBuffer )
+uint32_t Geometry::AddVertexBuffer( PropertyBuffer& vertexBuffer )
{
mVertexBuffers.push_back( &vertexBuffer );
- SceneGraph::AddVertexBufferMessage( mEventThreadServices.GetUpdateManager(), *mRenderObject, *vertexBuffer.GetRenderObject() );
- return mVertexBuffers.size() - 1u;
+ SceneGraph::AttachVertexBufferMessage( mEventThreadServices.GetUpdateManager(), *mRenderObject, *vertexBuffer.GetRenderObject() );
+ return static_cast<uint32_t>( mVertexBuffers.size() - 1u );
}
-std::size_t Geometry::GetNumberOfVertexBuffers() const
+uint32_t Geometry::GetNumberOfVertexBuffers() const
{
- return mVertexBuffers.size();
+ return static_cast<uint32_t>( mVertexBuffers.size() );
}
-void Geometry::RemoveVertexBuffer( std::size_t index )
+void Geometry::RemoveVertexBuffer( uint32_t index )
{
const Render::PropertyBuffer& renderPropertyBuffer = static_cast<const Render::PropertyBuffer&>( *(mVertexBuffers[index]->GetRenderObject()) );
SceneGraph::RemoveVertexBufferMessage( mEventThreadServices.GetUpdateManager(), *mRenderObject, renderPropertyBuffer );
mVertexBuffers.erase( mVertexBuffers.begin() + index );
}
-void Geometry::SetIndexBuffer( const unsigned short* indices, size_t count )
+void Geometry::SetIndexBuffer( const uint16_t* indices, uint32_t count )
{
- Dali::Vector<unsigned short> indexData;
+ Dali::Vector<uint16_t> indexData;
if( indices && count )
{
indexData.Resize( count );
SceneGraph::SetIndexBufferMessage( mEventThreadServices.GetUpdateManager(), *mRenderObject, indexData );
}
-void Geometry::SetGeometryType( Dali::Geometry::GeometryType geometryType )
+void Geometry::SetType( Dali::Geometry::Type geometryType )
{
- if( geometryType != mGeometryType )
+ if( geometryType != mType )
{
SceneGraph::SetGeometryTypeMessage(mEventThreadServices.GetUpdateManager(), *mRenderObject, geometryType );
- mGeometryType = geometryType;
+ mType = geometryType;
}
}
-Dali::Geometry::GeometryType Geometry::GetGeometryType() const
+Dali::Geometry::Type Geometry::GetType() const
{
- return mGeometryType;
-}
-
-void Geometry::SetRequiresDepthTesting( bool requiresDepthTest )
-{
- if( requiresDepthTest != mRequiresDepthTest )
- {
- SceneGraph::SetGeometryRequiresDepthTestMessage(mEventThreadServices.GetUpdateManager(), *mRenderObject, requiresDepthTest );
-
- mRequiresDepthTest = requiresDepthTest;
- }
-}
-
-bool Geometry::GetRequiresDepthTesting() const
-{
- return mRequiresDepthTest;
+ return mType;
}
const Render::Geometry* Geometry::GetRenderObject() const
}
Geometry::Geometry()
-: mEventThreadServices( *Stage::GetCurrent() ),
+: mEventThreadServices( EventThreadServices::Get() ),
mRenderObject( NULL ),
- mGeometryType(Dali::Geometry::TRIANGLES),
- mRequiresDepthTest(false)
+ 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()
}
}
-
} // namespace Internal
+
} // namespace Dali