Wind Waker: Particle system improvements

src/Common/JSYSTEM/J2Dv1.ts

@@ -17,6 +17,7 @@ import { BTIData } from "./JUTTexture.js";
 import { GXMaterialBuilder } from "../../gx/GXMaterialBuilder.js";
 import { mat4, vec2, vec4 } from "gl-matrix";
 import { GfxRenderCache } from "../../gfx/render/GfxRenderCache.js";
+import { Frustum } from "../../Geometry.js";
 
 const materialParams = new MaterialParams();
 const drawParams = new DrawParams();
@@ -80,10 +81,11 @@ const enum J2DUVBinding {
 
 export class J2DGrafContext {
     private clipSpaceNearZ: GfxClipSpaceNearZ;
+    private frustum = new Frustum();
+
     public sceneParams = new SceneParams();
     public viewport = vec4.create();
     public ortho = vec4.create();
-
     public near: number;
     public far: number;
 
@@ -118,6 +120,18 @@ export class J2DGrafContext {
 
         projectionMatrixForCuboid(this.sceneParams.u_Projection, left, right, bottom, top, this.near, this.far);
         projectionMatrixConvertClipSpaceNearZ(this.sceneParams.u_Projection, this.clipSpaceNearZ, GfxClipSpaceNearZ.NegativeOne);
+
+    }
+
+    /**
+     * noclip modification:
+     * Given a view matrix, return a Frustum which can be used for culling. 
+     * In the original game, frustums are generated from proj matrices alone. But noclip expects viewProj frustums. 
+     */
+    public getFrustumForView(viewFromWorldMatrix: mat4): Frustum {
+        const clipFromWorldMatrix = mat4.mul(scratchMat, this.sceneParams.u_Projection, viewFromWorldMatrix);
+        this.frustum.updateClipFrustum(clipFromWorldMatrix, this.clipSpaceNearZ);
+        return this.frustum;
     }
 
     public setOnRenderInst(renderInst: GfxRenderInst): void {

src/Common/JSYSTEM/JPA.ts

@@ -1711,7 +1711,7 @@ export class JPABaseEmitter {
             throw "whoops";
     }
 
-    private createParticle(): JPABaseParticle | null {
+    public createParticle(): JPABaseParticle | null {
         if (this.emitterManager.deadParticlePool.length === 0)
             return null;
 
@@ -1736,7 +1736,6 @@ export class JPABaseEmitter {
                     this.emitCount = bem1.divNumber * bem1.divNumber * 4 + 2;
                 else
                     this.emitCount = bem1.divNumber;
-                workData.volumeEmitCount = this.emitCount;
                 workData.volumeEmitIdx = 0;
             } else {
                 // Rate
@@ -1748,6 +1747,8 @@ export class JPABaseEmitter {
                     this.emitCount = 1;
             }
 
+            workData.volumeEmitCount = this.emitCount;
+
             if (!!(this.status & JPAEmitterStatus.STOP_CREATE_PARTICLE))
                 this.emitCount = 0;
 

src/ZeldaWindWaker/Main.ts

@@ -35,7 +35,7 @@ import { EDemoMode, dDemo_manager_c } from './d_demo.js';
 import { dDlst_list_Set, dDlst_list_c } from './d_drawlist.js';
 import { dKankyo_create, dKy__RegisterConstructors, dKy_setLight, dScnKy_env_light_c } from './d_kankyo.js';
 import { dKyw__RegisterConstructors } from './d_kankyo_wether.js';
-import { dPa_control_c } from './d_particle.js';
+import { dPa_control_c, ParticleGroup } from './d_particle.js';
 import { Placename, PlacenameState, dPn__update, d_pn__RegisterConstructors } from './d_place_name.js';
 import { dProcName_e } from './d_procname.js';
 import { ResType, dRes_control_c } from './d_resorce.js';
@@ -403,18 +403,37 @@ export class WindWakerRenderer implements Viewer.SceneGfx {
         {
             globals.particleCtrl.calc(globals, viewerInput);
 
-            for (let group = EffectDrawGroup.Main; group <= EffectDrawGroup.Indirect; group++) {
+            for (let group = ParticleGroup.Normal; group <= ParticleGroup.Wind; group++) {
                 let texPrjMtx: mat4 | null = null;
 
-                if (group === EffectDrawGroup.Indirect) {
+                if (group === ParticleGroup.Projection) {
                     texPrjMtx = scratchMatrix;
                     texProjCameraSceneTex(texPrjMtx, globals.camera.clipFromViewMatrix, 1);
                 }
 
                 globals.particleCtrl.setDrawInfo(globals.camera.viewFromWorldMatrix, globals.camera.clipFromViewMatrix, texPrjMtx, globals.camera.frustum);
-                renderInstManager.setCurrentList(dlst.effect[group]);
+                renderInstManager.setCurrentList(dlst.effect[group == ParticleGroup.Projection ? EffectDrawGroup.Indirect : EffectDrawGroup.Main]);
                 globals.particleCtrl.draw(device, this.renderHelper.renderInstManager, group);
             }
+
+            // From mDoGph_Painter(). Draw the 2D particle groups with different view/proj matrices. 
+            {
+                const orthoCtx = this.globals.scnPlay.currentGrafPort;
+                const viewMtx = mat4.fromTranslation(scratchMatrix, [orthoCtx.aspectRatioCorrection * 320, 240, 0]);
+                const frustum = orthoCtx.getFrustumForView(viewMtx);
+                const template = renderInstManager.pushTemplate();
+                orthoCtx.setOnRenderInst(template);
+
+                globals.particleCtrl.setDrawInfo(viewMtx, orthoCtx.sceneParams.u_Projection, null, frustum);
+
+                renderInstManager.setCurrentList(dlst.particle2DBack);
+                globals.particleCtrl.draw(device, this.renderHelper.renderInstManager, ParticleGroup.TwoDback);
+                globals.particleCtrl.draw(device, this.renderHelper.renderInstManager, ParticleGroup.TwoDmenuBack);
+
+                renderInstManager.setCurrentList(dlst.particle2DFore);
+                globals.particleCtrl.draw(device, this.renderHelper.renderInstManager, ParticleGroup.TwoDfore);
+                globals.particleCtrl.draw(device, this.renderHelper.renderInstManager, ParticleGroup.TwoDmenuFore);
+            }
         }
 
         this.renderHelper.renderInstManager.popTemplate();
@@ -481,9 +500,11 @@ export class WindWakerRenderer implements Viewer.SceneGfx {
 
                 this.executeList(passRenderer, dlst.effect[EffectDrawGroup.Main]);
                 this.executeList(passRenderer, dlst.wetherEffect);
-                this.executeListSet(passRenderer, dlst.ui);
 
+                this.executeList(passRenderer, dlst.particle2DBack);
+                this.executeListSet(passRenderer, dlst.ui);
                 this.executeListSet(passRenderer, dlst.ui2D);
+                this.executeList(passRenderer, dlst.particle2DFore);
             });
         });
 
@@ -823,12 +844,9 @@ class SceneDesc {
 
         renderer.extraTextures = new ZWWExtraTextures(device, ZAtoon, ZBtoonEX);
 
-        const jpac: JPA.JPAC[] = [];
-        for (let i = 0; i < particleArchives.length; i++) {
-            const jpacData = modelCache.getFileData(particleArchives[i]);
-            jpac.push(JPA.parse(jpacData));
-        }
-        globals.particleCtrl = new dPa_control_c(renderer.renderCache, jpac);
+        globals.particleCtrl = new dPa_control_c(renderer.renderCache);
+        globals.particleCtrl.createCommon(globals, JPA.parse(modelCache.getFileData(particleArchives[0])));
+        globals.particleCtrl.createRoomScene(globals, JPA.parse(modelCache.getFileData(particleArchives[1])));
 
         // dStage_Create
         dKankyo_create(globals);