@woosh/meep-engine 3.61.0 → 3.61.1

package/src/shade/renderer/shader/chunk/geometry/vec2/chunk_unit_u32_to_vec2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_unit_u32_to_vec2.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shader/chunk/geometry/vec2/chunk_unit_u32_to_vec2.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,qCAFU,SAAS,CAUlB;0BAfyB,gCAAgC"}
+{"version":3,"file":"chunk_unit_u32_to_vec2.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shader/chunk/geometry/vec2/chunk_unit_u32_to_vec2.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,qCAFU,SAAS,CASlB;0BAdyB,gCAAgC"}

package/src/shade/renderer/shader/chunk/geometry/vec2/chunk_unit_u32_to_vec2.js

@@ -1,16 +1,15 @@
-import { CodeChunk } from "../../../compiler/CodeChunk.js";
-
-/**
- * Quantized vec2 decoding, vector values must be in [0..1] range
- * @see https://github.com/zhangjiangen11/godot/blob/b64ac6341347906dacdda712dc78b574334ff4af/servers/rendering/renderer_rd/shaders/skeleton.glsl#L66
- * @type {CodeChunk}
- */
-export const chunk_unit_u32_to_vec2 = CodeChunk.from(
-//language=WGSL
-    `
-fn unit_u32_to_vec2(base: u32) -> vec2<f32>{
-    let decode = (vec2(base) >> vec2(0u, 16u)) & vec2(0xFFFFu, 0xFFFFu);
-	return vec2<f32>(decode) / vec2(65535.0, 65535.0) * 2.0 - 1.0;
-}
-    `
-)
+import { CodeChunk } from "../../../compiler/CodeChunk.js";
+
+/**
+ * Quantized vec2 decoding, vector values must be in [0..1] range
+ * @see https://github.com/zhangjiangen11/godot/blob/b64ac6341347906dacdda712dc78b574334ff4af/servers/rendering/renderer_rd/shaders/skeleton.glsl#L66
+ * @type {CodeChunk}
+ */
+export const chunk_unit_u32_to_vec2 = CodeChunk.from(
+//language=WGSL
+    `
+fn unit_u32_to_vec2(base: u32) -> vec2<f32>{
+    return unpack2x16unorm(base) * 2.0 - 1.0;
+}
+    `
+)

package/src/shade/renderer/shader/chunk/geometry/vec2/chunk_unit_vec2_to_u32.d.ts

@@ -1,5 +1,4 @@
 /**
- * TODO consider pack2x16unorm instead
  * Quantized vec2 encoding, values must be in [0..1] range
  * @see https://github.com/zhangjiangen11/godot/blob/b64ac6341347906dacdda712dc78b574334ff4af/servers/rendering/renderer_rd/shaders/skeleton.glsl#L93
  * @type {CodeChunk}

package/src/shade/renderer/shader/chunk/geometry/vec2/chunk_unit_vec2_to_u32.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_unit_vec2_to_u32.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shader/chunk/geometry/vec2/chunk_unit_vec2_to_u32.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,qCAFU,SAAS,CAUjB;0BAhBwB,gCAAgC"}
+{"version":3,"file":"chunk_unit_vec2_to_u32.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shader/chunk/geometry/vec2/chunk_unit_vec2_to_u32.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,qCAFU,SAAS,CASjB;0BAdwB,gCAAgC"}

package/src/shade/renderer/shader/chunk/geometry/vec2/chunk_unit_vec2_to_u32.js

@@ -1,18 +1,15 @@
-import { CodeChunk } from "../../../compiler/CodeChunk.js";
-
-/**
- * TODO consider pack2x16unorm instead
- * Quantized vec2 encoding, values must be in [0..1] range
- * @see https://github.com/zhangjiangen11/godot/blob/b64ac6341347906dacdda712dc78b574334ff4af/servers/rendering/renderer_rd/shaders/skeleton.glsl#L93
- * @type {CodeChunk}
- */
-export const chunk_unit_vec2_to_u32 = CodeChunk.from(
-    //language=WGSL
-    `
-fn unit_vec2_to_u32(base:vec2<f32>) -> u32{
-    let enc = vec2<u32>(clamp(vec2<i32>(base * vec2(65535, 65535)), vec2(0), vec2(0xFFFF, 0xFFFF))) << vec2(0u, 16u);
-    return enc.x | enc.y;
-}
-    `
-);
-
+import { CodeChunk } from "../../../compiler/CodeChunk.js";
+
+/**
+ * Quantized vec2 encoding, values must be in [0..1] range
+ * @see https://github.com/zhangjiangen11/godot/blob/b64ac6341347906dacdda712dc78b574334ff4af/servers/rendering/renderer_rd/shaders/skeleton.glsl#L93
+ * @type {CodeChunk}
+ */
+export const chunk_unit_vec2_to_u32 = CodeChunk.from(
+    //language=WGSL
+    `
+fn unit_vec2_to_u32(base:vec2<f32>) -> u32{
+    return pack2x16unorm(base);
+}
+    `
+);

