Bugfix move mesh scaling during menu animation

Avaer Kazmer · Avaer Kazmer · commit fe15345f849f · 2019-09-16T05:41:39.000-04:00
diff --git a/app.html b/app.html
@@ -5617,11 +5617,13 @@
     for (let i = 0; i < moveMeshes.length; i++) {
       const moveMesh = moveMeshes[i];
       if (moveMesh.visible) {
-        moveMesh.scale.set(1, 1, 1);
-        if (!moveMesh.xrIframe.loaded) {
-          const f = ((Date.now() - moveMesh.startTime) % 1000) / 1000;
-          const angle = Math.pow(f, 0.5) * Math.PI*2;
-          moveMesh.scale.multiplyScalar(1 + (1-Math.cos(angle))*0.2);
+        if (!menuAnimation) {
+          moveMesh.scale.set(1, 1, 1);
+          if (!moveMesh.xrIframe.loaded) {
+            const f = ((Date.now() - moveMesh.startTime) % 1000) / 1000;
+            const angle = Math.pow(f, 0.5) * Math.PI*2;
+            moveMesh.scale.multiplyScalar(1 + (1-Math.cos(angle))*0.2);
+          }
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -5617,11 +5617,13 @@`
`5617`	`5617`	`for (let i = 0; i < moveMeshes.length; i++) {`
`5618`	`5618`	`const moveMesh = moveMeshes[i];`
`5619`	`5619`	`if (moveMesh.visible) {`
`5620`		`- moveMesh.scale.set(1, 1, 1);`
`5621`		`- if (!moveMesh.xrIframe.loaded) {`
`5622`		`- const f = ((Date.now() - moveMesh.startTime) % 1000) / 1000;`
`5623`		`- const angle = Math.pow(f, 0.5) * Math.PI*2;`
`5624`		`- moveMesh.scale.multiplyScalar(1 + (1-Math.cos(angle))*0.2);`
	`5620`	`+ if (!menuAnimation) {`
	`5621`	`+ moveMesh.scale.set(1, 1, 1);`
	`5622`	`+ if (!moveMesh.xrIframe.loaded) {`
	`5623`	`+ const f = ((Date.now() - moveMesh.startTime) % 1000) / 1000;`
	`5624`	`+ const angle = Math.pow(f, 0.5) * Math.PI*2;`
	`5625`	`+ moveMesh.scale.multiplyScalar(1 + (1-Math.cos(angle))*0.2);`
	`5626`	`+ }`
`5625`	`5627`	`}`
`5626`	`5628`	`}`
`5627`	`5629`	`}`