#define DALI_INTERNAL_GEOMETRY_H
/*
- * Copyright (c) 2015 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.
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-common.h> // DALI_ASSERT_ALWAYS
#include <dali/public-api/common/intrusive-ptr.h> // Dali::IntrusivePtr
-#include <dali/devel-api/rendering/geometry.h> // Dali::Geometry
+#include <dali/public-api/rendering/geometry.h> // Dali::Geometry
#include <dali/internal/event/common/connectable.h> // Dali::Internal::Connectable
#include <dali/internal/event/common/object-connector.h> // Dali::Internal::ObjectConnector
#include <dali/internal/event/common/object-impl.h> // Dali::Internal::Object
-#include <dali/internal/event/common/property-buffer-impl.h> // Dali::Internal::PropertyBuffer
+#include <dali/internal/event/rendering/vertex-buffer-impl.h> // Dali::Internal::VertexBuffer
#include <dali/internal/render/renderers/render-geometry.h>
namespace Dali
}
class Geometry;
-typedef IntrusivePtr<Geometry> GeometryPtr;
+using GeometryPtr = IntrusivePtr<Geometry>;
/**
* Geometry is an object that contains an array of structures of values that
/**
* @copydoc Dali::Geometry::AddVertexBuffer()
*/
- std::size_t AddVertexBuffer( PropertyBuffer& vertexBuffer );
+ uint32_t AddVertexBuffer( VertexBuffer& vertexBuffer );
/**
* @copydoc Dali::Geometry::GetNumberOfVertexBuffers()
*/
- std::size_t GetNumberOfVertexBuffers() const;
+ uint32_t GetNumberOfVertexBuffers() const;
/**
* @copydoc Dali::Geometry::RemoveVertexBuffer()
*/
- void RemoveVertexBuffer( std::size_t index );
+ void RemoveVertexBuffer( uint32_t index );
/**
* @copydoc Dali::Geometry::SetIndexBuffer()
*/
- void SetIndexBuffer( const unsigned short* indices, size_t count );
+ void SetIndexBuffer( const uint16_t* indices, uint32_t count );
/**
- * @copydoc Dali::Geometry::SetGeometryType()
+ * @copydoc Dali::Geometry::SetType()
*/
- void SetGeometryType( Dali::Geometry::GeometryType geometryType );
+ void SetType( Dali::Geometry::Type geometryType );
/**
- * @copydoc Dali::Geometry::GetGeometryType()
+ * @copydoc Dali::Geometry::GetType()
*/
- Dali::Geometry::GeometryType GetGeometryType() const;
+ Dali::Geometry::Type GetType() const;
/**
* @brief Get the geometry scene object
EventThreadServices& mEventThreadServices; ///<Used to send messages to the render thread via update thread
Render::Geometry* mRenderObject;
- std::vector<PropertyBufferPtr> mVertexBuffers; ///< Vector of intrusive pointers to vertex buffers
- Dali::Geometry::GeometryType mGeometryType; ///< Geometry type (cached)
+ std::vector<VertexBufferPtr> mVertexBuffers; ///< Vector of intrusive pointers to vertex buffers
+ Dali::Geometry::Type mType; ///< Geometry type (cached)
};
} // namespace Internal