@multiplekex/shallot 0.2.5 → 0.3.0

package/src/standard/raytracing/shaders.ts

@@ -1,7 +1,7 @@
 import type { SurfaceData } from "../render/surface";
 import {
     compileVertexBody,
-    WGSL_LIGHTING_CALC,
+    SPECULAR_WGSL,
     SKY_DIR_WGSL,
     HAZE_WGSL,
     SKY_WGSL,
@@ -22,26 +22,6 @@ import {
     DATA_STRUCT_WGSL,
 } from "../render/surface/structs";
 
-const SPECULAR_WGSL = /* wgsl */ `
-const DIELECTRIC_F0: f32 = 0.04;
-
-fn blinnPhongSpecular(N: vec3<f32>, L: vec3<f32>, V: vec3<f32>, roughness: f32) -> f32 {
-    let H = normalize(L + V);
-    let NdotH = max(dot(N, H), 0.0);
-    let shininess = pow(2.0, (1.0 - roughness) * 10.0);
-    let intensity = (1.0 - roughness) * (1.0 - roughness);
-    return pow(NdotH, shininess) * intensity;
-}
-
-fn schlickFresnel(cosTheta: f32, F0: vec3<f32>) -> vec3<f32> {
-    return F0 + (vec3(1.0) - F0) * pow(1.0 - cosTheta, 5.0);
-}
-
-fn computeF0Vec(baseColor: vec3<f32>, metallic: f32) -> vec3<f32> {
-    return mix(vec3(DIELECTRIC_F0), baseColor, metallic);
-}
-`;
-
 const REFRACTION_WGSL = /* wgsl */ `
 fn refractRay(I: vec3<f32>, N: vec3<f32>, eta: f32) -> vec4<f32> {
     let cosI = -dot(I, N);
@@ -140,13 +120,8 @@ fn sampleSoftShadow(origin: vec3<f32>, sunDir: vec3<f32>, softness: f32, samples
 }
 `;
 
-function compileApplyLighting(lit?: boolean, shadows?: boolean, reflections?: boolean): string {
-    if (lit === false) {
-        return "return surface.baseColor;";
-    }
-
+function compileApplyLighting(shadows?: boolean, reflections?: boolean): string {
     if (shadows && reflections) {
-        // shadowFactor is now passed as parameter, computed once in main kernel
         return `
     let V = -rayDir;
     let L = -scene.sunDirection.xyz;
@@ -186,7 +161,7 @@ function compileApplyLighting(lit?: boolean, shadows?: boolean, reflections?: bo
 
     let F0 = computeF0Vec(surface.baseColor, surface.metallic);
     let F = schlickFresnel(NdotV, F0);
-    let diffuseWeight = (1.0 - surface.metallic) * (vec3(1.0) - F);
+    let diffuseWeight = 1.0 - surface.metallic;
     let ambient = scene.ambientColor.rgb * scene.ambientColor.a;
     let sunDiffuse = scene.sunColor.rgb * NdotL * shadowFactor;
     let diffuseColor = surface.baseColor * (ambient + sunDiffuse) * diffuseWeight + surface.emission;
@@ -226,13 +201,25 @@ function compileApplyLighting(lit?: boolean, shadows?: boolean, reflections?: bo
     return finalColor;`;
     }
 
-    return `${WGSL_LIGHTING_CALC}
-    return surface.baseColor * lighting + surface.emission;`;
+    return `
+    let V = -rayDir;
+    let L = -scene.sunDirection.xyz;
+    let NdotL = max(dot(surface.normal, L), 0.0);
+    let NdotV = max(dot(surface.normal, V), 0.0);
+    let F0 = computeF0Vec(surface.baseColor, surface.metallic);
+    let F = schlickFresnel(NdotV, F0);
+    let diffuseWeight = 1.0 - surface.metallic;
+    let ambient = scene.ambientColor.rgb * scene.ambientColor.a;
+    let sunDiffuse = scene.sunColor.rgb * NdotL;
+    let diffuseColor = surface.baseColor * (ambient + sunDiffuse) * diffuseWeight + surface.emission;
+    let specTerm = blinnPhongSpecular(surface.normal, L, V, surface.roughness);
+    let specular = scene.sunColor.rgb * specTerm * F * NdotL;
+    return diffuseColor + specular;`;
 }
 
 const EPSILON = 1e-7;
 
-export const RT_STRUCTS = /* wgsl */ `
+const RT_STRUCTS = /* wgsl */ `
 ${RAY_STRUCT_WGSL}
 ${HIT_RESULT_STRUCT_WGSL}
 ${SURFACE_DATA_STRUCT_WGSL}
@@ -241,7 +228,7 @@ ${SKY_STRUCT_WGSL}
 ${DATA_STRUCT_WGSL}
 `;
 
-export const RT_BINDINGS = /* wgsl */ `
+const RT_BINDINGS = /* wgsl */ `
 @group(0) @binding(0) var<uniform> scene: Scene;
 @group(0) @binding(1) var<storage, read> data: array<Data>;
 @group(0) @binding(2) var output_scene: texture_storage_2d<rgba8unorm, write>;
@@ -250,7 +237,7 @@ export const RT_BINDINGS = /* wgsl */ `
 @group(0) @binding(5) var<uniform> sky: Sky;
 `;
 
-export const RT_UTILS = /* wgsl */ `
+const RT_UTILS = /* wgsl */ `
 fn getData(eid: u32) -> Data {
     return data[eid];
 }
@@ -272,7 +259,7 @@ fn getInstanceCount() -> u32 {
 }
 `;
 
-export const RT_RAY_GEN = /* wgsl */ `
+const RT_RAY_GEN = /* wgsl */ `
 ${SKY_DIR_WGSL}
 
 struct PrimaryRay {
@@ -323,7 +310,7 @@ fn generateRay(screenX: f32, screenY: f32) -> PrimaryRay {
 }
 `;
 
-export const RT_INTERSECTION = /* wgsl */ `
+const RT_INTERSECTION = /* wgsl */ `
 const EPSILON: f32 = ${EPSILON};
 `;
 
@@ -334,7 +321,7 @@ export function compileRTSurface(data: SurfaceData): string {
 function compileSurfaceVariant(id: number, data: SurfaceData): string {
     const vertexBody = compileVertexBody(data.vertex);
     const fragmentBody = data.fragment ?? "";
-    const lightingCode = compileApplyLighting(data.lit, true, false);
+    const lightingCode = compileApplyLighting(true, false);
 
     return `
 fn userVertexTransform_${id}(worldPos: vec3<f32>, normal: vec3<f32>, eid: u32) -> vec3<f32> {
@@ -809,7 +796,3 @@ fn main(@builtin(global_invocation_id) gid: vec3<u32>) {
 }
 `;
 }
-
-export function compileForwardShader(surface: SurfaceData): string {
-    return compileUberShader([surface]);
-}

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,31 +194,31 @@ 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;
@@ -258,7 +240,7 @@ export function hasSkyComponent(
     return state.hasComponent(eid, Sky);
 }
 
-const sceneBuffer = new ArrayBuffer(352);
+const sceneBuffer = new ArrayBuffer(SCENE_UNIFORM_SIZE);
 const scene = new Float32Array(sceneBuffer);
 const sceneU32 = new Uint32Array(sceneBuffer);
 
@@ -314,7 +296,7 @@ export function uploadCamera(
     device.queue.writeBuffer(buffer, 176, scene, 44, 44);
 }
 
-const skyArrayBuffer = new ArrayBuffer(176);
+const skyArrayBuffer = new ArrayBuffer(SKY_UNIFORM_SIZE);
 const skyF32 = new Float32Array(skyArrayBuffer);
 
 export function uploadSky(

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;

package/src/standard/render/index.ts

@@ -7,7 +7,6 @@ import {
     Camera,
     Tonemap,
     FXAA,
-    Raytracing,
     Vignette,
     Bloom,
     Quantize,
@@ -25,6 +24,33 @@ import {
     uploadSky,
 } from "./camera";
 import { AmbientLight, DirectionalLight, packLightUniforms } from "./light";
+
+export interface ShadowSettingsProvider {
+    softness: number[];
+    samples: number[];
+    isActive: (state: State, eid: number) => boolean;
+}
+
+const shadowSettingsProviders: ShadowSettingsProvider[] = [];
+
+export function registerShadowSettings(settings: ShadowSettingsProvider): void {
+    shadowSettingsProviders.push(settings);
+}
+
+export function getShadowSettings(
+    state: State,
+    eid: number
+): { softness: number; samples: number } {
+    for (const provider of shadowSettingsProviders) {
+        if (provider.isActive(state, eid)) {
+            return {
+                softness: provider.softness[eid] ?? 0,
+                samples: Math.max(1, provider.samples[eid] ?? 16),
+            };
+        }
+    }
+    return { softness: 0, samples: 16 };
+}
 import {
     Mesh,
     MeshShapes,
@@ -34,6 +60,7 @@ import {
     MeshEmission,
     MeshVolumes,
     createShapeAtlas,
+    getMeshVersion,
 } from "./mesh";
 import { Surface, SurfaceIds } from "./surface";
 import { createSceneBuffer, createSkyBuffer, ensureTextures } from "./scene";
@@ -45,10 +72,8 @@ import { createDataNode } from "./data";
 export {
     Camera,
     CameraMode,
-    RenderMode,
     Tonemap,
     FXAA,
-    Raytracing,
     Vignette,
     Bloom,
     Quantize,
@@ -67,14 +92,25 @@ export {
     uploadSky,
 } from "./camera";
 export { AmbientLight, DirectionalLight } from "./light";
-export { Mesh, MeshShape, Volume, mesh, getMesh, clearMeshes } from "./mesh";
-export { createBox } from "./mesh/box";
-export { createSphere } from "./mesh/sphere";
-export { createPlane } from "./mesh/plane";
-export type { MeshData } from "./mesh";
+export {
+    Mesh,
+    MeshShape,
+    Volume,
+    mesh,
+    getMesh,
+    getMeshByName,
+    getMeshVersion,
+    meshCount,
+    clearMeshes,
+    computeShapeAABB,
+    createBox,
+    createSphere,
+    createPlane,
+} from "./mesh";
+export type { MeshData, AABB } from "./mesh";
 export { Surface, SurfaceType } from "./surface";
 
-export { surface, compose } from "./surface";
+export { surface, getSurfaceByName, compose } from "./surface";
 export type { SurfaceData } from "./surface";
 
 export { Pass, registerDraw, unregisterDraw, getDrawsByPass, Draws } from "./pass";
@@ -99,6 +135,7 @@ export interface Render {
     width: number;
     height: number;
     entityCount: number;
+    meshVersion: number;
     scene: GPUBuffer;
     sky: GPUBuffer;
     matrices: GPUBuffer;
@@ -168,14 +205,33 @@ const RenderSystem: System = {
             resources.textureViews
         );
 
+        const currentMeshVersion = getMeshVersion();
+        if (currentMeshVersion !== render.meshVersion) {
+            render.meshVertices.destroy();
+            render.meshIndices.destroy();
+            render.meshMeta.destroy();
+            const shapeAtlas = createShapeAtlas(device);
+            render.meshVertices = shapeAtlas.vertices;
+            render.meshIndices = shapeAtlas.indices;
+            render.meshMeta = shapeAtlas.meta;
+            render.meshVersion = currentMeshVersion;
+        }
+
         render.entityCount = state.maxEid + 1;
         const uploadCount = render.entityCount;
 
         for (const eid of state.query([Camera])) {
             if (Camera.active[eid]) {
                 const hasShadows = state.hasComponent(eid, Shadows);
-                const shadowSoftness = hasShadows ? Shadows.softness[eid] : 0;
-                const shadowSamples = hasShadows ? Math.max(1, Shadows.samples[eid]) : 0;
+
+                let shadowSoftness = 0;
+                let shadowSamples = 0;
+
+                if (hasShadows) {
+                    const shadowSettings = getShadowSettings(state, eid);
+                    shadowSoftness = shadowSettings.softness;
+                    shadowSamples = shadowSettings.samples;
+                }
 
                 const hasReflections = state.hasComponent(eid, Reflections);
                 const reflectionDepth = hasReflections
@@ -368,7 +424,6 @@ export const RenderPlugin: Plugin = {
         DirectionalLight,
         Tonemap,
         FXAA,
-        Raytracing,
         Vignette,
         Bloom,
         Quantize,
@@ -412,6 +467,7 @@ export const RenderPlugin: Plugin = {
             surfaces: createPropertyBuffer(MAX_ENTITIES * 4, "surfaces"),
             data: createPropertyBuffer(MAX_ENTITIES * 64, "data"),
             entityCount: 1,
+            meshVersion: getMeshVersion(),
             postProcess: {
                 tonemap: false,
                 exposure: 1.0,

package/src/standard/render/light.ts

@@ -36,12 +36,12 @@ export function normalizeDirection(x: number, y: number, z: number): [number, nu
     return [x / len, y / len, z / len];
 }
 
-export interface AmbientLightData {
+interface AmbientLightData {
     color: number;
     intensity: number;
 }
 
-export interface DirectionalLightData {
+interface DirectionalLightData {
     color: number;
     intensity: number;
     directionX: number;