diff --git a/src/model.ts b/src/model.ts index 4487b5f..3ce9e64 100644 --- a/src/model.ts +++ b/src/model.ts @@ -34,8 +34,6 @@ function setVertices(box: BoxGeometry, top: Array, bottom: Array { - rightArmMesh.scale.x = (this.slim ? 3 : 4) - esp; - rightArmMesh.scale.y = 12 - esp; - rightArmMesh.scale.z = 4 - esp; + rightArmMesh.scale.x = this.slim ? 3 : 4; + rightArmMesh.scale.y = 12; + rightArmMesh.scale.z = 4; if (this.slim) { setVertices(rightArmBox, toSkinVertices(44, 16, 47, 20), @@ -161,9 +182,9 @@ export class SkinObject extends Group { const rightArm2Mesh = new Mesh(rightArm2Box, layer2Material); rightArm2Mesh.renderOrder = 1; this.modelListeners.push(() => { - rightArm2Mesh.scale.x = (this.slim ? 3.375 : 4.5) - esp; - rightArm2Mesh.scale.y = 13.5 - esp; - rightArm2Mesh.scale.z = 4.5 - esp; + rightArm2Mesh.scale.x = this.slim ? 3.375 : 4.5; + rightArm2Mesh.scale.y = 13.5; + rightArm2Mesh.scale.z = 4.5; if (this.slim) { setVertices(rightArm2Box, toSkinVertices(44, 32, 47, 36), @@ -204,9 +225,9 @@ export class SkinObject extends Group { const leftArmBox = new BoxGeometry(1, 1, 1, 0, 0, 0); // w/d/h is model-related const leftArmMesh = new Mesh(leftArmBox, layer1Material); this.modelListeners.push(() => { - leftArmMesh.scale.x = (this.slim ? 3 : 4) - esp; - leftArmMesh.scale.y = 12 - esp; - leftArmMesh.scale.z = 4 - esp; + leftArmMesh.scale.x = this.slim ? 3 : 4; + leftArmMesh.scale.y = 12; + leftArmMesh.scale.z = 4; if (this.slim) { setVertices(leftArmBox, toSkinVertices(36, 48, 39, 52), @@ -234,9 +255,9 @@ export class SkinObject extends Group { const leftArm2Mesh = new Mesh(leftArm2Box, layer2Material); leftArm2Mesh.renderOrder = 1; this.modelListeners.push(() => { - leftArm2Mesh.scale.x = (this.slim ? 3.375 : 4.5) - esp; - leftArm2Mesh.scale.y = 13.5 - esp; - leftArm2Mesh.scale.z = 4.5 - esp; + leftArm2Mesh.scale.x = this.slim ? 3.375 : 4.5; + leftArm2Mesh.scale.y = 13.5; + leftArm2Mesh.scale.z = 4.5; if (this.slim) { setVertices(leftArm2Box, toSkinVertices(52, 48, 55, 52), @@ -274,7 +295,7 @@ export class SkinObject extends Group { this.add(this.leftArm); // Right Leg - const rightLegBox = new BoxGeometry(4 - esp, 12 - esp, 4 - esp, 0, 0, 0); + const rightLegBox = new BoxGeometry(4, 12, 4, 0, 0, 0); setVertices(rightLegBox, toSkinVertices(4, 16, 8, 20), toSkinVertices(8, 16, 12, 20), @@ -285,7 +306,7 @@ export class SkinObject extends Group { ); const rightLegMesh = new Mesh(rightLegBox, layer1Material); - const rightLeg2Box = new BoxGeometry(4.5 - esp, 13.5 - esp, 4.5 - esp, 0, 0, 0); + const rightLeg2Box = new BoxGeometry(4.5, 13.5, 4.5, 0, 0, 0); setVertices(rightLeg2Box, toSkinVertices(4, 32, 8, 36), toSkinVertices(8, 32, 12, 36), @@ -309,7 +330,7 @@ export class SkinObject extends Group { this.add(this.rightLeg); // Left Leg - const leftLegBox = new BoxGeometry(4 - esp, 12 - esp, 4 - esp, 0, 0, 0); + const leftLegBox = new BoxGeometry(4, 12, 4, 0, 0, 0); setVertices(leftLegBox, toSkinVertices(20, 48, 24, 52), toSkinVertices(24, 48, 28, 52), @@ -320,7 +341,7 @@ export class SkinObject extends Group { ); const leftLegMesh = new Mesh(leftLegBox, layer1Material); - const leftLeg2Box = new BoxGeometry(4.5 - esp, 13.5 - esp, 4.5 - esp, 0, 0, 0); + const leftLeg2Box = new BoxGeometry(4.5, 13.5, 4.5, 0, 0, 0); setVertices(leftLeg2Box, toSkinVertices(4, 48, 8, 52), toSkinVertices(8, 48, 12, 52),