From d618666a255f03d2a13776f7d664ab3f31e4998e Mon Sep 17 00:00:00 2001 From: olimot Date: Sun, 13 Oct 2024 00:12:39 +0900 Subject: [PATCH] split cpu, gpu versions into folders and change vite setting --- src/{ => cpu}/cpu.ts | 14 +++++--------- src/{cpu.html => cpu/index.html} | 0 src/{ => gpu}/gpu.ts | 10 +++++----- src/{gpu.html => gpu/index.html} | 0 src/{ => gpu}/marching-cubes.vert | 0 src/index.html | 4 ++-- vite.config.ts | 9 ++++++++- 7 files changed, 20 insertions(+), 17 deletions(-) rename src/{ => cpu}/cpu.ts (92%) rename src/{cpu.html => cpu/index.html} (100%) rename src/{ => gpu}/gpu.ts (95%) rename src/{gpu.html => gpu/index.html} (100%) rename src/{ => gpu}/marching-cubes.vert (100%) diff --git a/src/cpu.ts b/src/cpu/cpu.ts similarity index 92% rename from src/cpu.ts rename to src/cpu/cpu.ts index 6f4a17e..83c2742 100644 --- a/src/cpu.ts +++ b/src/cpu/cpu.ts @@ -1,10 +1,9 @@ import { mat4, vec3 } from "gl-matrix"; -import { up } from "./config"; -import { listenInputEvents } from "./input"; -import polygonize from "./marching-cubes"; -import { moveXY, pinchOrbit, rotateOrbit } from "./orbital"; -import rawURL from "./u8-mri-200x160x160.raw?url"; -import triTableURL from "./u8-tri-table-256x16.bin?url"; +import { up } from "../config"; +import { listenInputEvents } from "../input"; +import polygonize from "../marching-cubes"; +import { moveXY, pinchOrbit, rotateOrbit } from "../orbital"; +import rawURL from "../u8-mri-200x160x160.raw?url"; const projection = mat4.create(); const target = vec3.fromValues(100, 80, 80); @@ -18,9 +17,6 @@ const field = { depth: 160, src: new Uint8Array(original.length), }; -export const triTable = await fetch(triTableURL).then(async (res) => { - return new Uint8Array(await res.arrayBuffer()); -}); for (let z = 0; z < field.depth; z += 1) { for (let y = 0; y < field.height; y += 1) { diff --git a/src/cpu.html b/src/cpu/index.html similarity index 100% rename from src/cpu.html rename to src/cpu/index.html diff --git a/src/gpu.ts b/src/gpu/gpu.ts similarity index 95% rename from src/gpu.ts rename to src/gpu/gpu.ts index 2968bf5..9a78f89 100644 --- a/src/gpu.ts +++ b/src/gpu/gpu.ts @@ -1,10 +1,10 @@ import { mat4, vec3 } from "gl-matrix"; -import { up } from "./config"; -import { listenInputEvents } from "./input"; +import { up } from "../config"; +import { listenInputEvents } from "../input"; import vertSrc from "./marching-cubes.vert?raw"; -import { moveXY, pinchOrbit, rotateOrbit } from "./orbital"; -import rawURL from "./u8-mri-200x160x160.raw?url"; -import triTableURL from "./u8-tri-table-256x16.bin?url"; +import { moveXY, pinchOrbit, rotateOrbit } from "../orbital"; +import rawURL from "../u8-mri-200x160x160.raw?url"; +import triTableURL from "../u8-tri-table-256x16.bin?url"; const projection = mat4.create(); const target = vec3.fromValues(100, 80, 80); diff --git a/src/gpu.html b/src/gpu/index.html similarity index 100% rename from src/gpu.html rename to src/gpu/index.html diff --git a/src/marching-cubes.vert b/src/gpu/marching-cubes.vert similarity index 100% rename from src/marching-cubes.vert rename to src/gpu/marching-cubes.vert diff --git a/src/index.html b/src/index.html index 3fa9bd2..8357fec 100644 --- a/src/index.html +++ b/src/index.html @@ -10,10 +10,10 @@

Marching Cubes

- CPU version (typescript) + CPU version (typescript)

- GPU version (webgl2) + GPU version (webgl2)

diff --git a/vite.config.ts b/vite.config.ts index a11f38f..0183980 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -4,8 +4,15 @@ export default defineConfig({ base: "/marching-cubes/", root: "src", build: { - target: 'esnext', + target: "esnext", outDir: "../dist", emptyOutDir: true, + rollupOptions: { + input: { + main: "src/index.html", + cpu: "src/cpu/index.html", + gpu: "src/gpu/index.html", + }, + }, }, });