Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initialize hand opacity #5433

Merged
merged 10 commits into from
Jan 17, 2024
Merged

Initialize hand opacity #5433

Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c543d20
Added modelOpacity to hand
ehammons11 Jan 14, 2024
3ac7508
Refined updateModelMaterial
ehammons11 Jan 14, 2024
29609a3
Removed trailing spaces
ehammons11 Jan 14, 2024
a607550
Merge branch 'master' into addHandOpacity
ehammons11 Jan 14, 2024
3cf1431
Initialize hand opacity
ehammons11 Jan 17, 2024
c15f23c
Removed repeated code
ehammons11 Jan 17, 2024
43584fb
skinnedMesh logic correction
ehammons11 Jan 17, 2024
a8de4a7
Simplified logic
ehammons11 Jan 17, 2024
f1feca1
fixed mesh opacity logic
ehammons11 Jan 17, 2024
a591495
Merge branch 'master' into addHandOpacity
ehammons11 Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/components/hand-tracking-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,14 @@ module.exports.Component = registerComponent('hand-tracking-controls', {
var transparent = !(this.data.modelOpacity === 1.0);
if (skinnedMesh) {
this.skinnedMesh.material.color.set(this.data.modelColor);
this.skinnedMesh.material.transparent.set(transparent);
this.skinnedMesh.material.transparent = transparent;
this.skinnedMesh.material.opacity.set(this.data.modelOpacity);
}

for (var i = 0; i < jointEls.length; i++) {
jointEls[i].setAttribute('material', 'color', this.data.modelColor);
jointEls[i].setAttribute('material', 'transparent', transparent);
jointEls[i].setAttribute('material', 'opacity', this.data.modelOpacity);
jointEls[i].setAttribute('material', 'transparent', transparent);
jointEls[i].setAttribute('material', 'opacity', this.data.modelOpacity);
}
},

Expand Down Expand Up @@ -366,6 +366,7 @@ module.exports.Component = registerComponent('hand-tracking-controls', {
this.el.appendChild(jointEl);
this.jointEls.push(jointEl);
}
this.updateModelMaterial();
},

initMeshHandModel: function () {
Expand All @@ -383,6 +384,7 @@ module.exports.Component = registerComponent('hand-tracking-controls', {
mesh.rotation.set(0, 0, 0);
skinnedMesh.frustumCulled = false;
skinnedMesh.material = new THREE.MeshStandardMaterial({color: this.data.modelColor});
this.updateModelMaterial();
this.setupChildrenEntities();
this.el.setObject3D('mesh', mesh);
},
Expand Down
Loading