@zephyr3d/scene 0.7.0 → 0.7.1

package/dist/render/fft_wavegenerator.js

@@ -104,17 +104,17 @@ const THREAD_GROUP_SIZE = 16;
                 programs: {
                     h0Program: createProgramH0(this._useComputeShader, THREAD_GROUP_SIZE, this._h0TextureFormat),
                     hkProgram: this._renderMode === RENDER_NORMAL ? createProgramHk(this._useComputeShader, THREAD_GROUP_SIZE, this._dataTextureFormat) : null,
-                    hkProgram2: this._renderMode === RENDER_TWO_PASS ? createProgramHk(false, 0, null, 2) : null,
-                    hkProgram4: this._renderMode === RENDER_TWO_PASS ? createProgramHk(false, 0, null, 4) : null,
+                    hkProgram2: this._renderMode === RENDER_TWO_PASS ? createProgramHk(false, 0, undefined, 2) : null,
+                    hkProgram4: this._renderMode === RENDER_TWO_PASS ? createProgramHk(false, 0, undefined, 4) : null,
                     fft2hProgram: this._renderMode === RENDER_NORMAL ? createProgramFFT2H(this._useComputeShader, THREAD_GROUP_SIZE, this._dataTextureFormat) : null,
-                    fft2hProgram2: this._renderMode === RENDER_TWO_PASS ? createProgramFFT2H(false, 0, null, 2) : null,
-                    fft2hProgram4: this._renderMode === RENDER_TWO_PASS ? createProgramFFT2H(false, 0, null, 4) : null,
+                    fft2hProgram2: this._renderMode === RENDER_TWO_PASS ? createProgramFFT2H(false, 0, undefined, 2) : null,
+                    fft2hProgram4: this._renderMode === RENDER_TWO_PASS ? createProgramFFT2H(false, 0, undefined, 4) : null,
                     fft2vProgram: this._renderMode === RENDER_NORMAL ? createProgramFFT2V(this._useComputeShader, THREAD_GROUP_SIZE, this._dataTextureFormat) : null,
-                    fft2vProgram2: this._renderMode === RENDER_TWO_PASS ? createProgramFFT2V(false, 0, null, 2) : null,
-                    fft2vProgram4: this._renderMode === RENDER_TWO_PASS ? createProgramFFT2V(false, 0, null, 4) : null,
+                    fft2vProgram2: this._renderMode === RENDER_TWO_PASS ? createProgramFFT2V(false, 0, undefined, 2) : null,
+                    fft2vProgram4: this._renderMode === RENDER_TWO_PASS ? createProgramFFT2V(false, 0, undefined, 4) : null,
                     postfft2Program: this._renderMode === RENDER_NORMAL ? createProgramPostFFT2(this._useComputeShader, THREAD_GROUP_SIZE, this._dataTextureFormat) : null,
-                    postfft2Program2: this._renderMode === RENDER_TWO_PASS ? createProgramPostFFT2(false, 0, null, 2) : null,
-                    postfft2Program4: this._renderMode === RENDER_TWO_PASS ? createProgramPostFFT2(false, 0, null, 4) : null
+                    postfft2Program2: this._renderMode === RENDER_TWO_PASS ? createProgramPostFFT2(false, 0, undefined, 2) : null,
+                    postfft2Program4: this._renderMode === RENDER_TWO_PASS ? createProgramPostFFT2(false, 0, undefined, 4) : null
                 },
                 quad: FFTWaveGenerator.createQuad(),
                 noiseTextures: new Map(),
@@ -123,11 +123,11 @@ const THREAD_GROUP_SIZE = 16;
             this._params = params ?? getDefaultBuildParams();
             const programs = FFTWaveGenerator._globals.programs;
             this._h0BindGroup = device.createBindGroup(programs.h0Program.bindGroupLayouts[0]);
