move snow and rain shaders to HD

GitOrigin-RevId: 7b052244ac81fc73c208b526eca7602b9aa6b33a

Author: dcoj

modules/hd_main.ts

@@ -1,5 +1,19 @@
-import {drawBuilding, shaders} from './hd_main_imports';
+import {drawBuilding, drawRasterParticle, prepareRasterParticle, shaders, Rain, Snow, precipitationShaders} from './hd_main_imports';
 
-export const HD = {drawBuilding, shaders};
+export const HD = {
+    building: {
+        draw: drawBuilding,
+    },
+    particles: {
+        draw: drawRasterParticle,
+        prepare: prepareRasterParticle,
+    },
+    precipitation: {
+        Rain,
+        Snow,
+    },
+    shaders,
+    precipitationShaders
+};
 
 export async function prepareHD() { return Promise.resolve(); }

modules/hd_main_esm.ts

@@ -5,7 +5,6 @@ export const HD = {};
 export async function prepareHD() {
     try {
         Object.assign(HD, await import('./hd_main_imports'));
-
     } catch (error) {
         warnOnce('Could not load HD module.');
     }

modules/hd_main_imports.ts

@@ -1,2 +1,6 @@
 export {default as drawBuilding} from '../3d-style/render/draw_building';
+export {default as drawRasterParticle, prepare as prepareRasterParticle} from '../src/render/draw_raster_particle';
 export {default as shaders} from '../3d-style/shaders/shaders_hd';
+export {Rain} from '../src/precipitation/draw_rain';
+export {Snow} from '../src/precipitation/draw_snow';
+export {default as precipitationShaders} from '../src/shaders/shaders_precipitation';

src/render/painter.ts

@@ -31,7 +31,6 @@ import fillExtrusion from './draw_fill_extrusion';
 import {HD, prepareHD} from '../../modules/hd_main';
 import hillshade from './draw_hillshade';
 import raster, {prepare as prepareRaster} from './draw_raster';
-import rasterParticle, {prepare as prepareRasterParticle} from './draw_raster_particle';
 import background from './draw_background';
 import {default as drawDebug, drawDebugPadding, drawDebugQueryGeometry} from './draw_debug';
 import custom from './draw_custom';
@@ -53,8 +52,6 @@ import {WireframeDebugCache} from './wireframe_cache';
 import {FOG_OPACITY_THRESHOLD} from '../style/fog_helpers';
 import Framebuffer from '../gl/framebuffer';
 import {OcclusionParams} from './occlusion_params';
-import {Rain} from '../precipitation/draw_rain';
-import {Snow} from '../precipitation/draw_snow';
 import {PerformanceUtils} from '../util/performance';
 
 import type ImageManager from './image_manager';
@@ -144,7 +141,7 @@ const draw: Record<string, DrawStyleLayer> = {
     'fill-extrusion': fillExtrusion,
     hillshade,
     raster,
-    'raster-particle': rasterParticle,
+    'raster-particle': null,
     background,
     sky,
     custom,
@@ -155,7 +152,7 @@ const prepare = {
     line: prepareLine,
     model: modelPrepare,
     raster: prepareRaster,
-    'raster-particle': prepareRasterParticle
+    'raster-particle': null
 };
 
 const depthPrepass = {
@@ -167,7 +164,9 @@ const groundShadowMask = {
 
 async function setupHD() {
     await prepareHD();
-    draw.building = HD.drawBuilding;
+    draw.building = HD.building.draw;
+    draw['raster-particle'] = HD.particles.draw;
+    prepare['raster-particle'] = HD.particles.prepare;
 }
 
 /**
@@ -230,8 +229,8 @@ class Painter {
     loadTimeStamps: Array<number>;
     _backgroundTiles: Record<number, Tile>;
     _atmosphere: Atmosphere | null | undefined;
-    _rain?: Rain;
-    _snow?: Snow;
+    _rain?: InstanceType<typeof HD.precipitation.Rain>;
+    _snow?: InstanceType<typeof HD.precipitation.Snow>;
     replacementSource: ReplacementSource;
     conflationActive: boolean;
     firstLightBeamLayer: number;
@@ -1093,16 +1092,21 @@ class Painter {
         const snow = this._debugParams.forceEnablePrecipitation || !!(this.style && this.style.snow);
         const rain = this._debugParams.forceEnablePrecipitation || !!(this.style && this.style.rain);
 
-        if (snow && !this._snow) {
-            this._snow = new Snow(this);
+        // Load HD for precipitation functionality
+        if ((snow || rain) && (!HD.precipitation || !HD.precipitation.Rain || !HD.precipitation.Snow)) {
+            void prepareHD();
+        }
+
+        if (snow && !this._snow && HD.precipitation && HD.precipitation.Snow) {
+            this._snow = new HD.precipitation.Snow(this);
         }
         if (!snow && this._snow) {
             this._snow.destroy();
             delete this._snow;
         }
 
-        if (rain && !this._rain) {
-            this._rain = new Rain(this);
+        if (rain && !this._rain && HD.precipitation && HD.precipitation.Rain) {
+            this._rain = new HD.precipitation.Rain(this);
         }
         if (!rain && this._rain) {
             this._rain.destroy();
@@ -1731,7 +1735,7 @@ class Painter {
         const globalDefines = this.currentGlobalDefines(name, overrideFog, overrideRtt);
         const allDefines = globalDefines.concat(defines);
 
-        const shaderSource = shaders[name as keyof typeof shaders] || HD.shaders[name as keyof typeof HD.shaders];
+        const shaderSource = shaders[name as keyof typeof shaders] || (HD.shaders && HD.shaders[name as keyof typeof HD.shaders]) || (HD.precipitationShaders && HD.precipitationShaders[name as keyof typeof HD.precipitationShaders]);
         const key = Program.cacheKey(shaderSource, name, allDefines, config);
 
         if (!this.cache[key]) {

src/shaders/shaders.ts

@@ -72,12 +72,6 @@ import atmosphereFrag from './atmosphere.fragment.glsl';
 import atmosphereVert from './atmosphere.vertex.glsl';
 import starsFrag from './stars.fragment.glsl';
 import starsVert from './stars.vertex.glsl';
-import snowFrag from './snow_particle.fragment.glsl';
-import snowVert from './snow_particle.vertex.glsl';
-import rainFrag from './rain_particle.fragment.glsl';
-import rainVert from './rain_particle.vertex.glsl';
-import vignetteFrag from './vignette.fragment.glsl';
-import vignetteVert from './vignette.vertex.glsl';
 import occlusionFrag from './occlusion.fragment.glsl';
 import occlusionVert from './occlusion.vertex.glsl';
 import elevatedStructuresDepthReconstructFrag from '../../3d-style/shaders/elevated_structures_depth_reconstruct.fragment.glsl';
@@ -201,9 +195,6 @@ export default {
     model: compile(modelFrag, modelVert),
     modelDepth: compile(modelDepthFrag, modelDepthVert),
     stars: compile(starsFrag, starsVert),
-    snowParticle: compile(snowFrag, snowVert),
-    rainParticle: compile(rainFrag, rainVert),
-    vignette: compile(vignetteFrag, vignetteVert),
     occlusion: compile(occlusionFrag, occlusionVert)
 } as const;
 

src/shaders/shaders_precipitation.ts

@@ -0,0 +1,16 @@
+// eslint-disable-next-line @typescript-eslint/triple-slash-reference
+/// <reference path="../types/glsl.d.ts" />
+
+import snowFrag from './snow_particle.fragment.glsl';
+import snowVert from './snow_particle.vertex.glsl';
+import rainFrag from './rain_particle.fragment.glsl';
+import rainVert from './rain_particle.vertex.glsl';
+import vignetteFrag from './vignette.fragment.glsl';
+import vignetteVert from './vignette.vertex.glsl';
+import {compile} from './shaders';
+
+export default {
+    snowParticle: compile(snowFrag, snowVert),
+    rainParticle: compile(rainFrag, rainVert),
+    vignette: compile(vignetteFrag, vignetteVert)
+};