Fixes for examples (playcanvas#3349)

ellthompson · web-flow · commit 770414568604 · 2021-08-13T17:17:09.000+01:00
* refactor animation events example code

* fixes for examples
diff --git a/examples/src/examples/animation/events.tsx b/examples/src/examples/animation/events.tsx
@@ -79,7 +79,7 @@ class EventsExample extends Example {
             const colorVec = new pc.Vec3(Math.random(), Math.random(), Math.random());
             colorVec.mulScalar(1 / colorVec.length());
             // @ts-ignore engine-tsd
-            boxes[`${i}${j}`].model.material.emissive = new pc.Color(colorVec.data);
+            boxes[`${i}${j}`].model.material.emissive = new pc.Color(colorVec.x, colorVec.y, colorVec.z);
             highlightedBoxes.push(boxes[`${i}${j}`]);
         };
 
@@ -130,27 +130,15 @@ class EventsExample extends Example {
 
         app.on('update', (dt) => {
             // on update, iterate over any currently highlighted boxes and reduce their emmisive property
-            let popBoxCount = 0;
             highlightedBoxes.forEach((box: pc.Entity) => {
                 // @ts-ignore engine-tsd
-                let emissive = box.model.material.emissive;
-                emissive = new pc.Vec3(emissive.r, emissive.g, emissive.b);
-                emissive.scale(0.92);
-                emissive = new pc.Color(emissive.data);
-                if (emissive.r < 0.001 && emissive.g < 0.001 && emissive.b < 0.001) {
-                    // @ts-ignore engine-tsd
-                    box.model.material.emissive = new pc.Color(0, 0, 0);
-                    popBoxCount++;
-                } else {
-                    // @ts-ignore engine-tsd
-                    box.model.material.emissive = emissive;
-                }
+                const emissive = box.model.material.emissive;
+                emissive.lerp(emissive, pc.Color.BLACK, 0.08);
                 box.model.material.update();
             });
-            // if a box is no longer emissive, it should be removed from the list
-            while (popBoxCount !== 0) {
+            // remove old highlighted boxes from the update loop
+            while (highlightedBoxes.length > 5) {
                 highlightedBoxes.shift();
-                popBoxCount--;
             }
 
             // set the camera to folow the model
diff --git a/examples/src/examples/graphics/lights.tsx b/examples/src/examples/graphics/lights.tsx
@@ -222,7 +222,7 @@ class LightsExample extends Example {
                 lights[pathArray[1]].enabled = value;
             } else {
                 // @ts-ignore
-                lights[pathArray[1]][pathArray[2]] = value;
+                lights[pathArray[1]].light[pathArray[2]] = value;
             }
         });
     }
diff --git a/examples/src/examples/user-interface/various.tsx b/examples/src/examples/user-interface/various.tsx
diff --git a/src/anim/controller/anim-blend-tree-2d-cartesian.js b/src/anim/controller/anim-blend-tree-2d-cartesian.js
@@ -33,7 +33,7 @@ class AnimBlendTreeCartesian2D extends AnimBlendTree {
         for (i = 0; i < this._children.length; i++) {
             const child = this._children[i];
             pi = child.point;
-            AnimBlendTreeCartesian2D._pip.set(...AnimBlendTreeCartesian2D._p.data).sub(pi);
+            AnimBlendTreeCartesian2D._pip.set(AnimBlendTreeCartesian2D._p.x, AnimBlendTreeCartesian2D._p.y).sub(pi);
             minj = Number.MAX_VALUE;
             for (j = 0; j < this._children.length; j++) {
                 if (i === j) continue;

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ class LightsExample extends Example {`
`222`	`222`	`lights[pathArray[1]].enabled = value;`
`223`	`223`	`} else {`
`224`	`224`	`// @ts-ignore`
`225`		`- lights[pathArray[1]][pathArray[2]] = value;`
	`225`	`+ lights[pathArray[1]].light[pathArray[2]] = value;`
`226`	`226`	`}`
`227`	`227`	`});`
`228`	`228`	`}`