-            this._hkBindGroup = programs.hkProgram ? device.createBindGroup(FFTWaveGenerator._globals.programs.hkProgram.bindGroupLayouts[0]) : null;
-            this._hkBindGroup2 = programs.hkProgram2 ? device.createBindGroup(FFTWaveGenerator._globals.programs.hkProgram2.bindGroupLayouts[0]) : null;
-            this._hkBindGroup4 = programs.hkProgram4 ? device.createBindGroup(FFTWaveGenerator._globals.programs.hkProgram4.bindGroupLayouts[0]) : null;
-            this._fft2hBindGroup = programs.fft2hProgram ? device.createBindGroup(FFTWaveGenerator._globals.programs.fft2hProgram.bindGroupLayouts[0]) : null;
-            this._fft2vBindGroup = programs.fft2vProgram ? device.createBindGroup(FFTWaveGenerator._globals.programs.fft2vProgram.bindGroupLayouts[0]) : null;
+            this._hkBindGroup = programs.hkProgram ? device.createBindGroup(programs.hkProgram.bindGroupLayouts[0]) : null;
+            this._hkBindGroup2 = programs.hkProgram2 ? device.createBindGroup(programs.hkProgram2.bindGroupLayouts[0]) : null;
+            this._hkBindGroup4 = programs.hkProgram4 ? device.createBindGroup(programs.hkProgram4.bindGroupLayouts[0]) : null;
+            this._fft2hBindGroup = programs.fft2hProgram ? device.createBindGroup(programs.fft2hProgram.bindGroupLayouts[0]) : null;
+            this._fft2vBindGroup = programs.fft2vProgram ? device.createBindGroup(programs.fft2vProgram.bindGroupLayouts[0]) : null;
             this._fft2hBindGroup2Used = [
                 [],
                 []
@@ -160,9 +160,9 @@ const THREAD_GROUP_SIZE = 16;
                 [],
                 []
             ];
-            this._postfft2BindGroup = programs.postfft2Program ? device.createBindGroup(FFTWaveGenerator._globals.programs.postfft2Program.bindGroupLayouts[0]) : null;
-            this._postfft2BindGroup2 = programs.postfft2Program2 ? device.createBindGroup(FFTWaveGenerator._globals.programs.postfft2Program2.bindGroupLayouts[0]) : null;
-            this._postfft2BindGroup4 = programs.postfft2Program4 ? device.createBindGroup(FFTWaveGenerator._globals.programs.postfft2Program4.bindGroupLayouts[0]) : null;
+            this._postfft2BindGroup = programs.postfft2Program ? device.createBindGroup(programs.postfft2Program.bindGroupLayouts[0]) : null;
+            this._postfft2BindGroup2 = programs.postfft2Program2 ? device.createBindGroup(programs.postfft2Program2.bindGroupLayouts[0]) : null;
+            this._postfft2BindGroup4 = programs.postfft2Program4 ? device.createBindGroup(programs.postfft2Program4.bindGroupLayouts[0]) : null;
             this._instanceData = null;
             this._ifftTextures = null;
             this._sizes = new Vector4();
