Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip pinning animations if already running #4642

Merged
merged 2 commits into from
Sep 28, 2021
Merged

Skip pinning animations if already running #4642

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64080cf
Skip pinning animations if already running
keianhzo Sep 20, 2021
5249859
Fix oldData key
keianhzo Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/components/pinnable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,19 @@ AFRAME.registerComponent("pinnable", {
this.el.addEventListener("media_refreshed", this._fireEventsAndAnimate);

// Fire pinned events when page changes so we can persist the page.
this.el.addEventListener("owned-pager-page-changed", this._fireEventsAndAnimate);
this.el.addEventListener("owned-pager-page-changed", () => {
this._fireEventsAndAnimate({ animate: false });
});

// Fire pinned events when video state changes so we can persist the page.
this.el.addEventListener("owned-video-state-changed", this._fireEventsAndAnimate);
},

update(oldData) {
this._fireEventsAndAnimate(oldData);
this._fireEventsAndAnimate({ oldData });
},

_fireEventsAndAnimate(oldData, force) {
_fireEventsAndAnimate({ oldData = {}, force = false, animate = true }) {
// We need to guard against _fireEventsAndAnimate being called during entity initialization,
// when the networked component isn't initialized yet.
if (!this.el.components.networked || !this.el.components.networked.data) return;
Expand All @@ -35,7 +37,11 @@ AFRAME.registerComponent("pinnable", {
this.el.emit("pinned", { el: this.el });
}

if (isMine) {
const isAnimationRunning =
this.el.components["animation__pin-start"]?.animationIsPlaying ||
this.el.components["animation__pin-end"]?.animationIsPlaying;

if (isMine && animate && !isAnimationRunning) {
this.el.removeAttribute("animation__pin-start");
this.el.removeAttribute("animation__pin-end");
const currentScale = this.el.object3D.scale;
Expand Down Expand Up @@ -80,15 +86,15 @@ AFRAME.registerComponent("pinnable", {
let didFireThisFrame = false;
if (!held && this.wasHeld && isMine) {
didFireThisFrame = true;
this._fireEventsAndAnimate(this.data, true);
this._fireEventsAndAnimate({ data: this.data, force: true });
keianhzo marked this conversation as resolved.
Show resolved Hide resolved
}

this.wasHeld = held;

this.transformObjectSystem = this.transformObjectSystem || AFRAME.scenes[0].systems["transform-selected-object"];
const transforming = this.transformObjectSystem.transforming && this.transformObjectSystem.target.el === this.el;
if (!didFireThisFrame && !transforming && this.wasTransforming && isMine) {
this._fireEventsAndAnimate(this.data, true);
this._fireEventsAndAnimate({ data: this.data, force: true });
}
this.wasTransforming = transforming;
}
Expand Down