package/src/shade/wgsl/emulator/WGSLJavaScriptCompiler.js

@@ -3232,7 +3232,14 @@ function inferBuiltinReturnType(name, args) {
     // Both gathers return the four texels of a 2x2 footprint. Saying so here matters more than
     // for most builtins: the shadow chunks immediately swizzle the result (`samples.wzxy`), and
     // an unknown type degrades swizzle codegen downstream.
-    if (name === 'textureGather' || name === 'textureGatherCompare') {
+    if (name === 'textureGather') {
+        const first = args[0] !== undefined ? args[0].type : null;
+        const texture = first !== null && first.kind === 'texture' ? first : (args[1] !== undefined ? args[1].type : null);
+        const scalar = texture !== null && texture.kind === 'texture' ? texture.scalar : 'f32';
+        return { kind: 'vec', size: 4, scalar: scalar === 'u32' || /uint$/.test(scalar) ? 'u32'
+            : scalar === 'i32' || /sint$/.test(scalar) ? 'i32' : 'f32' };
+    }
+    if (name === 'textureGatherCompare') {
         return { kind: 'vec', size: 4, scalar: 'f32' };
     }
     if (name === 'textureDimensions') {

package/src/shade/wgsl/emulator/WGSLLanguageCore.js

@@ -1347,7 +1347,7 @@ export const WGSLLanguageCore = {
             const tz = w * t.size[2] + oz;
             texel_coord = dim === 1 ? [tx] : (dim === 2 ? [tx, ty] : [tx, ty, tz]);
         }
-        const result = new Float32Array(4);
+        const result = t.data instanceof Uint32Array || t.data instanceof Int32Array ? new t.data.constructor(4) : new Float32Array(4);
         cpu_texture_sample(result, sampler ?? FALLBACK_LINEAR_CLAMP_SAMPLER, t, texel_coord);
         return result;
     },
@@ -1504,7 +1504,7 @@ export const WGSLLanguageCore = {
 
         if (extra_b !== undefined) { offset_x = extra_b[0]; offset_y = extra_b[1]; }
 
-        const result = new Float32Array(4);
+        const result = t.data instanceof Uint32Array || t.data instanceof Int32Array ? new t.data.constructor(4) : new Float32Array(4);
 
         cpu_texture_gather(
             result,
@@ -1582,7 +1582,7 @@ export const WGSLLanguageCore = {
             throw new Error("textureGatherCompare: the bound sampler has no 'compare' function — WGSL requires a sampler_comparison here. Bind a SamplerDescriptor with `compare` set (the engine's shadow path uses SHADOWMAP_COMPARE_SAMPLER_DESCRIPTOR, `compare: \"greater\"` for reverse-Z).");
         }
 
-        const result = new Float32Array(4);
+        const result = t.data instanceof Uint32Array || t.data instanceof Int32Array ? new t.data.constructor(4) : new Float32Array(4);
 
         cpu_texture_gather(
             result,

package/src/shade/renderer/global_illumination/brick4/cpu/brick4_sh3_color_encode.d.ts

@@ -1,2 +0,0 @@
-export function brick4_sh3_color_encode(output: any, output_offset: any, input: any, input_offset: any): void;
-//# sourceMappingURL=brick4_sh3_color_encode.d.ts.map

package/src/shade/renderer/global_illumination/brick4/cpu/brick4_sh3_color_encode.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"brick4_sh3_color_encode.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/global_illumination/brick4/cpu/brick4_sh3_color_encode.js"],"names":[],"mappings":"AAAA,8GAKC"}

package/src/shade/renderer/global_illumination/brick4/cpu/brick4_sh3_color_encode.js

@@ -1,6 +0,0 @@
-export function brick4_sh3_color_encode(
-    output, output_offset,
-    input, input_offset,
-) {
-    throw new Error("Method not implemented.");
-}