@@ -518,13 +518,9 @@ const THREAD_GROUP_SIZE = 16;
     /** @internal */ disposeInstanceData() {
         if (this._instanceData) {
             this.disposeNTextures(this._instanceData.dataTextures);
-            this._instanceData.dataTextures = null;
             this.disposeNTextures(this._instanceData.h0Textures);
-            this._instanceData.h0Textures = null;
             this.disposeNTextures(this._instanceData.pingpongTextures);
-            this._instanceData.pingpongTextures = null;
             this.disposeNTextures(this._instanceData.spectrumTextures);
-            this._instanceData.spectrumTextures = null;
             this._instanceData.h0Framebuffer?.dispose();
             this._instanceData.pingpongFramebuffer?.dispose();
             this._instanceData.pingpongFramebuffer2?.dispose();
@@ -552,11 +548,12 @@ const THREAD_GROUP_SIZE = 16;
             this._hkBindGroup.setTexture('spectrum', instanceData.spectrumTextures);
             device.compute(this._params.resolution / THREAD_GROUP_SIZE, this._params.resolution / THREAD_GROUP_SIZE, 1);
         } else {
-            this._hkBindGroup.setTexture('h0Texture0', instanceData.h0Textures[0], nearestRepeatSampler);
-            this._hkBindGroup.setTexture('h0Texture1', instanceData.h0Textures[1], nearestRepeatSampler);
-            this._hkBindGroup.setTexture('h0Texture2', instanceData.h0Textures[2], nearestRepeatSampler);
+            const h0Textures = instanceData.h0Textures;
+            this._hkBindGroup.setTexture('h0Texture0', h0Textures[0], nearestRepeatSampler);
+            this._hkBindGroup.setTexture('h0Texture1', h0Textures[1], nearestRepeatSampler);
+            this._hkBindGroup.setTexture('h0Texture2', h0Textures[2], nearestRepeatSampler);
             if (device.type === 'webgl') {
-                this._hkBindGroup.setValue('h0TexSize', new Vector2(instanceData.h0Textures[0].width, instanceData.h0Textures[0].height));
+                this._hkBindGroup.setValue('h0TexSize', new Vector2(h0Textures[0].width, h0Textures[0].height));
             }
             device.setFramebuffer(instanceData.spectrumFramebuffer);
             FFTWaveGenerator._globals.quad.draw();
@@ -568,13 +565,14 @@ const THREAD_GROUP_SIZE = 16;
         const nearestRepeatSampler = fetchSampler('repeat_nearest_nomip');
         device.setProgram(FFTWaveGenerator._globals.programs.hkProgram4);
         device.setBindGroup(0, this._hkBindGroup4);
+        const h0Textures = instanceData.h0Textures;
         this._hkBindGroup4.setValue('resolution', this._params.resolution);
         this._hkBindGroup4.setValue('sizes', this._sizes);
-        this._hkBindGroup4.setTexture('h0Texture0', instanceData.h0Textures[0], nearestRepeatSampler);
-        this._hkBindGroup4.setTexture('h0Texture1', instanceData.h0Textures[1], nearestRepeatSampler);
+        this._hkBindGroup4.setTexture('h0Texture0', h0Textures[0], nearestRepeatSampler);
+        this._hkBindGroup4.setTexture('h0Texture1', h0Textures[1], nearestRepeatSampler);
         this._hkBindGroup4.setValue('t', time);
         if (device.type === 'webgl') {
-            this._hkBindGroup4.setValue('h0TexSize', new Vector2(instanceData.h0Textures[0].width, instanceData.h0Textures[0].height));
+            this._hkBindGroup4.setValue('h0TexSize', new Vector2(h0Textures[0].width, h0Textures[0].height));
         }
         device.setFramebuffer(instanceData.spectrumFramebuffer4);
         FFTWaveGenerator._globals.quad.draw();
@@ -582,10 +580,10 @@ const THREAD_GROUP_SIZE = 16;
         device.setBindGroup(0, this._hkBindGroup2);
         this._hkBindGroup2.setValue('resolution', this._params.resolution);
         this._hkBindGroup2.setValue('sizes', this._sizes);
-        this._hkBindGroup2.setTexture('h0Texture2', instanceData.h0Textures[2], nearestRepeatSampler);
+        this._hkBindGroup2.setTexture('h0Texture2', h0Textures[2], nearestRepeatSampler);
         this._hkBindGroup2.setValue('t', time);
         if (device.type === 'webgl') {
-            this._hkBindGroup2.setValue('h0TexSize', new Vector2(instanceData.h0Textures[0].width, instanceData.h0Textures[0].height));
+            this._hkBindGroup2.setValue('h0TexSize', new Vector2(h0Textures[0].width, h0Textures[0].height));
         }
         device.setFramebuffer(instanceData.spectrumFramebuffer2);
         FFTWaveGenerator._globals.quad.draw();
@@ -619,15 +617,16 @@ const THREAD_GROUP_SIZE = 16;
                 this._fft2hBindGroup.setTexture('ifft', pingPongFramebuffers[pingPong]);
                 device.compute(this._params.resolution / THREAD_GROUP_SIZE, this._params.resolution / THREAD_GROUP_SIZE, 1);
             } else {
+                const pingPongTexture = pingPongTextures[pingPong];
                 device.setFramebuffer(pingPongFramebuffers[pingPong]);
-                this._fft2hBindGroup.setTexture('spectrum0', pingPongTextures[pingPong][0], nearestRepeatSampler);
-                this._fft2hBindGroup.setTexture('spectrum1', pingPongTextures[pingPong][1], nearestRepeatSampler);
-                this._fft2hBindGroup.setTexture('spectrum2', pingPongTextures[pingPong][2], nearestRepeatSampler);
-                this._fft2hBindGroup.setTexture('spectrum3', pingPongTextures[pingPong][3], nearestRepeatSampler);
-                this._fft2hBindGroup.setTexture('spectrum4', pingPongTextures[pingPong][4], nearestRepeatSampler);
-                this._fft2hBindGroup.setTexture('spectrum5', pingPongTextures[pingPong][5], nearestRepeatSampler);
+                this._fft2hBindGroup.setTexture('spectrum0', pingPongTexture[0], nearestRepeatSampler);
+                this._fft2hBindGroup.setTexture('spectrum1', pingPongTexture[1], nearestRepeatSampler);
+                this._fft2hBindGroup.setTexture('spectrum2', pingPongTexture[2], nearestRepeatSampler);
+                this._fft2hBindGroup.setTexture('spectrum3', pingPongTexture[3], nearestRepeatSampler);
+                this._fft2hBindGroup.setTexture('spectrum4', pingPongTexture[4], nearestRepeatSampler);
+                this._fft2hBindGroup.setTexture('spectrum5', pingPongTexture[5], nearestRepeatSampler);
                 if (device.type === 'webgl') {
-                    this._fft2hBindGroup.setValue('texSize', new Vector4(pingPongTextures[pingPong][0].width, pingPongTextures[pingPong][0].height, butterflyTex.width, butterflyTex.height));
+                    this._fft2hBindGroup.setValue('texSize', new Vector4(pingPongTexture[0].width, pingPongTexture[0].height, butterflyTex.width, butterflyTex.height));
                 }
                 FFTWaveGenerator._globals.quad.draw();
             }
@@ -644,15 +643,16 @@ const THREAD_GROUP_SIZE = 16;
                 this._fft2vBindGroup.setTexture('ifft', pingPongFramebuffers[pingPong]);
                 device.compute(this._params.resolution / THREAD_GROUP_SIZE, this._params.resolution / THREAD_GROUP_SIZE, 1);
             } else {
+                const pingPongTexture = pingPongTextures[pingPong];
                 device.setFramebuffer(pingPongFramebuffers[pingPong]);
-                this._fft2vBindGroup.setTexture('spectrum0', pingPongTextures[pingPong][0], nearestRepeatSampler);
-                this._fft2vBindGroup.setTexture('spectrum1', pingPongTextures[pingPong][1], nearestRepeatSampler);
-                this._fft2vBindGroup.setTexture('spectrum2', pingPongTextures[pingPong][2], nearestRepeatSampler);
-                this._fft2vBindGroup.setTexture('spectrum3', pingPongTextures[pingPong][3], nearestRepeatSampler);
-                this._fft2vBindGroup.setTexture('spectrum4', pingPongTextures[pingPong][4], nearestRepeatSampler);
-                this._fft2vBindGroup.setTexture('spectrum5', pingPongTextures[pingPong][5], nearestRepeatSampler);
+                this._fft2vBindGroup.setTexture('spectrum0', pingPongTexture[0], nearestRepeatSampler);
+                this._fft2vBindGroup.setTexture('spectrum1', pingPongTexture[1], nearestRepeatSampler);
+                this._fft2vBindGroup.setTexture('spectrum2', pingPongTexture[2], nearestRepeatSampler);
+                this._fft2vBindGroup.setTexture('spectrum3', pingPongTexture[3], nearestRepeatSampler);
+                this._fft2vBindGroup.setTexture('spectrum4', pingPongTexture[4], nearestRepeatSampler);
+                this._fft2vBindGroup.setTexture('spectrum5', pingPongTexture[5], nearestRepeatSampler);
                 if (device.type === 'webgl') {
-                    this._fft2vBindGroup.setValue('texSize', new Vector4(pingPongTextures[pingPong][0].width, pingPongTextures[pingPong][0].height, butterflyTex.width, butterflyTex.height));
+                    this._fft2vBindGroup.setValue('texSize', new Vector4(pingPongTexture[0].width, pingPongTexture[0].height, butterflyTex.width, butterflyTex.height));
                 }
                 FFTWaveGenerator._globals.quad.draw();
             }
