From 12a866c1bc8cdd5e11daa5ce292e9952ea63d240 Mon Sep 17 00:00:00 2001 From: Adam Bialogonski Date: Thu, 14 Dec 2023 09:56:35 +0000 Subject: [PATCH] [Tizen] Coverity issue fix - removed unused 'mesh' parameter Change-Id: I07505bab4da485578882ee63a0211703b2cac4a6 Signed-off-by: Adam Bialogonski --- dali-scene3d/internal/controls/model/model-impl.cpp | 4 ++-- dali-scene3d/internal/controls/model/model-impl.h | 3 +-- dali-scene3d/internal/model-components/model-node-impl.cpp | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dali-scene3d/internal/controls/model/model-impl.cpp b/dali-scene3d/internal/controls/model/model-impl.cpp index d2b1e9f..78cc718 100644 --- a/dali-scene3d/internal/controls/model/model-impl.cpp +++ b/dali-scene3d/internal/controls/model/model-impl.cpp @@ -318,7 +318,7 @@ void Model::AddModelNode(Scene3D::ModelNode modelNode) // If model has a collider mesh set, add it to the container if(modelNode.HasColliderMesh()) { - RegisterColliderMesh(modelNode, modelNode.GetColliderMesh()); + RegisterColliderMesh(modelNode); Scene3D::ColliderMeshProcessor::Get().ColliderMeshChanged(Scene3D::Model::DownCast(Self())); } @@ -328,7 +328,7 @@ void Model::AddModelNode(Scene3D::ModelNode modelNode) } } -void Model::RegisterColliderMesh(Scene3D::ModelNode& modelNode, const Dali::Scene3D::Algorithm::ColliderMesh& mesh) +void Model::RegisterColliderMesh(Scene3D::ModelNode& modelNode) { mColliderMeshes[modelNode.GetProperty(Actor::Property::ID)] = modelNode; diff --git a/dali-scene3d/internal/controls/model/model-impl.h b/dali-scene3d/internal/controls/model/model-impl.h index ff9ba0c..2e78f78 100644 --- a/dali-scene3d/internal/controls/model/model-impl.h +++ b/dali-scene3d/internal/controls/model/model-impl.h @@ -210,9 +210,8 @@ public: * @brief Registers child node with collidier mesh * * @param[in] node ModelNode to register - * @param[in] mesh Collider mesh to associate with model node */ - void RegisterColliderMesh(Scene3D::ModelNode& node, const Dali::Scene3D::Algorithm::ColliderMesh& mesh); + void RegisterColliderMesh(Scene3D::ModelNode& node); /** * @brief Removes node/collider mesh from the register diff --git a/dali-scene3d/internal/model-components/model-node-impl.cpp b/dali-scene3d/internal/model-components/model-node-impl.cpp index 6b2c8a2..8d85cf2 100644 --- a/dali-scene3d/internal/model-components/model-node-impl.cpp +++ b/dali-scene3d/internal/model-components/model-node-impl.cpp @@ -437,9 +437,11 @@ void ModelNode::SetColliderMesh(ColliderMeshUniquePtr&& colliderMesh) mParentModel->RemoveColliderMesh(handle); } + // If collider mesh is to be set then register it with the parent model. + // If nullptr, ignore. if(colliderMesh) { - mParentModel->RegisterColliderMesh(handle, *colliderMesh); + mParentModel->RegisterColliderMesh(handle); } } -- 2.7.4