Skip to content
Snippets Groups Projects
Commit 19f2d64c authored by Greg Fodor's avatar Greg Fodor
Browse files

Tweaks from PR

parent 01b9714b
No related branches found
No related tags found
No related merge requests found
...@@ -49,7 +49,7 @@ AFRAME.registerComponent("pinnable", { ...@@ -49,7 +49,7 @@ AFRAME.registerComponent("pinnable", {
this.el.setAttribute("animation__pin-start", { this.el.setAttribute("animation__pin-start", {
property: "scale", property: "scale",
dur: 100, dur: 200,
from: { x: currentScale.x, y: currentScale.y, z: currentScale.z }, from: { x: currentScale.x, y: currentScale.y, z: currentScale.z },
to: { x: currentScale.x * 1.1, y: currentScale.y * 1.1, z: currentScale.z * 1.1 }, to: { x: currentScale.x * 1.1, y: currentScale.y * 1.1, z: currentScale.z * 1.1 },
easing: "easeOutElastic" easing: "easeOutElastic"
...@@ -57,8 +57,8 @@ AFRAME.registerComponent("pinnable", { ...@@ -57,8 +57,8 @@ AFRAME.registerComponent("pinnable", {
this.el.setAttribute("animation__pin-end", { this.el.setAttribute("animation__pin-end", {
property: "scale", property: "scale",
delay: 150, delay: 200,
dur: 100, dur: 200,
from: { x: currentScale.x * 1.1, y: currentScale.y * 1.1, z: currentScale.z * 1.1 }, from: { x: currentScale.x * 1.1, y: currentScale.y * 1.1, z: currentScale.z * 1.1 },
to: { x: currentScale.x, y: currentScale.y, z: currentScale.z }, to: { x: currentScale.x, y: currentScale.y, z: currentScale.z },
easing: "easeOutElastic" easing: "easeOutElastic"
......
...@@ -10,6 +10,7 @@ AFRAME.registerComponent("remove-networked-object-button", { ...@@ -10,6 +10,7 @@ AFRAME.registerComponent("remove-networked-object-button", {
easing: "easeInQuad" easing: "easeInQuad"
}); });
this.el.parentNode.removeAttribute("visible-while-frozen");
this.el.parentNode.setAttribute("visible", false); this.el.parentNode.setAttribute("visible", false);
this.targetEl.addEventListener("animationcomplete", () => { this.targetEl.addEventListener("animationcomplete", () => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment