impr: Remove unnecessary nested blocks in seed functions (#2086)

Author: cieplypolar

apps/typegpu-docs/src/examples/threejs/compute-cloth/index.ts

@@ -371,7 +371,11 @@ export const controls = defineControls({
     },
   },
   'Sheen Color': {
-    initial: d.vec3f(API.sheenColor),
+    initial: d.vec3f(
+      ((API.sheenColor >> 16) & 0xff) / 255,
+      ((API.sheenColor >> 8) & 0xff) / 255,
+      (API.sheenColor & 0xff) / 255,
+    ),
     onColorChange: (value) => {
       const color = new THREE.Color().fromArray(value);
       API.sheenColor = color.getHex();

packages/typegpu-noise/src/random.ts

@@ -18,42 +18,34 @@ import { randomGeneratorSlot } from './generator.ts';
 const TWO_PI = Math.PI * 2;
 const EPS = 1e-7; // don't ever get any lower than this
 
-const seedNotEmpty = tgpu.comptime(
+const warnIfNotProvided = tgpu.comptime(
   (seedFnName: keyof typeof randomGeneratorSlot.$) => {
-    if (randomGeneratorSlot.$[seedFnName]) {
-      return true;
+    if (!randomGeneratorSlot.$[seedFnName]) {
+      console.warn(`Called \`randf.${seedFnName}\`, but it wasn't provided`);
     }
-    console.warn(`Called \`randf.${seedFnName}\`, but it wasn't provided`);
-    return false;
+
+    return undefined;
   },
 );
 
 export const randSeed = tgpu.fn([d.f32])((seed) => {
-  if (seedNotEmpty('seed')) {
-    // @ts-expect-error trust me
-    randomGeneratorSlot.$.seed(seed);
-  }
+  warnIfNotProvided('seed');
+  randomGeneratorSlot.$.seed ? randomGeneratorSlot.$.seed(seed) : undefined;
 });
 
 export const randSeed2 = tgpu.fn([d.vec2f])((seed) => {
-  if (seedNotEmpty('seed2')) {
-    // @ts-expect-error trust me
-    randomGeneratorSlot.$.seed2(seed);
-  }
+  warnIfNotProvided('seed2');
+  randomGeneratorSlot.$.seed2 ? randomGeneratorSlot.$.seed2(seed) : undefined;
 });
 
 export const randSeed3 = tgpu.fn([d.vec3f])((seed) => {
-  if (seedNotEmpty('seed3')) {
-    // @ts-expect-error trust me
-    randomGeneratorSlot.$.seed3(seed);
-  }
+  warnIfNotProvided('seed3');
+  randomGeneratorSlot.$.seed3 ? randomGeneratorSlot.$.seed3(seed) : undefined;
 });
 
 export const randSeed4 = tgpu.fn([d.vec4f])((seed) => {
-  if (seedNotEmpty('seed4')) {
-    // @ts-expect-error trust me
-    randomGeneratorSlot.$.seed4(seed);
-  }
+  warnIfNotProvided('seed4');
+  randomGeneratorSlot.$.seed4 ? randomGeneratorSlot.$.seed4(seed) : undefined;
 });
 
 export const randFloat01: TgpuFn<() => d.F32> = tgpu

packages/typegpu/src/tgsl/wgslGenerator.ts

@@ -158,7 +158,7 @@ function operatorToType<
 
 const unaryOpCodeToCodegen = {
   '-': neg[$gpuCallable].call,
-  'void': () => snip('', wgsl.Void, 'constant'),
+  'void': () => snip(undefined, wgsl.Void, 'constant'),
 } satisfies Partial<
   Record<tinyest.UnaryOperator, (...args: never[]) => unknown>
 >;
@@ -196,6 +196,7 @@ class WgslGenerator implements ShaderGenerator {
     try {
       this.ctx.indent();
       const body = statements.map((statement) => this.statement(statement))
+        .filter((statement) => statement.length > 0)
         .join('\n');
       this.ctx.dedent();
       return `{
@@ -264,6 +265,10 @@ ${this.ctx.pre}}`;
     if (!id) {
       throw new Error('Cannot resolve an empty identifier');
     }
+    if (id === 'undefined') {
+      return snip(undefined, wgsl.Void, 'constant');
+    }
+
     const res = this.ctx.getById(id);
 
     if (!res) {
@@ -849,8 +854,9 @@ ${this.ctx.pre}}`;
     statement: tinyest.Statement,
   ): string {
     if (typeof statement === 'string') {
-      const resolved = this.ctx.resolve(this.identifier(statement).value).value;
-      return resolved.length === 0 ? '' : `${this.ctx.pre}${resolved};`;
+      const id = this.identifier(statement);
+      const resolved = id.value && this.ctx.resolve(id.value).value;
+      return resolved ? `${this.ctx.pre}${resolved};` : '';
     }
 
     if (typeof statement === 'boolean') {
@@ -1123,8 +1129,9 @@ ${this.ctx.pre}else ${alternate}`;
       return `${this.ctx.pre}break;`;
     }
 
-    const resolved = this.ctx.resolve(this.expression(statement).value).value;
-    return resolved.length === 0 ? '' : `${this.ctx.pre}${resolved};`;
+    const expr = this.expression(statement);
+    const resolved = expr.value && this.ctx.resolve(expr.value).value;
+    return resolved ? `${this.ctx.pre}${resolved};` : '';
   }
 }
 

packages/typegpu/tests/computePipeline.test.ts

@@ -542,7 +542,6 @@ describe('TgpuComputePipeline', () => {
         {
           a[1i] = 1h;
         }
-
       }"
     `);
   });

packages/typegpu/tests/declare.test.ts

@@ -111,7 +111,6 @@ struct Output {
       "@group(0) @binding(0) var<uniform> val: f32;
 
       fn main() -> f32 {
-
         return 2f;
       }"
     `);

packages/typegpu/tests/examples/individual/3d-fish.test.ts

@@ -38,9 +38,7 @@ describe('3d fish example', () => {
       }
 
       fn randSeed2(seed: vec2f) {
-        {
-          seed2(seed);
-        }
+        seed2(seed);
       }
 
       fn sample() -> f32 {

packages/typegpu/tests/examples/individual/caustics.test.ts

@@ -50,9 +50,7 @@ describe('caustics example', () => {
       }
 
       fn randSeed3(seed: vec3f) {
-        {
-          seed3(seed);
-        }
+        seed3(seed);
       }
 
       fn sample_1() -> f32 {

packages/typegpu/tests/examples/individual/clouds.test.ts

@@ -50,9 +50,7 @@ describe('clouds example', () => {
       }
 
       fn randSeed2(seed: vec2f) {
-        {
-          seed2(seed);
-        }
+        seed2(seed);
       }
 
       @group(0) @binding(0) var<uniform> resolutionUniform: vec2f;

packages/typegpu/tests/examples/individual/fluid-double-buffering.test.ts

@@ -107,9 +107,7 @@ describe('fluid double buffering example', () => {
       }
 
       fn randSeed2(seed: vec2f) {
-        {
-          seed2(seed);
-        }
+        seed2(seed);
       }
 
       @group(0) @binding(2) var<storage, read> gridBetaBuffer: array<vec4f, 1048576>;
@@ -285,9 +283,7 @@ describe('fluid double buffering example', () => {
       }
 
       fn randSeed2(seed: vec2f) {
-        {
-          seed2(seed);
-        }
+        seed2(seed);
       }
 
       @group(0) @binding(2) var<storage, read> gridAlphaBuffer: array<vec4f, 1048576>;

packages/typegpu/tests/examples/individual/jelly-slider.test.ts

@@ -76,9 +76,7 @@ describe('jelly-slider example', () => {
       }
 
       fn randSeed2(seed: vec2f) {
-        {
-          seed2(seed);
-        }
+        seed2(seed);
       }
 
       struct Camera {