|
@@ -15931,7 +15931,7 @@ var BABYLON;
|
|
|
BABYLON.Tags.AddTagsTo(transformNode, parsedTransformNode.tags);
|
|
|
}
|
|
|
if (parsedTransformNode.localMatrix) {
|
|
|
- transformNode.setPivotMatrix(BABYLON.Matrix.FromArray(parsedTransformNode.localMatrix));
|
|
|
+ transformNode.setPreTransformMatrix(BABYLON.Matrix.FromArray(parsedTransformNode.localMatrix));
|
|
|
}
|
|
|
else if (parsedTransformNode.pivotMatrix) {
|
|
|
transformNode.setPivotMatrix(BABYLON.Matrix.FromArray(parsedTransformNode.pivotMatrix));
|
|
@@ -28044,7 +28044,7 @@ var BABYLON;
|
|
|
}
|
|
|
mesh.scaling = BABYLON.Vector3.FromArray(parsedMesh.scaling);
|
|
|
if (parsedMesh.localMatrix) {
|
|
|
- mesh.setPivotMatrix(BABYLON.Matrix.FromArray(parsedMesh.localMatrix));
|
|
|
+ mesh.setPreTransformMatrix(BABYLON.Matrix.FromArray(parsedMesh.localMatrix));
|
|
|
}
|
|
|
else if (parsedMesh.pivotMatrix) {
|
|
|
mesh.setPivotMatrix(BABYLON.Matrix.FromArray(parsedMesh.pivotMatrix));
|
|
@@ -73899,7 +73899,7 @@ var BABYLON;
|
|
|
var oldPivot = mesh.getPivotMatrix() || BABYLON.Matrix.Translation(0, 0, 0);
|
|
|
//calculate the new center using a pivot (since this.BJSCANNON.js doesn't center height maps)
|
|
|
var p = BABYLON.Matrix.Translation(boundingInfo.boundingBox.extendSizeWorld.x, 0, -boundingInfo.boundingBox.extendSizeWorld.z);
|
|
|
- mesh.setPivotMatrix(p);
|
|
|
+ mesh.setPreTransformMatrix(p);
|
|
|
mesh.computeWorldMatrix(true);
|
|
|
//calculate the translation
|
|
|
var translation = boundingInfo.boundingBox.centerWorld.subtract(center).subtract(mesh.position).negate();
|
|
@@ -73909,7 +73909,7 @@ var BABYLON;
|
|
|
this._tmpDeltaPosition.y += boundingInfo.boundingBox.extendSizeWorld.y;
|
|
|
//rotation is back
|
|
|
mesh.rotationQuaternion = rotationQuaternion;
|
|
|
- mesh.setPivotMatrix(oldPivot);
|
|
|
+ mesh.setPreTransformMatrix(oldPivot);
|
|
|
mesh.computeWorldMatrix(true);
|
|
|
}
|
|
|
else if (impostor.type === BABYLON.PhysicsImpostor.MeshImpostor) {
|