Merge remote-tracking branch 'origin/main-dev' into main-demo
This commit is contained in:
@@ -53,7 +53,7 @@ const MaterialAnimator = ({ human }: { human: HumanStatus; }) => {
|
|||||||
{hasLoad && action && (action as HumanAction).actionType === 'worker' && human.currentMaterials.length > 0 && (human.currentPhase !== 'init-pickup' && human.currentPhase !== 'init-assembly' && human.currentPhase !== 'drop-pickup') && (
|
{hasLoad && action && (action as HumanAction).actionType === 'worker' && human.currentMaterials.length > 0 && (human.currentPhase !== 'init-pickup' && human.currentPhase !== 'init-assembly' && human.currentPhase !== 'drop-pickup') && (
|
||||||
<MaterialModel
|
<MaterialModel
|
||||||
matRef={meshRef}
|
matRef={meshRef}
|
||||||
materialId={human.currentMaterials[0].materialId || ''}
|
materialId={`human-${human.currentMaterials[0].materialId}` || ''}
|
||||||
materialType={human.currentMaterials[0].materialType || 'Default material'}
|
materialType={human.currentMaterials[0].materialType || 'Default material'}
|
||||||
visible={isAttached}
|
visible={isAttached}
|
||||||
/>
|
/>
|
||||||
|
|||||||
Reference in New Issue
Block a user