Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-toolkit.git] / dali-scene3d / public-api / model-components / model-node.cpp

diff --git a/dali-scene3d/public-api/model-components/model-node.cpp b/dali-scene3d/public-api/model-components/model-node.cpp
index 583cdd0..2832531 100644 (file)
--- a/dali-scene3d/public-api/model-components/model-node.cpp
+++ b/dali-scene3d/public-api/model-components/model-node.cpp
@@ -95,7 +95,7 @@ uint32_t ModelNode::GetModelPrimitiveCount() const
 
 void ModelNode::AddModelPrimitive(ModelPrimitive modelPrimitive)
 {
-  Internal::GetImplementation(*this).AddModelPrimitive(modelPrimitive);
+  Internal::GetImplementation(*this).AddModelPrimitive(modelPrimitive, 0u);
 }
 
 void ModelNode::RemoveModelPrimitive(Dali::Scene3D::ModelPrimitive modelPrimitive)
@@ -118,6 +118,31 @@ ModelNode ModelNode::FindChildModelNodeByName(std::string_view nodeName)
   return Internal::GetImplementation(*this).FindChildModelNodeByName(nodeName);
 }
 
+void ModelNode::RetrieveBlendShapeNames(std::vector<std::string>& blendShapeNames) const
+{
+  return Internal::GetImplementation(*this).RetrieveBlendShapeNames(blendShapeNames);
+}
+
+Loader::BlendShapes::Index ModelNode::GetBlendShapeIndexByName(std::string_view blendShapeName) const
+{
+  return Internal::GetImplementation(*this).GetBlendShapeIndexByName(blendShapeName);
+}
+
+void ModelNode::SetColliderMesh(std::unique_ptr<Algorithm::ColliderMesh>&& colliderMesh)
+{
+  Internal::GetImplementation(*this).SetColliderMesh(std::move(colliderMesh));
+}
+
+const Algorithm::ColliderMesh& ModelNode::GetColliderMesh()
+{
+  return Internal::GetImplementation(*this).GetColliderMesh();
+}
+
+bool ModelNode::HasColliderMesh() const
+{
+  return Internal::GetImplementation(*this).HasColliderMesh();
+}
+
 } // namespace Scene3D
 
 } // namespace Dali