@@ -795,15 +795,16 @@ const THREAD_GROUP_SIZE = 16;
             this._postfft2BindGroup.setTexture('ifft', this._ifftTextures, nearestRepeatSampler);
             device.compute(this._params.resolution / THREAD_GROUP_SIZE, this._params.resolution / THREAD_GROUP_SIZE, 1);
         } else {
+            const ifftTextures = this._ifftTextures;
             device.setFramebuffer(instanceData.postIfft2Framebuffer);
-            this._postfft2BindGroup.setTexture('ifft0', this._ifftTextures[0], nearestRepeatSampler);
-            this._postfft2BindGroup.setTexture('ifft1', this._ifftTextures[1], nearestRepeatSampler);
-            this._postfft2BindGroup.setTexture('ifft2', this._ifftTextures[2], nearestRepeatSampler);
-            this._postfft2BindGroup.setTexture('ifft3', this._ifftTextures[3], nearestRepeatSampler);
-            this._postfft2BindGroup.setTexture('ifft4', this._ifftTextures[4], nearestRepeatSampler);
-            this._postfft2BindGroup.setTexture('ifft5', this._ifftTextures[5], nearestRepeatSampler);
+            this._postfft2BindGroup.setTexture('ifft0', ifftTextures[0], nearestRepeatSampler);
+            this._postfft2BindGroup.setTexture('ifft1', ifftTextures[1], nearestRepeatSampler);
+            this._postfft2BindGroup.setTexture('ifft2', ifftTextures[2], nearestRepeatSampler);
+            this._postfft2BindGroup.setTexture('ifft3', ifftTextures[3], nearestRepeatSampler);
+            this._postfft2BindGroup.setTexture('ifft4', ifftTextures[4], nearestRepeatSampler);
+            this._postfft2BindGroup.setTexture('ifft5', ifftTextures[5], nearestRepeatSampler);
             if (device.type === 'webgl') {
-                this._postfft2BindGroup.setValue('ifftTexSize', new Vector2(this._ifftTextures[0].width, this._ifftTextures[0].height));
+                this._postfft2BindGroup.setValue('ifftTexSize', new Vector2(ifftTextures[0].width, ifftTextures[0].height));
             }
             FFTWaveGenerator._globals.quad.draw();
         }
