Skip to content

The VS Code of video editing, built for agents.

TypeScript

Refactor Canvas component to integrate EngineCanvas and update drag-and-drop event handling; enhance HomePage with KootaEngineProvider for improved project management.

konstantin-paulus577c50253f45
diff --git a/apps/web/src/components/canvas/canvas.tsx b/apps/web/src/components/canvas/canvas.tsx
index 3df07478..6225de31 100644
--- a/apps/web/src/components/canvas/canvas.tsx
+++ b/apps/web/src/components/canvas/canvas.tsx
@@ -4,6 +4,7 @@
import { useEngine } from "@/context/engine";
import { loadAsset, getAssetFile } from "@/components/engine";
+import { EngineCanvas } from "@/engine";
import { Toolbar } from "./toolbar";
import { DrawOverlay } from "./draw-overlay";
import { toast } from "somoto"
@@ -146,18 +147,23 @@ export function Canvas() {
return (
<div class="relative size-full bg-background">
- <div class="absolute inset-0">
+ <div
+ class="absolute inset-0"
+ on:drop={handleDropEvent}
+ on:dragover={handleDragOver}
+ >
<Toolbar />
<DrawOverlay />
<SceneInitOverlay
onDrop={handleDropEvent}
onDragOver={handleDragOver}
/>
+ <EngineCanvas />
+
+ {/** Deprecated bitecs canvas */}
<canvas
id={MAIN_CANVAS_ID}
- class="absolute inset-0 z-1"
- on:drop={handleDropEvent}
- on:dragover={handleDragOver}
+ class="absolute inset-0 opacity-0 pointer-events-none"
/>
</div>
</div>
diff --git a/apps/web/src/engine/canvas.tsx b/apps/web/src/engine/canvas.tsx
new file mode 100644
index 00000000..330ad96e
--- /dev/null
+++ b/apps/web/src/engine/canvas.tsx
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import { onMount, type JSX } from 'solid-js';
+import { createResizeObserver } from '@solid-primitives/resize-observer';
+
+import { useEngineContext } from './context';
+
+/**
+ * Mounts the engine onto a canvas sized to fill its container, and starts
+ * the tick loop. Must render under an EngineProvider.
+ */
+export function EngineCanvas(): JSX.Element {
+ const engine = useEngineContext();
+ let canvasRef!: HTMLCanvasElement;
+ let containerRef!: HTMLDivElement;
+
+ createResizeObserver(
+ () => containerRef,
+ ({ width, height }) => engine.resize(width, height, window.devicePixelRatio)
+ );
+
+ onMount(() => {
+ engine.mount(canvasRef);
+ engine.start();
+ });
+
+ return (
+ <div ref={containerRef} class="relative size-full">
+ <canvas ref={canvasRef} class="absolute inset-0" />
+ </div>
+ );
+}
diff --git a/apps/web/src/engine/index.ts b/apps/web/src/engine/index.ts
index 04befd9d..01cca498 100644
--- a/apps/web/src/engine/index.ts
+++ b/apps/web/src/engine/index.ts
@@ -4,4 +4,5 @@
export * from './create-engine';
export * from './context';
+export * from './canvas';
export * from './hooks';
diff --git a/apps/web/src/pages/home.tsx b/apps/web/src/pages/home.tsx
index 3938efa5..6fae2930 100644
--- a/apps/web/src/pages/home.tsx
+++ b/apps/web/src/pages/home.tsx
@@ -14,6 +14,7 @@ import { useProjectId } from '@/hooks/use-project-id';
import { useSearchParams } from '@solidjs/router';
import { ECSProvider } from '@/context/ecs';
import { TimelineProvider } from '@/context/timeline';
+import { EngineProvider as KootaEngineProvider } from '@/engine';
export function HomePage() {
const projectId = useProjectId();
@@ -25,24 +26,26 @@ export function HomePage() {
*/
<Show when={projectId()} keyed>
{(id) => (
- <EngineProvider projectId={id}>
- <EditorApiProvider>
- <TimelineProvider>
- <ECSProvider>
- <ExportProvider>
- <PromptInputProvider>
- <LayoutProvider>
- <EditorPage />
- </LayoutProvider>
- </PromptInputProvider>
- <Show when={!params.project || !!params.dashboard}>
- <Dashboard />
- </Show>
- </ExportProvider>
- </ECSProvider>
- </TimelineProvider>
- </EditorApiProvider>
- </EngineProvider>
+ <KootaEngineProvider projectId={id}>
+ <EngineProvider projectId={id}>
+ <EditorApiProvider>
+ <TimelineProvider>
+ <ECSProvider>
+ <ExportProvider>
+ <PromptInputProvider>
+ <LayoutProvider>
+ <EditorPage />
+ </LayoutProvider>
+ </PromptInputProvider>
+ <Show when={!params.project || !!params.dashboard}>
+ <Dashboard />
+ </Show>
+ </ExportProvider>
+ </ECSProvider>
+ </TimelineProvider>
+ </EditorApiProvider>
+ </EngineProvider>
+ </KootaEngineProvider>
)}
</Show>
)