From cb09b865b32f65f34d02a77a99aeb263a76c5dcc Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Sat, 11 Apr 2020 11:22:17 +0900 Subject: [PATCH] FBXLoader: Clean up. --- examples/js/loaders/FBXLoader.js | 30 +++++++++++++++--------------- examples/jsm/loaders/FBXLoader.js | 8 ++++---- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/js/loaders/FBXLoader.js b/examples/js/loaders/FBXLoader.js index acdc31188d..4be54197ab 100644 --- a/examples/js/loaders/FBXLoader.js +++ b/examples/js/loaders/FBXLoader.js @@ -3986,20 +3986,20 @@ THREE.FBXLoader = ( function () { // Global Shear*Scaling var lParentTM = new THREE.Matrix4(); - var lLSM = new Matrix4(); - var lParentGSM = new Matrix4(); - var lParentGRSM = new Matrix4(); - - var lParentTM_inv = new Matrix4().getInverse( lParentTM ); + var lLSM = new THREE.Matrix4(); + var lParentGSM = new THREE.Matrix4(); + var lParentGRSM = new THREE.Matrix4(); + + var lParentTM_inv = new THREE.Matrix4().getInverse( lParentTM ); lParentTM.copyPosition( lParentGX ); lParentGRSM.multiply( lParentTM_inv ).multiply( lParentGX ); - - var lParentGRM_inv = new Matrix4().getInverse( lParentGRM ); + + var lParentGRM_inv = new THREE.Matrix4().getInverse( lParentGRM ); lParentGSM.multiply( lParentGRM_inv ).multiply( lParentGRSM ); lLSM = lScalingM; - var lGlobalRS = new Matrix4(); + var lGlobalRS = new THREE.Matrix4(); if ( inheritType === 0 ) { lGlobalRS.multiply( lParentGRM ).multiply( lLRM ).multiply( lParentGSM ).multiply( lLSM ); @@ -4012,25 +4012,25 @@ THREE.FBXLoader = ( function () { var lParentLSM = new THREE.Matrix4().copy( lScalingM ); - var lParentLSM_inv = new Matrix4().getInverse( lParentLSM ); - var lParentGSM_noLocal = new Matrix4().multiply( lParentGSM ).multiply( lParentLSM_inv ); + var lParentLSM_inv = new THREE.Matrix4().getInverse( lParentLSM ); + var lParentGSM_noLocal = new THREE.Matrix4().multiply( lParentGSM ).multiply( lParentLSM_inv ); lGlobalRS.multiply( lParentGRM ).multiply( lLRM ).multiply( lParentGSM_noLocal ).multiply( lLSM ); } - var lRotationPivotM_inv = new Matrix4().getInverse( lRotationPivotM ); - var lScalingPivotM_inv = new Matrix4().getInverse( lScalingPivotM ); + var lRotationPivotM_inv = new THREE.Matrix4().getInverse( lRotationPivotM ); + var lScalingPivotM_inv = new THREE.Matrix4().getInverse( lScalingPivotM ); // Calculate the local transform matrix - var lTransform = new Matrix4(); + var lTransform = new THREE.Matrix4(); lTransform.multiply( lTranslationM ).multiply( lRotationOffsetM ).multiply( lRotationPivotM ).multiply( lPreRotationM ).multiply( lRotationM ).multiply( lPostRotationM ).multiply( lRotationPivotM_inv ).multiply( lScalingOffsetM ).multiply( lScalingPivotM ).multiply( lScalingM ).multiply( lScalingPivotM_inv ); var lLocalTWithAllPivotAndOffsetInfo = new THREE.Matrix4().copyPosition( lTransform ); - var lGlobalTranslation = new Matrix4().multiply(lParentGX).multiply( lLocalTWithAllPivotAndOffsetInfo ); + var lGlobalTranslation = new THREE.Matrix4().multiply( lParentGX ).multiply( lLocalTWithAllPivotAndOffsetInfo ); lGlobalT.copyPosition( lGlobalTranslation ); - lTransform = new Matrix4().multiply(lGlobalT).multiply( lGlobalRS ); + lTransform = new THREE.Matrix4().multiply( lGlobalT ).multiply( lGlobalRS ); return lTransform; diff --git a/examples/jsm/loaders/FBXLoader.js b/examples/jsm/loaders/FBXLoader.js index 5b0bff7b19..93b07b7f36 100644 --- a/examples/jsm/loaders/FBXLoader.js +++ b/examples/jsm/loaders/FBXLoader.js @@ -4036,12 +4036,12 @@ var FBXLoader = ( function () { var lLSM = new Matrix4(); var lParentGSM = new Matrix4(); var lParentGRSM = new Matrix4(); - + var lParentTM_inv = new Matrix4().getInverse( lParentTM ); lParentTM.copyPosition( lParentGX ); lParentGRSM.multiply( lParentTM_inv ).multiply( lParentGX ); - + var lParentGRM_inv = new Matrix4().getInverse( lParentGRM ); lParentGSM.multiply( lParentGRM_inv ).multiply( lParentGRSM ); lLSM = lScalingM; @@ -4074,10 +4074,10 @@ var FBXLoader = ( function () { var lLocalTWithAllPivotAndOffsetInfo = new Matrix4().copyPosition( lTransform ); - var lGlobalTranslation = new Matrix4().multiply(lParentGX).multiply( lLocalTWithAllPivotAndOffsetInfo ); + var lGlobalTranslation = new Matrix4().multiply( lParentGX ).multiply( lLocalTWithAllPivotAndOffsetInfo ); lGlobalT.copyPosition( lGlobalTranslation ); - lTransform = new Matrix4().multiply(lGlobalT).multiply( lGlobalRS ); + lTransform = new Matrix4().multiply( lGlobalT ).multiply( lGlobalRS ); return lTransform; -- GitLab