@@ -815,23 +816,24 @@ const THREAD_GROUP_SIZE = 16;
         device.setFramebuffer(instanceData.postIfft2Framebuffer4);
         device.setProgram(FFTWaveGenerator._globals.programs.postfft2Program4);
         device.setBindGroup(0, this._postfft2BindGroup4);
+        const ifftTextures = this._ifftTextures;
         this._postfft2BindGroup4.setValue('N2', this._params.resolution * this._params.resolution);
-        this._postfft2BindGroup4.setTexture('ifft0', this._ifftTextures[0], nearestRepeatSampler);
-        this._postfft2BindGroup4.setTexture('ifft1', this._ifftTextures[1], nearestRepeatSampler);
-        this._postfft2BindGroup4.setTexture('ifft2', this._ifftTextures[2], nearestRepeatSampler);
-        this._postfft2BindGroup4.setTexture('ifft3', this._ifftTextures[3], nearestRepeatSampler);
+        this._postfft2BindGroup4.setTexture('ifft0', ifftTextures[0], nearestRepeatSampler);
+        this._postfft2BindGroup4.setTexture('ifft1', ifftTextures[1], nearestRepeatSampler);
+        this._postfft2BindGroup4.setTexture('ifft2', ifftTextures[2], nearestRepeatSampler);
+        this._postfft2BindGroup4.setTexture('ifft3', ifftTextures[3], nearestRepeatSampler);
         if (device.type === 'webgl') {
-            this._postfft2BindGroup4.setValue('ifftTexSize', new Vector2(this._ifftTextures[0].width, this._ifftTextures[0].height));
+            this._postfft2BindGroup4.setValue('ifftTexSize', new Vector2(ifftTextures[0].width, ifftTextures[0].height));
         }
         FFTWaveGenerator._globals.quad.draw();
         device.setFramebuffer(instanceData.postIfft2Framebuffer2);
         device.setProgram(FFTWaveGenerator._globals.programs.postfft2Program2);
         device.setBindGroup(0, this._postfft2BindGroup2);
         this._postfft2BindGroup2.setValue('N2', this._params.resolution * this._params.resolution);
