@multiplekex/shallot 0.2.4 → 0.3.0

package/src/standard/{render → raytracing}/triangle.ts

@@ -1,4 +1,4 @@
-import type { MeshData } from "./mesh";
+import type { MeshData } from "../render/mesh";
 import type { Vec3, Triangle } from "./bvh/structs";
 
 export type { Triangle };

package/src/standard/render/camera.ts

@@ -1,11 +1,7 @@
 import { setTraits } from "../../core/component";
 import { perspective, orthographic, multiply, invert, extractFrustumPlanes } from "../../core/math";
 import { WorldTransform } from "../transforms";
-
-export const RenderMode = {
-    Raster: 0,
-    Raytracing: 1,
-} as const;
+import { SCENE_UNIFORM_SIZE, SKY_UNIFORM_SIZE } from "./scene";
 
 export const CameraMode = {
     Perspective: 0,
@@ -18,7 +14,6 @@ export const Camera = {
     far: [] as number[],
     active: [] as number[],
     clearColor: [] as number[],
-    renderMode: [] as number[],
     mode: [] as number[],
     size: [] as number[],
 };
@@ -30,7 +25,6 @@ setTraits(Camera, {
         far: 1000,
         active: 1,
         clearColor: 0x1a1a1a,
-        renderMode: RenderMode.Raster,
         mode: CameraMode.Perspective,
         size: 5,
     }),
@@ -46,8 +40,6 @@ setTraits(Tonemap, {
 
 export const FXAA = {};
 
-export const Raytracing = {};
-
 export const Vignette = {
     strength: [] as number[],
     inner: [] as number[],
@@ -80,17 +72,7 @@ setTraits(Quantize, {
     defaults: () => ({ bands: 8 }),
 });
 
-export const Shadows = {
-    softness: [] as number[],
-    samples: [] as number[],
-};
-
-setTraits(Shadows, {
-    defaults: () => ({
-        softness: 0.5,
-        samples: 1,
-    }),
-});
+export const Shadows = {};
 
 export const Reflections = {
     depth: [] as number[],
@@ -199,7 +181,7 @@ setTraits(Viewport, {
     defaults: () => ({ width: 0, height: 0 }),
 });
 
-export interface SkyParams {
+interface SkyParams {
     zenith: number;
     horizon: number;
 }
@@ -212,37 +194,53 @@ export function unpackColor(packed: number): { r: number; g: number; b: number }
     };
 }
 
-export interface HazeParams {
+interface HazeParams {
     density: number;
     color: number;
 }
 
-export interface MoonParams {
+interface MoonParams {
     phase: number;
     glow: number;
     azimuth: number;
     elevation: number;
 }
 
-export interface StarsParams {
+interface StarsParams {
     intensity: number;
     amount: number;
 }
 
-export interface CloudsParams {
+interface CloudsParams {
     coverage: number;
     density: number;
     height: number;
     color: number;
 }
 
-export interface SunParams {
+interface SunParams {
     size: number;
     glow: number;
     color: number;
 }
 
-const sceneBuffer = new ArrayBuffer(512);
+export function getClearColor(eid: number): { r: number; g: number; b: number } {
+    const packed = Camera.clearColor[eid];
+    return {
+        r: ((packed >> 16) & 0xff) / 255,
+        g: ((packed >> 8) & 0xff) / 255,
+        b: (packed & 0xff) / 255,
+    };
+}
+
+export function hasSkyComponent(
+    state: { hasComponent(eid: number, c: object): boolean },
+    eid: number
+): boolean {
+    return state.hasComponent(eid, Sky);
+}
+
+const sceneBuffer = new ArrayBuffer(SCENE_UNIFORM_SIZE);
 const scene = new Float32Array(sceneBuffer);
 const sceneU32 = new Uint32Array(sceneBuffer);
 
@@ -256,13 +254,7 @@ export function uploadCamera(
     shadowSamples: number = 1,
     reflectionDepth: number = 0,
     refractionDepth: number = 0,
-    instanceCount: number = 0,
-    haze?: HazeParams,
-    sky?: SkyParams,
-    moon?: MoonParams,
-    stars?: StarsParams,
-    clouds?: CloudsParams,
-    sun?: SunParams
+    instanceCount: number = 0
 ): void {
     const aspect = width / height;
     const proj =
@@ -273,114 +265,112 @@ export function uploadCamera(
     const view = invert(world);
     const viewProj = multiply(proj, view);
 
-    // viewProj (0-63)
     scene.set(viewProj, 0);
-    // world (64-127)
     scene.set(world, 16);
 
-    // clearColor (176-191) - note: 128-175 is light uniforms, written separately
     const clearColorPacked = Camera.clearColor[eid];
     scene[44] = ((clearColorPacked >> 16) & 0xff) / 255;
     scene[45] = ((clearColorPacked >> 8) & 0xff) / 255;
     scene[46] = (clearColorPacked & 0xff) / 255;
     scene[47] = 1.0;
 
-    // cameraMode, cameraSize, viewport (192-207)
     scene[48] = Camera.mode[eid];
     scene[49] = Camera.size[eid];
     scene[50] = width;
     scene[51] = height;
 
-    // fov, near, far, shadowSoftness (208-223)
     scene[52] = Camera.fov[eid];
     scene[53] = Camera.near[eid];
     scene[54] = Camera.far[eid];
     scene[55] = shadowSoftness;
 
-    // shadowSamples, reflectionDepth, refractionDepth, instanceCount (224-239)
     sceneU32[56] = shadowSamples;
     sceneU32[57] = reflectionDepth;
     sceneU32[58] = refractionDepth;
     sceneU32[59] = instanceCount;
 
-    // hazeDensity (240-255)
-    scene[60] = haze?.density ?? 0;
-    scene[61] = 0;
-    scene[62] = 0;
-    scene[63] = 0;
+    const planes = extractFrustumPlanes(viewProj);
+    scene.set(planes, 64);
+
+    device.queue.writeBuffer(buffer, 0, scene, 0, 32);
+    device.queue.writeBuffer(buffer, 176, scene, 44, 44);
+}
+
+const skyArrayBuffer = new ArrayBuffer(SKY_UNIFORM_SIZE);
+const skyF32 = new Float32Array(skyArrayBuffer);
+
+export function uploadSky(
+    device: GPUDevice,
+    buffer: GPUBuffer,
+    haze?: HazeParams,
+    sky?: SkyParams,
+    moon?: MoonParams,
+    stars?: StarsParams,
+    clouds?: CloudsParams,
+    sun?: SunParams
+): void {
+    skyF32[0] = haze?.density ?? 0;
+    skyF32[1] = 0;
+    skyF32[2] = 0;
+    skyF32[3] = 0;
 
-    // hazeColor (256-271)
     const hazeColorPacked = haze?.color ?? 0x8090b0;
-    scene[64] = ((hazeColorPacked >> 16) & 0xff) / 255;
-    scene[65] = ((hazeColorPacked >> 8) & 0xff) / 255;
-    scene[66] = (hazeColorPacked & 0xff) / 255;
-    scene[67] = 1.0;
+    skyF32[4] = ((hazeColorPacked >> 16) & 0xff) / 255;
+    skyF32[5] = ((hazeColorPacked >> 8) & 0xff) / 255;
+    skyF32[6] = (hazeColorPacked & 0xff) / 255;
+    skyF32[7] = 1.0;
 
-    // skyZenith (272-287)
     const zenithPacked = sky?.zenith ?? 0;
-    scene[68] = ((zenithPacked >> 16) & 0xff) / 255;
-    scene[69] = ((zenithPacked >> 8) & 0xff) / 255;
-    scene[70] = (zenithPacked & 0xff) / 255;
-    scene[71] = sky ? 1.0 : 0.0;
+    skyF32[8] = ((zenithPacked >> 16) & 0xff) / 255;
+    skyF32[9] = ((zenithPacked >> 8) & 0xff) / 255;
+    skyF32[10] = (zenithPacked & 0xff) / 255;
+    skyF32[11] = sky ? 1.0 : 0.0;
 
-    // skyHorizon (288-303)
     const horizonPacked = sky?.horizon ?? 0;
-    scene[72] = ((horizonPacked >> 16) & 0xff) / 255;
-    scene[73] = ((horizonPacked >> 8) & 0xff) / 255;
-    scene[74] = (horizonPacked & 0xff) / 255;
-    scene[75] = 1.0;
+    skyF32[12] = ((horizonPacked >> 16) & 0xff) / 255;
+    skyF32[13] = ((horizonPacked >> 8) & 0xff) / 255;
+    skyF32[14] = (horizonPacked & 0xff) / 255;
+    skyF32[15] = 1.0;
 
-    // frustumPlanes (304-399)
-    const planes = extractFrustumPlanes(viewProj);
-    scene.set(planes, 76);
-
-    // moonParams (400-415)
-    scene[100] = moon?.phase ?? 0.5;
-    scene[101] = moon?.glow ?? 0.3;
-    scene[102] = moon ? 1.0 : 0.0;
-    scene[103] = 0.0;
+    skyF32[16] = moon?.phase ?? 0.5;
+    skyF32[17] = moon?.glow ?? 0.3;
+    skyF32[18] = moon ? 1.0 : 0.0;
+    skyF32[19] = 0.0;
 
-    // moonDirection (416-431)
     const moonAzimuth = ((moon?.azimuth ?? 45) * Math.PI) / 180;
     const moonElevation = ((moon?.elevation ?? 30) * Math.PI) / 180;
     const moonCosEl = Math.cos(moonElevation);
-    scene[104] = Math.sin(moonAzimuth) * moonCosEl;
-    scene[105] = Math.sin(moonElevation);
-    scene[106] = Math.cos(moonAzimuth) * moonCosEl;
-    scene[107] = 0.0;
-
-    // starParams (432-447)
-    scene[108] = stars?.intensity ?? 0.8;
-    scene[109] = stars?.amount ?? 0.5;
-    scene[110] = stars ? 1.0 : 0.0;
-    scene[111] = 0.0;
-
-    // cloudParams (448-463)
-    scene[112] = clouds?.coverage ?? 0;
-    scene[113] = clouds?.density ?? 0;
-    scene[114] = clouds?.height ?? 0;
-    scene[115] = clouds ? 1.0 : 0.0;
-
-    // cloudColor (464-479)
+    skyF32[20] = Math.sin(moonAzimuth) * moonCosEl;
+    skyF32[21] = Math.sin(moonElevation);
+    skyF32[22] = Math.cos(moonAzimuth) * moonCosEl;
+    skyF32[23] = 0.0;
+
+    skyF32[24] = stars?.intensity ?? 0.8;
+    skyF32[25] = stars?.amount ?? 0.5;
+    skyF32[26] = stars ? 1.0 : 0.0;
+    skyF32[27] = 0.0;
+
+    skyF32[28] = clouds?.coverage ?? 0;
+    skyF32[29] = clouds?.density ?? 0;
+    skyF32[30] = clouds?.height ?? 0;
+    skyF32[31] = clouds ? 1.0 : 0.0;
+
     const cloudColorPacked = clouds?.color ?? 0xffffff;
-    scene[116] = ((cloudColorPacked >> 16) & 0xff) / 255;
-    scene[117] = ((cloudColorPacked >> 8) & 0xff) / 255;
-    scene[118] = (cloudColorPacked & 0xff) / 255;
-    scene[119] = 0.0;
-
-    // sunParams (480-495)
-    scene[120] = sun?.size ?? 1.0;
-    scene[121] = sun?.glow ?? 0.5;
-    scene[122] = sun && sun.color !== 0 ? 1.0 : 0.0;
-    scene[123] = 0.0;
-
-    // sunVisualColor (496-511)
+    skyF32[32] = ((cloudColorPacked >> 16) & 0xff) / 255;
+    skyF32[33] = ((cloudColorPacked >> 8) & 0xff) / 255;
+    skyF32[34] = (cloudColorPacked & 0xff) / 255;
+    skyF32[35] = 0.0;
+
+    skyF32[36] = sun?.size ?? 1.0;
+    skyF32[37] = sun?.glow ?? 0.5;
+    skyF32[38] = sun && sun.color !== 0 ? 1.0 : 0.0;
+    skyF32[39] = 0.0;
+
     const sunColorPacked = sun?.color ?? 0xffffff;
-    scene[124] = ((sunColorPacked >> 16) & 0xff) / 255;
-    scene[125] = ((sunColorPacked >> 8) & 0xff) / 255;
-    scene[126] = (sunColorPacked & 0xff) / 255;
-    scene[127] = 0.0;
+    skyF32[40] = ((sunColorPacked >> 16) & 0xff) / 255;
+    skyF32[41] = ((sunColorPacked >> 8) & 0xff) / 255;
+    skyF32[42] = (sunColorPacked & 0xff) / 255;
+    skyF32[43] = 0.0;
 
-    device.queue.writeBuffer(buffer, 0, scene, 0, 32);
-    device.queue.writeBuffer(buffer, 176, scene, 44, 84);
+    device.queue.writeBuffer(buffer, 0, skyArrayBuffer);
 }

package/src/standard/render/data.ts

@@ -38,7 +38,7 @@ fn main(@builtin(global_invocation_id) gid: vec3<u32>) {
 }
 `;
 
-export interface DataConfig {
+interface DataConfig {
     colors: GPUBuffer;
     pbr: GPUBuffer;
     emission: GPUBuffer;