Skip to content

Visualize Your Ideas With Code

fix(core): fix relative time (#461)

Jacob8d4946ebf565
diff --git a/packages/core/src/flow/scheduling.test.ts b/packages/core/src/flow/scheduling.test.ts
index e5bad612..e284df53 100644
--- a/packages/core/src/flow/scheduling.test.ts
+++ b/packages/core/src/flow/scheduling.test.ts
@@ -5,6 +5,7 @@ import {endPlayback, startPlayback, useTime} from '../utils';
import {threads} from '../threading';
import {waitFor} from './scheduling';
import {PlaybackManager, PlaybackStatus} from '../app';
+import {all} from './all';
describe('waitFor()', () => {
const playback = new PlaybackManager();
@@ -59,4 +60,22 @@ describe('waitFor()', () => {
expect(playback.frame).toBe(4);
expect(time).toBeCloseTo(0.45);
});
+
+ test('Accumulated time offset from concurrent threads', () => {
+ let time = NaN;
+ const task = threads(function* () {
+ yield* waitFor(0.15);
+ yield* all(waitFor(0.3), waitFor(0.15));
+ time = useTime();
+ });
+
+ playback.fps = 10;
+ playback.frame = 0;
+ for (const _ of task) {
+ playback.frame++;
+ }
+
+ expect(playback.frame).toBe(4);
+ expect(time).toBeCloseTo(0.45);
+ });
});
diff --git a/packages/core/src/scenes/timeEvents/EditableTimeEvents.ts b/packages/core/src/scenes/timeEvents/EditableTimeEvents.ts
index e3fb78b0..e45e7d80 100644
--- a/packages/core/src/scenes/timeEvents/EditableTimeEvents.ts
+++ b/packages/core/src/scenes/timeEvents/EditableTimeEvents.ts
@@ -3,7 +3,6 @@ import type {TimeEvents} from './TimeEvents';
import type {TimeEvent} from './TimeEvent';
import type {SerializedTimeEvent} from './SerializedTimeEvent';
import {ValueDispatcher} from '../../events';
-import {useThread} from '../../utils';
/**
* Manages time events during editing.
@@ -47,7 +46,7 @@ export class EditableTimeEvents implements TimeEvents {
this.scene.reload();
}
- public register(name: string): number {
+ public register(name: string, initialTime: number): number {
if (this.collisionLookup.has(name)) {
this.scene.logger.error({
message: `name "${name}" has already been used for another event name.`,
@@ -57,8 +56,6 @@ export class EditableTimeEvents implements TimeEvents {
}
this.collisionLookup.add(name);
-
- const initialTime = useThread().time();
if (!this.lookup[name]) {
this.didEventsChange = true;
this.lookup[name] = {
diff --git a/packages/core/src/scenes/timeEvents/ReadOnlyTimeEvents.ts b/packages/core/src/scenes/timeEvents/ReadOnlyTimeEvents.ts
index 8e429758..bf9b232e 100644
--- a/packages/core/src/scenes/timeEvents/ReadOnlyTimeEvents.ts
+++ b/packages/core/src/scenes/timeEvents/ReadOnlyTimeEvents.ts
@@ -2,7 +2,6 @@ import type {Scene} from '../Scene';
import type {TimeEvent} from './TimeEvent';
import type {TimeEvents} from './TimeEvents';
import {ValueDispatcher} from '../../events';
-import {useThread} from '../../utils';
/**
* Manages time events during rendering and presentation.
@@ -22,13 +21,13 @@ export class ReadOnlyTimeEvents implements TimeEvents {
// do nothing
}
- public register(name: string): number {
+ public register(name: string, initialTime: number): number {
let duration = this.lookup.get(name);
if (duration === undefined) {
const event = this.scene.meta.timeEvents
.get()
.find(event => event.name === name);
- duration = event ? event.targetTime - useThread().time() : 0;
+ duration = event ? event.targetTime - initialTime : 0;
this.lookup.set(name, duration);
}
diff --git a/packages/core/src/scenes/timeEvents/TimeEvents.ts b/packages/core/src/scenes/timeEvents/TimeEvents.ts
index a3821e40..fa15fac9 100644
--- a/packages/core/src/scenes/timeEvents/TimeEvents.ts
+++ b/packages/core/src/scenes/timeEvents/TimeEvents.ts
@@ -25,10 +25,12 @@ export interface TimeEvents {
* Register a time event.
*
* @param name - The name of the event.
+ * @param initialTime - Time in seconds, relative to the beginning of the
+ * scene, at which the event was registered.
*
* @returns The duration of the event in seconds.
*
* @internal
*/
- register(name: string): number;
+ register(name: string, initialTime: number): number;
}
diff --git a/packages/core/src/threading/Thread.ts b/packages/core/src/threading/Thread.ts
index 304ae8b5..c1a0c595 100644
--- a/packages/core/src/threading/Thread.ts
+++ b/packages/core/src/threading/Thread.ts
@@ -85,6 +85,7 @@ export class Thread {
child.parent = this;
child.isCanceled = false;
child.time(this.time());
+ child.fixedTime = this.fixedTime;
this.children.push(child);
setTaskName(child.runner, `unknown ${this.children.length}`);
diff --git a/packages/core/src/utils/useDuration.ts b/packages/core/src/utils/useDuration.ts
index 71958df5..a3bc79f4 100644
--- a/packages/core/src/utils/useDuration.ts
+++ b/packages/core/src/utils/useDuration.ts
@@ -1,4 +1,5 @@
import {useScene} from './useScene';
+import {useThread} from './useThread';
/**
* Register a time event and get its duration in seconds.
@@ -26,5 +27,6 @@ import {useScene} from './useScene';
*/
export function useDuration(name: string): number {
const scene = useScene();
- return scene.timeEvents.register(name);
+ const thread = useThread();
+ return scene.timeEvents.register(name, thread.time());
}