diff --git a/src/app/components/SMCanvas/TransformControls.js b/src/app/components/SMCanvas/TransformControls.js index 99dc9985a8..5e3770c4d1 100644 --- a/src/app/components/SMCanvas/TransformControls.js +++ b/src/app/components/SMCanvas/TransformControls.js @@ -95,18 +95,6 @@ class TransformControls extends Object3D { this.destroyDefaults(); } - calculateScalePosition(originalPosition, centerPosition, eVec) { - const positionX = centerPosition.x + (originalPosition.x - centerPosition.x) * eVec.x; - const positionY = centerPosition.y + (originalPosition.y - centerPosition.y) * eVec.y; - const positionZ = centerPosition.z + (originalPosition.z - centerPosition.z) * eVec.z; - return { - x: positionX, - y: positionY, - z: positionZ - }; - } - - createPeripheral(definitions) { const peripheral = new Object3D(); diff --git a/src/app/models/ModelGroup.js b/src/app/models/ModelGroup.js index 11f79b05f7..c7d81fc7d8 100644 --- a/src/app/models/ModelGroup.js +++ b/src/app/models/ModelGroup.js @@ -17,7 +17,6 @@ class ModelGroup extends EventEmitter { this.headType = headType; // this.object = new Object3D(); this.object = new Group(); - this.showObject = new Group(); this.models = []; @@ -388,9 +387,6 @@ class ModelGroup extends EventEmitter { } } - addHiddenMeshObjects() { - this.showObject.children.splice(0); - } setConvexGeometry(uploadName, convexGeometry) { const models = this.models.filter(m => m.uploadName === uploadName); diff --git a/src/shared/lib/SVGParser/AttributesParser.js b/src/shared/lib/SVGParser/AttributesParser.js index 0acb9f3663..efdc25beea 100644 --- a/src/shared/lib/SVGParser/AttributesParser.js +++ b/src/shared/lib/SVGParser/AttributesParser.js @@ -222,13 +222,13 @@ class AttributesParser { } // make a copy of parentAttributes attributes.xform = [1, 0, 0, 1, 0, 0]; + // Regardless of whether 'node.$' is exited, 'xform' in 'attributes' must be applied to 'node' element + xformMultiply(attributes.xform, parentAttributes.xform); if (!node.$) { return attributes; } - xformMultiply(attributes.xform, parentAttributes.xform); - Object.keys(node.$).forEach((key) => { const value = node.$[key]; this.parseAttribute(attributes, parentAttributes, key, value);