From: seungho baek Date: Tue, 2 May 2023 05:55:13 +0000 (+0900) Subject: [Tizen] Use Renderer to register skinning property X-Git-Tag: accepted/tizen/7.0/unified/20230515.132836~6 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=fcb91da58739795d0289a9d1e50b838092165e40 [Tizen] Use Renderer to register skinning property Change-Id: If4f9e0d9b4fb454e02666694ea24ec8fd31c8482 Signed-off-by: seungho baek --- diff --git a/dali-scene3d/internal/model-components/model-node-impl.cpp b/dali-scene3d/internal/model-components/model-node-impl.cpp index 257cbd0..51cfd76 100644 --- a/dali-scene3d/internal/model-components/model-node-impl.cpp +++ b/dali-scene3d/internal/model-components/model-node-impl.cpp @@ -319,25 +319,19 @@ void ModelNode::UpdateBoneMatrix(Scene3D::ModelPrimitive primitive) continue; } - Dali::Shader shader = renderer.GetShader(); - if(!shader) - { - continue; - } - if(boneData.constraint) { boneData.constraint.Remove(); boneData.constraint.Reset(); } - if(shader.GetPropertyIndex(boneData.propertyName) == Property::INVALID_INDEX) + if(renderer.GetPropertyIndex(boneData.propertyName) == Property::INVALID_INDEX) { - auto propBoneXform = shader.RegisterProperty(boneData.propertyName, Matrix{false}); + auto propBoneXform = renderer.RegisterProperty(boneData.propertyName, Matrix{false}); Matrix inverseMatrix = boneData.inverseMatrix; // Constrain bone matrix to joint transform. - boneData.constraint = Constraint::New(shader, propBoneXform, [inverseMatrix](Matrix& output, const PropertyInputContainer& inputs) + boneData.constraint = Constraint::New(renderer, propBoneXform, [inverseMatrix](Matrix& output, const PropertyInputContainer& inputs) { Matrix::Multiply(output, inverseMatrix, inputs[0]->GetMatrix()); }); Actor joint = Self();