Skip to content

Visualize Your Ideas With Code

feature: hot reloading

aarthificialf83397d1f899
diff --git a/src/Project.ts b/src/Project.ts
index 014563cd..62d43017 100644
--- a/src/Project.ts
+++ b/src/Project.ts
@@ -33,7 +33,7 @@ export class Project extends Stage {
private readonly scenes = new Set<Scene>();
public constructor(
- private runnerFactory: (project: Project) => Generator,
+ public runnerFactory: (project: Project) => Generator,
size: ProjectSize = ProjectSize.FullHD,
config: Partial<StageConfig> = {},
) {
diff --git a/src/player/Controls.ts b/src/player/Controls.ts
index 9acedc8b..9c58004d 100644
--- a/src/player/Controls.ts
+++ b/src/player/Controls.ts
@@ -56,6 +56,10 @@ export class Controls {
event.preventDefault();
this.player.requestNextFrame();
break;
+ case 'ArrowLeft':
+ event.preventDefault();
+ this.player.requestReset();
+ break;
}
});
diff --git a/src/player/Player.ts b/src/player/Player.ts
index 21b5b720..af565a60 100644
--- a/src/player/Player.ts
+++ b/src/player/Player.ts
@@ -20,7 +20,6 @@ export interface PlayerState {
}
interface PlayerCommands {
- next: boolean;
reset: boolean;
seek: number;
}
@@ -39,7 +38,6 @@ export class Player {
public get RenderChanged() {
return this.renderChanged.asEvent();
}
- public readonly project: Project;
private readonly stateChanged = new SimpleEventDispatcher<PlayerState>();
private readonly renderChanged =
@@ -61,7 +59,6 @@ export class Player {
};
private commands: PlayerCommands = {
- next: false,
reset: true,
seek: -1,
};
@@ -77,15 +74,13 @@ export class Player {
private consumeCommands(): PlayerCommands {
const commands = {...this.commands};
- this.commands.next = false;
this.commands.reset = false;
this.commands.seek = -1;
return commands;
}
- public constructor(factory: () => Project, audioSrc?: string) {
- this.project = factory();
+ public constructor(public readonly project: Project, audioSrc?: string) {
this.startTime = performance.now();
const savedState = localStorage.getItem(STORAGE_KEY);
@@ -134,8 +129,13 @@ export class Player {
return state;
}
+ public reload(): void {
+ this.requestReset();
+ this.requestSeek(this.project.frame);
+ }
+
public requestNextFrame(): void {
- this.commands.next = true;
+ this.commands.seek = this.state.frame + 1;
}
public requestReset(): void {
@@ -221,7 +221,6 @@ export class Player {
// do nothing if paused or is ahead of the audio.
if (
this.project.frame >= state.startFrame &&
- !commands.next &&
(state.paused ||
(state.speed === 1 &&
this.audio &&
diff --git a/src/styles/Style.ts b/src/styles/Style.ts
index 8884a46e..5c377baf 100644
--- a/src/styles/Style.ts
+++ b/src/styles/Style.ts
@@ -46,5 +46,5 @@ export function getFontColor(background: string) {
const brightness = Math.round(
(color.r * 299 + color.g * 587 + color.b * 114) / 1000,
);
- return brightness > 125 ? 'black' : 'white';
+ return brightness > 125 ? 'rgba(0, 0, 0, 0.87)' : 'rgba(0, 0, 0, 0.6)';
}
diff --git a/tools/loaders/label-loader.js b/tools/loaders/label-loader.js
index 28a127ec..9b6a236f 100644
--- a/tools/loaders/label-loader.js
+++ b/tools/loaders/label-loader.js
@@ -3,14 +3,14 @@ function loader(source) {
source.split(/\r?\n/).forEach(line => {
if (!line) return;
const parts = line.split('\t');
- json[parts[2]] = parseFloat(parts[0]);
+ json[parts[2].trim()] = parseFloat(parts[0]);
});
return `
const json = ${JSON.stringify(json)};
const proxy = new Proxy(json, {
get(target, prop) {
- if (target[prop]) {
+ if (prop in target) {
return target[prop];
} else {
console.warn('Missing label:', prop);
diff --git a/tools/serve.mjs b/tools/serve.mjs
index 968b5420..076becee 100644
--- a/tools/serve.mjs
+++ b/tools/serve.mjs
@@ -80,13 +80,7 @@ const server = new WebpackDevServer(
static: path.resolve(__dirname, '../public'),
compress: true,
port: 9000,
- setupMiddlewares: (middlewares, devServer) => {
- devServer.app.get('/test', (_, response) => {
- response.send('test?');
- });
-
- return middlewares;
- }
+ hot: true,
},
compiler,
);