-        this._postfft2BindGroup2.setTexture('ifft4', this._ifftTextures[4], nearestRepeatSampler);
-        this._postfft2BindGroup2.setTexture('ifft5', this._ifftTextures[5], nearestRepeatSampler);
+        this._postfft2BindGroup2.setTexture('ifft4', ifftTextures[4], nearestRepeatSampler);
+        this._postfft2BindGroup2.setTexture('ifft5', ifftTextures[5], nearestRepeatSampler);
         if (device.type === 'webgl') {
-            this._postfft2BindGroup2.setValue('ifftTexSize', new Vector2(this._ifftTextures[0].width, this._ifftTextures[0].height));
+            this._postfft2BindGroup2.setValue('ifftTexSize', new Vector2(ifftTextures[0].width, ifftTextures[0].height));
         }
         FFTWaveGenerator._globals.quad.draw();
     }
@@ -974,12 +976,13 @@ const THREAD_GROUP_SIZE = 16;
         if (this._useComputeShader) {
             bindGroup.setTexture('dataTexture', instanceData.dataTextures, linearRepeatSampler);
         } else {
-            bindGroup.setTexture('dx_hy_dz_dxdz0', instanceData.dataTextures[0], linearRepeatSampler);
-            bindGroup.setTexture('sx_sz_dxdx_dzdz0', instanceData.dataTextures[1], linearRepeatSampler);
-            bindGroup.setTexture('dx_hy_dz_dxdz1', instanceData.dataTextures[2], linearRepeatSampler);
-            bindGroup.setTexture('sx_sz_dxdx_dzdz1', instanceData.dataTextures[3], linearRepeatSampler);
-            bindGroup.setTexture('dx_hy_dz_dxdz2', instanceData.dataTextures[4], linearRepeatSampler);
-            bindGroup.setTexture('sx_sz_dxdx_dzdz2', instanceData.dataTextures[5], linearRepeatSampler);
+            const dataTextures = instanceData.dataTextures;
+            bindGroup.setTexture('dx_hy_dz_dxdz0', dataTextures[0], linearRepeatSampler);
+            bindGroup.setTexture('sx_sz_dxdx_dzdz0', dataTextures[1], linearRepeatSampler);
+            bindGroup.setTexture('dx_hy_dz_dxdz1', dataTextures[2], linearRepeatSampler);
+            bindGroup.setTexture('sx_sz_dxdx_dzdz1', dataTextures[3], linearRepeatSampler);
+            bindGroup.setTexture('dx_hy_dz_dxdz2', dataTextures[4], linearRepeatSampler);
+            bindGroup.setTexture('sx_sz_dxdx_dzdz2', dataTextures[5], linearRepeatSampler);
         }
         bindGroup.setValue('foamParams', this._params.foamParams);
         bindGroup.setValue('sizes', this._sizes);