wallhammer-web 0.0.0-stage → 0.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +21 -0
- package/README.md +92 -2
- package/dist/base/data.d.ts +67 -0
- package/dist/base/data.js +10 -0
- package/dist/base/destructible.d.ts +167 -0
- package/dist/base/destructible.js +47 -0
- package/dist/base/env-slot.d.ts +101 -0
- package/dist/base/env-slot.js +8 -0
- package/dist/base/frames.d.ts +138 -0
- package/dist/base/frames.js +459 -0
- package/dist/base/index.d.ts +21 -0
- package/dist/base/index.js +11 -0
- package/dist/base/mat34.d.ts +46 -0
- package/dist/base/mat34.js +173 -0
- package/dist/base/material.d.ts +87 -0
- package/dist/base/material.js +6 -0
- package/dist/base/math.d.ts +27 -0
- package/dist/base/math.js +60 -0
- package/dist/base/progress.d.ts +38 -0
- package/dist/base/progress.js +81 -0
- package/dist/base/rig.d.ts +177 -0
- package/dist/base/rig.js +97 -0
- package/dist/base/trig.d.ts +29 -0
- package/dist/base/trig.js +169 -0
- package/dist/base/up.d.ts +26 -0
- package/dist/base/up.js +40 -0
- package/dist/base/view.d.ts +128 -0
- package/dist/base/view.js +136 -0
- package/dist/camera/camera.d.ts +99 -0
- package/dist/camera/camera.js +228 -0
- package/dist/camera/follow.d.ts +120 -0
- package/dist/camera/follow.js +320 -0
- package/dist/camera/free.d.ts +153 -0
- package/dist/camera/free.js +359 -0
- package/dist/camera/index.d.ts +10 -0
- package/dist/camera/index.js +6 -0
- package/dist/camera/orbit.d.ts +93 -0
- package/dist/camera/orbit.js +261 -0
- package/dist/camera/path.d.ts +48 -0
- package/dist/camera/path.js +179 -0
- package/dist/core/ballistic.d.ts +66 -0
- package/dist/core/ballistic.js +104 -0
- package/dist/core/bodies.d.ts +77 -0
- package/dist/core/bodies.js +125 -0
- package/dist/core/clock.d.ts +37 -0
- package/dist/core/clock.js +87 -0
- package/dist/core/cover-fade.d.ts +14 -0
- package/dist/core/cover-fade.js +38 -0
- package/dist/core/index.d.ts +13 -0
- package/dist/core/index.js +8 -0
- package/dist/core/kepler.d.ts +74 -0
- package/dist/core/kepler.js +108 -0
- package/dist/core/level-fade.d.ts +66 -0
- package/dist/core/level-fade.js +123 -0
- package/dist/core/palette.d.ts +15 -0
- package/dist/core/palette.js +47 -0
- package/dist/env/atmosphere.d.ts +129 -0
- package/dist/env/atmosphere.js +707 -0
- package/dist/env/cloud-field.d.ts +44 -0
- package/dist/env/cloud-field.js +111 -0
- package/dist/env/environment.d.ts +217 -0
- package/dist/env/environment.js +441 -0
- package/dist/env/frame-block.d.ts +29 -0
- package/dist/env/frame-block.js +152 -0
- package/dist/env/glsl.d.ts +35 -0
- package/dist/env/glsl.js +246 -0
- package/dist/env/index.d.ts +13 -0
- package/dist/env/index.js +9 -0
- package/dist/env/sky.d.ts +48 -0
- package/dist/env/sky.js +227 -0
- package/dist/env/sun.d.ts +31 -0
- package/dist/env/sun.js +42 -0
- package/dist/gen-arch/build.d.ts +17 -0
- package/dist/gen-arch/build.js +414 -0
- package/dist/gen-arch/damage/damaged.d.ts +44 -0
- package/dist/gen-arch/damage/damaged.js +1119 -0
- package/dist/gen-arch/damage/fall-material.d.ts +10 -0
- package/dist/gen-arch/damage/fall-material.js +47 -0
- package/dist/gen-arch/damage/fall.d.ts +78 -0
- package/dist/gen-arch/damage/fall.js +797 -0
- package/dist/gen-arch/damage/rubble.d.ts +22 -0
- package/dist/gen-arch/damage/rubble.js +188 -0
- package/dist/gen-arch/index.d.ts +25 -0
- package/dist/gen-arch/index.js +16 -0
- package/dist/gen-arch/interior/interior-plan.d.ts +114 -0
- package/dist/gen-arch/interior/interior-plan.js +615 -0
- package/dist/gen-arch/interior/interior.d.ts +97 -0
- package/dist/gen-arch/interior/interior.js +966 -0
- package/dist/gen-arch/structure/building-shader.d.ts +25 -0
- package/dist/gen-arch/structure/building-shader.js +946 -0
- package/dist/gen-arch/structure/buildings.d.ts +248 -0
- package/dist/gen-arch/structure/buildings.js +294 -0
- package/dist/gen-arch/structure/dims.d.ts +77 -0
- package/dist/gen-arch/structure/dims.js +39 -0
- package/dist/gen-arch/structure/distant.d.ts +62 -0
- package/dist/gen-arch/structure/distant.js +316 -0
- package/dist/gen-arch/structure/env-slots.d.ts +18 -0
- package/dist/gen-arch/structure/env-slots.js +47 -0
- package/dist/gen-arch/structure/facade.d.ts +193 -0
- package/dist/gen-arch/structure/facade.js +159 -0
- package/dist/gen-arch/structure/parts.d.ts +31 -0
- package/dist/gen-arch/structure/parts.js +69 -0
- package/dist/gen-arch/structure/roof.d.ts +76 -0
- package/dist/gen-arch/structure/roof.js +568 -0
- package/dist/gen-arch/structure/structure-material.d.ts +23 -0
- package/dist/gen-arch/structure/structure-material.js +55 -0
- package/dist/gen-arch/structure/writer.d.ts +94 -0
- package/dist/gen-arch/structure/writer.js +195 -0
- package/dist/gen-core/cell.d.ts +138 -0
- package/dist/gen-core/cell.js +150 -0
- package/dist/gen-core/cube-sphere.d.ts +57 -0
- package/dist/gen-core/cube-sphere.js +159 -0
- package/dist/gen-core/field.d.ts +55 -0
- package/dist/gen-core/field.js +154 -0
- package/dist/gen-core/geometry.d.ts +31 -0
- package/dist/gen-core/geometry.js +231 -0
- package/dist/gen-core/hash.d.ts +18 -0
- package/dist/gen-core/hash.js +58 -0
- package/dist/gen-core/height-field.d.ts +33 -0
- package/dist/gen-core/height-field.js +137 -0
- package/dist/gen-core/index.d.ts +22 -0
- package/dist/gen-core/index.js +17 -0
- package/dist/gen-core/instance-cells.d.ts +37 -0
- package/dist/gen-core/instance-cells.js +72 -0
- package/dist/gen-core/near-scatter.d.ts +56 -0
- package/dist/gen-core/near-scatter.js +120 -0
- package/dist/gen-core/noise.d.ts +23 -0
- package/dist/gen-core/noise.js +72 -0
- package/dist/gen-core/occupancy.d.ts +21 -0
- package/dist/gen-core/occupancy.js +104 -0
- package/dist/gen-core/sphere-patch.d.ts +138 -0
- package/dist/gen-core/sphere-patch.js +544 -0
- package/dist/gen-core/strip-surface.d.ts +34 -0
- package/dist/gen-core/strip-surface.js +246 -0
- package/dist/gen-core/strip.d.ts +102 -0
- package/dist/gen-core/strip.js +817 -0
- package/dist/gen-ground/env-slots.d.ts +48 -0
- package/dist/gen-ground/env-slots.js +78 -0
- package/dist/gen-ground/ground.d.ts +78 -0
- package/dist/gen-ground/ground.js +208 -0
- package/dist/gen-ground/index.d.ts +9 -0
- package/dist/gen-ground/index.js +7 -0
- package/dist/gen-ground/markings.d.ts +46 -0
- package/dist/gen-ground/markings.js +124 -0
- package/dist/gen-ground/materials.d.ts +18 -0
- package/dist/gen-ground/materials.js +22 -0
- package/dist/gen-ground/terrain-shader.d.ts +5 -0
- package/dist/gen-ground/terrain-shader.js +151 -0
- package/dist/gen-mesh/bare-shapes.d.ts +194 -0
- package/dist/gen-mesh/bare-shapes.js +596 -0
- package/dist/gen-mesh/bisect-surface.d.ts +47 -0
- package/dist/gen-mesh/bisect-surface.js +261 -0
- package/dist/gen-mesh/box.d.ts +18 -0
- package/dist/gen-mesh/box.js +2 -0
- package/dist/gen-mesh/cell-morph-mesh.d.ts +52 -0
- package/dist/gen-mesh/cell-morph-mesh.js +258 -0
- package/dist/gen-mesh/cell-surface-mesh.d.ts +32 -0
- package/dist/gen-mesh/cell-surface-mesh.js +140 -0
- package/dist/gen-mesh/chunk-mesh.d.ts +25 -0
- package/dist/gen-mesh/chunk-mesh.js +112 -0
- package/dist/gen-mesh/drape-mesh.d.ts +36 -0
- package/dist/gen-mesh/drape-mesh.js +98 -0
- package/dist/gen-mesh/height-field-mesh.d.ts +14 -0
- package/dist/gen-mesh/height-field-mesh.js +98 -0
- package/dist/gen-mesh/index.d.ts +26 -0
- package/dist/gen-mesh/index.js +15 -0
- package/dist/gen-mesh/line-mesh.d.ts +25 -0
- package/dist/gen-mesh/line-mesh.js +62 -0
- package/dist/gen-mesh/mesh-builder.d.ts +115 -0
- package/dist/gen-mesh/mesh-builder.js +315 -0
- package/dist/gen-mesh/packed-mesh.d.ts +53 -0
- package/dist/gen-mesh/packed-mesh.js +205 -0
- package/dist/gen-mesh/prism-mesh.d.ts +33 -0
- package/dist/gen-mesh/prism-mesh.js +176 -0
- package/dist/gen-mesh/rig-mesh.d.ts +9 -0
- package/dist/gen-mesh/rig-mesh.js +135 -0
- package/dist/gen-mesh/strip-mesh.d.ts +45 -0
- package/dist/gen-mesh/strip-mesh.js +258 -0
- package/dist/gen-plan/drain.d.ts +58 -0
- package/dist/gen-plan/drain.js +270 -0
- package/dist/gen-plan/grid.d.ts +37 -0
- package/dist/gen-plan/grid.js +182 -0
- package/dist/gen-plan/horizon.d.ts +50 -0
- package/dist/gen-plan/horizon.js +185 -0
- package/dist/gen-plan/index.d.ts +15 -0
- package/dist/gen-plan/index.js +13 -0
- package/dist/gen-plan/line-tiles.d.ts +35 -0
- package/dist/gen-plan/line-tiles.js +190 -0
- package/dist/gen-plan/lines.d.ts +31 -0
- package/dist/gen-plan/lines.js +183 -0
- package/dist/gen-plan/plots.d.ts +40 -0
- package/dist/gen-plan/plots.js +282 -0
- package/dist/gen-plan/route.d.ts +55 -0
- package/dist/gen-plan/route.js +297 -0
- package/dist/gen-plan/sites.d.ts +32 -0
- package/dist/gen-plan/sites.js +209 -0
- package/dist/gen-tex/code-stamp.d.ts +31 -0
- package/dist/gen-tex/code-stamp.js +137 -0
- package/dist/gen-tex/index.d.ts +7 -0
- package/dist/gen-tex/index.js +5 -0
- package/dist/gen-tex/light-horizon.d.ts +47 -0
- package/dist/gen-tex/light-horizon.js +180 -0
- package/dist/gen-tex/textures.d.ts +8 -0
- package/dist/gen-tex/textures.js +49 -0
- package/dist/gen-tex/value-textures.d.ts +46 -0
- package/dist/gen-tex/value-textures.js +102 -0
- package/dist/gen-vegetation/env-slots.d.ts +20 -0
- package/dist/gen-vegetation/env-slots.js +29 -0
- package/dist/gen-vegetation/index.d.ts +8 -0
- package/dist/gen-vegetation/index.js +7 -0
- package/dist/gen-vegetation/materials.d.ts +7 -0
- package/dist/gen-vegetation/materials.js +17 -0
- package/dist/gen-vegetation/planting.d.ts +170 -0
- package/dist/gen-vegetation/planting.js +363 -0
- package/dist/gen-vegetation/tree-shader.d.ts +23 -0
- package/dist/gen-vegetation/tree-shader.js +229 -0
- package/dist/gen-vegetation/trees.d.ts +59 -0
- package/dist/gen-vegetation/trees.js +329 -0
- package/dist/gpu/device.d.ts +286 -0
- package/dist/gpu/device.js +1157 -0
- package/dist/gpu/gl.d.ts +134 -0
- package/dist/gpu/gl.js +276 -0
- package/dist/gpu/index.d.ts +4 -0
- package/dist/gpu/index.js +3 -0
- package/dist/index.d.ts +11 -0
- package/dist/index.js +13 -0
- package/dist/motion/graph.d.ts +244 -0
- package/dist/motion/graph.js +739 -0
- package/dist/motion/index.d.ts +8 -0
- package/dist/motion/index.js +8 -0
- package/dist/motion/pose-ops.d.ts +30 -0
- package/dist/motion/pose-ops.js +232 -0
- package/dist/motion/reach.d.ts +45 -0
- package/dist/motion/reach.js +264 -0
- package/dist/motion/skeleton.d.ts +49 -0
- package/dist/motion/skeleton.js +99 -0
- package/dist/platform/byte-store.d.ts +21 -0
- package/dist/platform/byte-store.js +137 -0
- package/dist/platform/canvas.d.ts +29 -0
- package/dist/platform/canvas.js +76 -0
- package/dist/platform/context-loss.d.ts +8 -0
- package/dist/platform/context-loss.js +17 -0
- package/dist/platform/free-input.d.ts +51 -0
- package/dist/platform/free-input.js +100 -0
- package/dist/platform/index.d.ts +18 -0
- package/dist/platform/index.js +10 -0
- package/dist/platform/input.d.ts +48 -0
- package/dist/platform/input.js +117 -0
- package/dist/platform/keys.d.ts +12 -0
- package/dist/platform/keys.js +29 -0
- package/dist/platform/loop.d.ts +41 -0
- package/dist/platform/loop.js +84 -0
- package/dist/platform/walk-input.d.ts +74 -0
- package/dist/platform/walk-input.js +226 -0
- package/dist/platform/worker.d.ts +51 -0
- package/dist/platform/worker.js +170 -0
- package/dist/render/bone-instances.d.ts +24 -0
- package/dist/render/bone-instances.js +74 -0
- package/dist/render/cells.d.ts +70 -0
- package/dist/render/cells.js +144 -0
- package/dist/render/glsl.d.ts +66 -0
- package/dist/render/glsl.js +173 -0
- package/dist/render/index.d.ts +26 -0
- package/dist/render/index.js +16 -0
- package/dist/render/instance-sets.d.ts +97 -0
- package/dist/render/instance-sets.js +241 -0
- package/dist/render/near-instances.d.ts +75 -0
- package/dist/render/near-instances.js +219 -0
- package/dist/render/particles.d.ts +63 -0
- package/dist/render/particles.js +215 -0
- package/dist/render/pieces.d.ts +57 -0
- package/dist/render/pieces.js +151 -0
- package/dist/render/point-lights.d.ts +97 -0
- package/dist/render/point-lights.js +243 -0
- package/dist/render/renderer.d.ts +447 -0
- package/dist/render/renderer.js +1100 -0
- package/dist/render/rig.d.ts +74 -0
- package/dist/render/rig.js +576 -0
- package/dist/render/shadow-areas.d.ts +49 -0
- package/dist/render/shadow-areas.js +125 -0
- package/dist/render/shadow-glsl.d.ts +12 -0
- package/dist/render/shadow-glsl.js +146 -0
- package/dist/render/transient.d.ts +61 -0
- package/dist/render/transient.js +213 -0
- package/dist/render/value-glsl.d.ts +17 -0
- package/dist/render/value-glsl.js +208 -0
- package/dist/render/value-layers.d.ts +180 -0
- package/dist/render/value-layers.js +333 -0
- package/dist/runtime/atmosphere.d.ts +37 -0
- package/dist/runtime/atmosphere.js +304 -0
- package/dist/runtime/cloud-shell.d.ts +29 -0
- package/dist/runtime/cloud-shell.js +158 -0
- package/dist/runtime/engine.d.ts +155 -0
- package/dist/runtime/engine.js +305 -0
- package/dist/runtime/environment-link.d.ts +22 -0
- package/dist/runtime/environment-link.js +49 -0
- package/dist/runtime/index.d.ts +13 -0
- package/dist/runtime/index.js +12 -0
- package/dist/runtime/precipitation-glsl.d.ts +2 -0
- package/dist/runtime/precipitation-glsl.js +70 -0
- package/dist/runtime/precipitation.d.ts +11 -0
- package/dist/runtime/precipitation.js +78 -0
- package/dist/runtime/sky.d.ts +30 -0
- package/dist/runtime/sky.js +114 -0
- package/dist/runtime/streaming.d.ts +245 -0
- package/dist/runtime/streaming.js +602 -0
- package/dist/sim/agenda.d.ts +167 -0
- package/dist/sim/agenda.js +425 -0
- package/dist/sim/bytes.d.ts +34 -0
- package/dist/sim/bytes.js +125 -0
- package/dist/sim/destruction/apply.d.ts +59 -0
- package/dist/sim/destruction/apply.js +243 -0
- package/dist/sim/destruction/cell-states.d.ts +54 -0
- package/dist/sim/destruction/cell-states.js +198 -0
- package/dist/sim/destruction/index.d.ts +11 -0
- package/dist/sim/destruction/index.js +10 -0
- package/dist/sim/destruction/int-geometry.d.ts +17 -0
- package/dist/sim/destruction/int-geometry.js +131 -0
- package/dist/sim/destruction/pick.d.ts +13 -0
- package/dist/sim/destruction/pick.js +59 -0
- package/dist/sim/destruction/rubble.d.ts +8 -0
- package/dist/sim/destruction/rubble.js +159 -0
- package/dist/sim/destruction/state.d.ts +15 -0
- package/dist/sim/destruction/state.js +83 -0
- package/dist/sim/destruction/structure.d.ts +30 -0
- package/dist/sim/destruction/structure.js +139 -0
- package/dist/sim/events.d.ts +37 -0
- package/dist/sim/events.js +106 -0
- package/dist/sim/fixed.d.ts +21 -0
- package/dist/sim/fixed.js +64 -0
- package/dist/sim/flow-probe.d.ts +58 -0
- package/dist/sim/flow-probe.js +158 -0
- package/dist/sim/flow.d.ts +257 -0
- package/dist/sim/flow.js +967 -0
- package/dist/sim/index.d.ts +28 -0
- package/dist/sim/index.js +20 -0
- package/dist/sim/interlock.d.ts +47 -0
- package/dist/sim/interlock.js +252 -0
- package/dist/sim/movers.d.ts +228 -0
- package/dist/sim/movers.js +1083 -0
- package/dist/sim/nav.d.ts +72 -0
- package/dist/sim/nav.js +292 -0
- package/dist/sim/paths.d.ts +80 -0
- package/dist/sim/paths.js +197 -0
- package/dist/sim/regions.d.ts +87 -0
- package/dist/sim/regions.js +517 -0
- package/dist/sim/simulation.d.ts +114 -0
- package/dist/sim/simulation.js +291 -0
- package/dist/sim/states.d.ts +23 -0
- package/dist/sim/states.js +54 -0
- package/dist/sim/table.d.ts +49 -0
- package/dist/sim/table.js +126 -0
- package/dist/sim/zones.d.ts +11 -0
- package/dist/sim/zones.js +196 -0
- package/dist/tools/collision-lines.d.ts +12 -0
- package/dist/tools/collision-lines.js +50 -0
- package/dist/tools/data-view-glsl.d.ts +3 -0
- package/dist/tools/data-view-glsl.js +63 -0
- package/dist/tools/data-view-layers.d.ts +20 -0
- package/dist/tools/data-view-layers.js +60 -0
- package/dist/tools/debug-view.d.ts +30 -0
- package/dist/tools/debug-view.js +4 -0
- package/dist/tools/index.d.ts +10 -0
- package/dist/tools/index.js +7 -0
- package/dist/tools/mesh-checks.d.ts +67 -0
- package/dist/tools/mesh-checks.js +188 -0
- package/dist/tools/profile.d.ts +85 -0
- package/dist/tools/profile.js +173 -0
- package/dist/world/cell-cache.d.ts +32 -0
- package/dist/world/cell-cache.js +60 -0
- package/dist/world/cell-format.d.ts +25 -0
- package/dist/world/cell-format.js +232 -0
- package/dist/world/collide.d.ts +192 -0
- package/dist/world/collide.js +822 -0
- package/dist/world/index.d.ts +16 -0
- package/dist/world/index.js +12 -0
- package/dist/world/mesh-solids.d.ts +48 -0
- package/dist/world/mesh-solids.js +169 -0
- package/dist/world/pick.d.ts +34 -0
- package/dist/world/pick.js +177 -0
- package/dist/world/providers.d.ts +66 -0
- package/dist/world/providers.js +83 -0
- package/dist/world/sphere.d.ts +69 -0
- package/dist/world/sphere.js +271 -0
- package/dist/world/streaming.d.ts +288 -0
- package/dist/world/streaming.js +801 -0
- package/dist/world/walker.d.ts +145 -0
- package/dist/world/walker.js +502 -0
- package/docs/architecture.md +111 -0
- package/docs/cameras.md +302 -0
- package/docs/concepts.md +123 -0
- package/docs/destruction.md +127 -0
- package/docs/frames.md +199 -0
- package/docs/generators.md +575 -0
- package/docs/getting-started.md +123 -0
- package/docs/headless.md +50 -0
- package/docs/motion.md +160 -0
- package/docs/planet.md +152 -0
- package/docs/recipes.md +521 -0
- package/docs/reference.md +364 -0
- package/docs/rendering.md +823 -0
- package/docs/rigs.md +203 -0
- package/docs/simulation.md +235 -0
- package/docs/streaming.md +590 -0
- package/docs/system.md +166 -0
- package/docs/tools.md +175 -0
- package/docs/walking.md +262 -0
- package/package.json +131 -3
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import type { Vec3 } from '../base/math.ts';
|
|
2
|
+
import type { EnvSlot } from '../base/env-slot.ts';
|
|
3
|
+
/** A cloud cover that varies by place. */
|
|
4
|
+
export interface CloudCoverField {
|
|
5
|
+
/** Unit axis in the frame the field is fixed in (the frame of radial up). */
|
|
6
|
+
axis: Vec3;
|
|
7
|
+
/** 8 covers 0–1 at |dot(up, axis)| = 0, 1/7 … 1, linear between. */
|
|
8
|
+
zonal: readonly number[];
|
|
9
|
+
/** 0–1: how far patches move the cover up and down. */
|
|
10
|
+
patchAmount: number;
|
|
11
|
+
/** Size of the patches in metres. */
|
|
12
|
+
patchSizeM: number;
|
|
13
|
+
/** 0 = none: one more lookup bends the patches, in patch sizes. */
|
|
14
|
+
patchWarp: number;
|
|
15
|
+
/** Metres the patch pattern has drifted (the app moves it with its time). */
|
|
16
|
+
patchOffset: Vec3;
|
|
17
|
+
/** Darkness of the cloud shadows, as `CloudConfig.darkness`. */
|
|
18
|
+
darkness: number;
|
|
19
|
+
}
|
|
20
|
+
/** What the slot hands the Frame block each frame. */
|
|
21
|
+
export interface CloudFieldValues {
|
|
22
|
+
axis: Vec3;
|
|
23
|
+
patchAmount: number;
|
|
24
|
+
patchOffset: Vec3;
|
|
25
|
+
invPatchSize: number;
|
|
26
|
+
zonal: readonly number[];
|
|
27
|
+
darkness: number;
|
|
28
|
+
/** Share of the sun the frame's light keeps under the global cover (`G`). */
|
|
29
|
+
frameSun: number;
|
|
30
|
+
patchWarp: number;
|
|
31
|
+
/** 0 when every cover is 0: the shader then returns full sun without a lookup. */
|
|
32
|
+
active: number;
|
|
33
|
+
}
|
|
34
|
+
/** Name of the slot; the environment link switches the lighting include when a block holds it. */
|
|
35
|
+
export declare const CLOUD_FIELD_SLOT = "cloudField";
|
|
36
|
+
/** The slot of a cloud cover by place. Its members follow those of the sky and the atmosphere (orders 1200–1240). */
|
|
37
|
+
export declare function cloudFieldSlot(params: CloudCoverField): EnvSlot<CloudCoverField, CloudFieldValues>;
|
|
38
|
+
/** The shader's cloud cover 0–1 at unit up `up` on a sphere of radius `radiusM`, in the frame of the field. */
|
|
39
|
+
export declare function cloudFieldCover(f: CloudCoverField, up: Vec3, radiusM: number): number;
|
|
40
|
+
/**
|
|
41
|
+
* Sun share S under a cloud cover where the shadow pattern has the value `noise` (0–1): the pattern's darkness and
|
|
42
|
+
* thresholds and the overcast dimming of `cloudCoverTerms` for that cover.
|
|
43
|
+
*/
|
|
44
|
+
export declare function cloudFieldSun(cover: number, noise: number, darkness: number): number;
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
// Cloud cover by place, an opt-in environment slot for radial up. Without it the cloud cover is one number for the
|
|
2
|
+
// whole world (`weather.cloudCover`). With it the cover over a place is a profile by the angle between the place's up
|
|
3
|
+
// and an axis, plus drifting patches; the shadow pattern over it is the engine's cloud field. The frame's light stays
|
|
4
|
+
// dimmed by the global cover, so the shader divides by that dimming: a constant field equal to `weather.cloudCover`
|
|
5
|
+
// gives the picture without the slot.
|
|
6
|
+
// The slot has no GLSL of its own: the functions arrive with the lighting include (`lightingGlsl({ cloudField: true })`),
|
|
7
|
+
// which the environment link registers when the block holds a slot of this name.
|
|
8
|
+
import { clamp, smoothstep } from '../base/math.js';
|
|
9
|
+
import { cloudCoverTerms } from './environment.js';
|
|
10
|
+
/** Name of the slot; the environment link switches the lighting include when a block holds it. */
|
|
11
|
+
export const CLOUD_FIELD_SLOT = 'cloudField';
|
|
12
|
+
function zonalAt(zonal, a) {
|
|
13
|
+
let c = 0;
|
|
14
|
+
for (let k = 0; k < 8; k++)
|
|
15
|
+
c += (zonal[k] ?? 0) * Math.max(1 - Math.abs(a - k), 0);
|
|
16
|
+
return c;
|
|
17
|
+
}
|
|
18
|
+
/** The slot of a cloud cover by place. Its members follow those of the sky and the atmosphere (orders 1200–1240). */
|
|
19
|
+
export function cloudFieldSlot(params) {
|
|
20
|
+
return {
|
|
21
|
+
name: CLOUD_FIELD_SLOT,
|
|
22
|
+
params,
|
|
23
|
+
fields: [
|
|
24
|
+
{ member: 'u_cloudFieldAxis', order: 1200, lanes: 'xyzw', doc: 'xyz axis of the cover profile, w patch amount' },
|
|
25
|
+
{ member: 'u_cloudFieldPatch', order: 1210, lanes: 'xyzw', doc: 'xyz patch drift in metres, w 1 / patch size' },
|
|
26
|
+
{ member: 'u_cloudFieldZonalA', order: 1220, lanes: 'xyzw', doc: 'covers at |up · axis| 0, 1/7, 2/7, 3/7' },
|
|
27
|
+
{ member: 'u_cloudFieldZonalB', order: 1230, lanes: 'xyzw', doc: 'covers at |up · axis| 4/7, 5/7, 6/7, 1' },
|
|
28
|
+
{ member: 'u_cloudFieldLight', order: 1240, lanes: 'xyzw', doc: 'x shadow darkness, y sun share of the frame, z warp, w 0 = no cover' },
|
|
29
|
+
],
|
|
30
|
+
compute(env, p) {
|
|
31
|
+
const zonal = Array.from({ length: 8 }, (_, k) => clamp(p.zonal[k] ?? 0, 0, 1));
|
|
32
|
+
const any = zonal.some((z) => z > 0) || p.patchAmount > 0;
|
|
33
|
+
return {
|
|
34
|
+
axis: p.axis,
|
|
35
|
+
patchAmount: clamp(p.patchAmount, 0, 1),
|
|
36
|
+
patchOffset: p.patchOffset,
|
|
37
|
+
invPatchSize: p.patchSizeM > 0 ? 1 / p.patchSizeM : 0,
|
|
38
|
+
zonal,
|
|
39
|
+
darkness: p.darkness,
|
|
40
|
+
frameSun: cloudCoverTerms(env.cloudCover, p.darkness).sunShare,
|
|
41
|
+
patchWarp: Math.max(p.patchWarp, 0),
|
|
42
|
+
active: any ? 1 : 0,
|
|
43
|
+
};
|
|
44
|
+
},
|
|
45
|
+
lanes: (v) => [
|
|
46
|
+
v.axis[0], v.axis[1], v.axis[2], v.patchAmount,
|
|
47
|
+
v.patchOffset[0], v.patchOffset[1], v.patchOffset[2], v.invPatchSize,
|
|
48
|
+
v.zonal[0], v.zonal[1], v.zonal[2], v.zonal[3],
|
|
49
|
+
v.zonal[4], v.zonal[5], v.zonal[6], v.zonal[7],
|
|
50
|
+
v.darkness, v.frameSun, v.patchWarp, v.active,
|
|
51
|
+
],
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
// --- The integer hash and value noise of the shader include `noise`, repeated in TypeScript ----------------------
|
|
55
|
+
function hashU(x) {
|
|
56
|
+
x = (x ^ (x >>> 16)) >>> 0;
|
|
57
|
+
x = Math.imul(x, 0x7feb352d) >>> 0;
|
|
58
|
+
x = (x ^ (x >>> 15)) >>> 0;
|
|
59
|
+
x = Math.imul(x, 0x846ca68b) >>> 0;
|
|
60
|
+
return (x ^ (x >>> 16)) >>> 0;
|
|
61
|
+
}
|
|
62
|
+
function hash3(x, y, z, seed) {
|
|
63
|
+
const hz = hashU(((z >>> 0) + seed) >>> 0);
|
|
64
|
+
const hy = hashU((Math.imul(y >>> 0, 0xc2b2ae35) ^ hz) >>> 0);
|
|
65
|
+
return hashU((Math.imul(x >>> 0, 0x9e3779b1) ^ hy) >>> 0) / 4294967296;
|
|
66
|
+
}
|
|
67
|
+
function mix(a, b, t) {
|
|
68
|
+
return a + (b - a) * t;
|
|
69
|
+
}
|
|
70
|
+
function vnoise3(px, py, pz, seed) {
|
|
71
|
+
const fx = Math.floor(px), fy = Math.floor(py), fz = Math.floor(pz);
|
|
72
|
+
let tx = px - fx, ty = py - fy, tz = pz - fz;
|
|
73
|
+
tx = tx * tx * (3 - 2 * tx);
|
|
74
|
+
ty = ty * ty * (3 - 2 * ty);
|
|
75
|
+
tz = tz * tz * (3 - 2 * tz);
|
|
76
|
+
const ix = fx | 0, iy = fy | 0, iz = fz | 0;
|
|
77
|
+
const a = mix(hash3(ix, iy, iz, seed), hash3(ix + 1, iy, iz, seed), tx);
|
|
78
|
+
const b = mix(hash3(ix, iy + 1, iz, seed), hash3(ix + 1, iy + 1, iz, seed), tx);
|
|
79
|
+
const c = mix(hash3(ix, iy, iz + 1, seed), hash3(ix + 1, iy, iz + 1, seed), tx);
|
|
80
|
+
const d = mix(hash3(ix, iy + 1, iz + 1, seed), hash3(ix + 1, iy + 1, iz + 1, seed), tx);
|
|
81
|
+
return mix(mix(a, b, ty), mix(c, d, ty), tz);
|
|
82
|
+
}
|
|
83
|
+
/** The shader's cloud cover 0–1 at unit up `up` on a sphere of radius `radiusM`, in the frame of the field. */
|
|
84
|
+
export function cloudFieldCover(f, up, radiusM) {
|
|
85
|
+
const a = Math.abs(up[0] * f.axis[0] + up[1] * f.axis[1] + up[2] * f.axis[2]) * 7;
|
|
86
|
+
let c = zonalAt(f.zonal.map((z) => clamp(z, 0, 1)), a);
|
|
87
|
+
const amount = clamp(f.patchAmount, 0, 1);
|
|
88
|
+
if (amount > 0 && f.patchSizeM > 0) {
|
|
89
|
+
const inv = 1 / f.patchSizeM;
|
|
90
|
+
let qx = (up[0] * radiusM - f.patchOffset[0]) * inv;
|
|
91
|
+
let qy = (up[1] * radiusM - f.patchOffset[1]) * inv;
|
|
92
|
+
let qz = (up[2] * radiusM - f.patchOffset[2]) * inv;
|
|
93
|
+
if (f.patchWarp > 0) {
|
|
94
|
+
const w = f.patchWarp * (vnoise3(qx * 0.6 + 31, qy * 0.6 + 31, qz * 0.6 + 31, 73) - 0.5);
|
|
95
|
+
qx += w;
|
|
96
|
+
qy += w;
|
|
97
|
+
qz += w;
|
|
98
|
+
}
|
|
99
|
+
const p = 0.65 * vnoise3(qx, qy, qz, 71) + 0.35 * vnoise3(qx * 2.3 + 17, qy * 2.3 + 17, qz * 2.3 + 17, 72);
|
|
100
|
+
c += amount * (2 * p - 1);
|
|
101
|
+
}
|
|
102
|
+
return clamp(c, 0, 1);
|
|
103
|
+
}
|
|
104
|
+
/**
|
|
105
|
+
* Sun share S under a cloud cover where the shadow pattern has the value `noise` (0–1): the pattern's darkness and
|
|
106
|
+
* thresholds and the overcast dimming of `cloudCoverTerms` for that cover.
|
|
107
|
+
*/
|
|
108
|
+
export function cloudFieldSun(cover, noise, darkness) {
|
|
109
|
+
const t = cloudCoverTerms(cover, darkness);
|
|
110
|
+
return (1 - t.darkness * smoothstep(t.lo, t.hi, noise)) * t.sunShare;
|
|
111
|
+
}
|
|
@@ -0,0 +1,217 @@
|
|
|
1
|
+
import { Clock } from '../core/clock.ts';
|
|
2
|
+
import type { RGB, Vec3 } from '../base/math.ts';
|
|
3
|
+
import type { View } from '../base/view.ts';
|
|
4
|
+
import type { FogLayer, FrameEnvironment, LightMode } from '../base/env-slot.ts';
|
|
5
|
+
import type { SunPosition, SunSite } from './sun.ts';
|
|
6
|
+
export type { FogLayer, FrameEnvironment, LightMode, RGB };
|
|
7
|
+
/**
|
|
8
|
+
* Direction to a light that turns with the view: azimuth is measured from the "toward the viewer" direction to the left
|
|
9
|
+
* across the screen, 90° is exactly from the left, a smaller angle lights more from the front.
|
|
10
|
+
*/
|
|
11
|
+
export declare function studioLightDirection(heading: number, azimuthFromViewDeg: number, elevationDeg: number): Vec3;
|
|
12
|
+
/** Studio light. Colours are multiples of the surface colour. */
|
|
13
|
+
export interface StudioLight {
|
|
14
|
+
/** Sun height above the horizon. */
|
|
15
|
+
sunElevationDeg: number;
|
|
16
|
+
/** Sun angle from the direction toward the viewer to the left across the screen. 90° = exactly from the left. */
|
|
17
|
+
sunAzimuthFromViewDeg: number;
|
|
18
|
+
sun: RGB;
|
|
19
|
+
ambient: RGB;
|
|
20
|
+
/** Sky light from above, at full strength on horizontal surfaces. */
|
|
21
|
+
skyFill: RGB;
|
|
22
|
+
/** Warm bounce from the ground, at full strength on vertical walls. */
|
|
23
|
+
bounce: RGB;
|
|
24
|
+
/** Surface colour shift, multiplies the surface colour. */
|
|
25
|
+
warmTint: RGB;
|
|
26
|
+
/** Overall brightness before the output curve. */
|
|
27
|
+
exposure: number;
|
|
28
|
+
}
|
|
29
|
+
/** Light of the 'fixed' mode: a direction in the world and the light's numbers as they are. Colours are multiples of the surface colour. */
|
|
30
|
+
export interface FixedLight {
|
|
31
|
+
/** Direction toward the light in world axes; need not be unit (it is normalised each frame). */
|
|
32
|
+
toLight: Vec3;
|
|
33
|
+
sun: RGB;
|
|
34
|
+
ambient: RGB;
|
|
35
|
+
/** Sky light from above, at full strength on horizontal surfaces. */
|
|
36
|
+
skyFill: RGB;
|
|
37
|
+
/** Light from below, at full strength on vertical walls. */
|
|
38
|
+
bounce: RGB;
|
|
39
|
+
/** Multiplies the surface colour. */
|
|
40
|
+
warmTint: RGB;
|
|
41
|
+
/** Overall brightness before the output curve. */
|
|
42
|
+
exposure: number;
|
|
43
|
+
/** Multiple of the renderer's background colour. */
|
|
44
|
+
backdrop: RGB;
|
|
45
|
+
}
|
|
46
|
+
/** Light colours during the day. Values blend between day and night according to the sun height. */
|
|
47
|
+
export interface DayLight {
|
|
48
|
+
/** Sun high and sun just above the horizon. */
|
|
49
|
+
sunHigh: RGB;
|
|
50
|
+
sunLow: RGB;
|
|
51
|
+
ambientDay: RGB;
|
|
52
|
+
ambientNight: RGB;
|
|
53
|
+
/** Addition to ambient light at dusk and dawn. */
|
|
54
|
+
twilight: RGB;
|
|
55
|
+
/** How much the sky light from above strengthens when the sun is low. The ground does not go black, walls in shadow barely brighten. */
|
|
56
|
+
lowSunFill: number;
|
|
57
|
+
/** How much the overall brightness rises when the sun is not high. Mornings and afternoons are thus not grey. */
|
|
58
|
+
lowSunExposure: number;
|
|
59
|
+
skyDay: RGB;
|
|
60
|
+
skyNight: RGB;
|
|
61
|
+
bounce: RGB;
|
|
62
|
+
tintDay: RGB;
|
|
63
|
+
tintNight: RGB;
|
|
64
|
+
/** Moon: colour and fixed position in the sky (azimuth from north clockwise). */
|
|
65
|
+
moon: RGB;
|
|
66
|
+
moonAzimuthDeg: number;
|
|
67
|
+
moonElevationDeg: number;
|
|
68
|
+
/** Multiple of the background colour at night. */
|
|
69
|
+
backdropNight: RGB;
|
|
70
|
+
/** Brightness at night. Higher than by day so the night stays readable. */
|
|
71
|
+
exposureNight: number;
|
|
72
|
+
/** The light does not drop below this: under this angle shadows would be infinite and could not be computed. */
|
|
73
|
+
minLightElevationDeg: number;
|
|
74
|
+
/** Sky as seen, in screen space: straight up and at the horizon, by day and at night. */
|
|
75
|
+
skyZenithDay: RGB;
|
|
76
|
+
skyHorizonDay: RGB;
|
|
77
|
+
skyZenithNight: RGB;
|
|
78
|
+
skyHorizonNight: RGB;
|
|
79
|
+
/** Added to the horizon at dusk and dawn. */
|
|
80
|
+
skyTwilight: RGB;
|
|
81
|
+
/** Light scattered in the sky around the sun, sun high and sun low. */
|
|
82
|
+
sunGlowHigh: RGB;
|
|
83
|
+
sunGlowLow: RGB;
|
|
84
|
+
}
|
|
85
|
+
/** Wind. The direction is meteorological: where it blows from, 0 = from the north, 90 = from the east. */
|
|
86
|
+
export interface WindConfig {
|
|
87
|
+
fromDeg: number;
|
|
88
|
+
/** Speed in m/s. A light breeze is 2–3 m/s. */
|
|
89
|
+
speedMs: number;
|
|
90
|
+
}
|
|
91
|
+
/** Cloud shadows on the scene. How many clouds there are is given by the cloud cover in the weather (`WeatherState.cloudCover`). */
|
|
92
|
+
export interface CloudConfig {
|
|
93
|
+
/** How much direct sun a cloud removes at partly cloudy, 0–1. 0 turns cloud shadows off. */
|
|
94
|
+
darkness: number;
|
|
95
|
+
/** Cloud size in metres. */
|
|
96
|
+
sizeM: number;
|
|
97
|
+
/** How many times faster than the wind at ground level the clouds drift. */
|
|
98
|
+
speedFactor: number;
|
|
99
|
+
}
|
|
100
|
+
/** Weather as the core draws it. Everything 0–1, the app converts its data to this. */
|
|
101
|
+
export interface WeatherState {
|
|
102
|
+
/** Cloud cover: 0 clear, 0.5 partly cloudy with drifting cloud shadows, 1 overcast (the sun barely shines, shadows vanish). */
|
|
103
|
+
cloudCover: number;
|
|
104
|
+
/** Precipitation strength 0–1 and its kind. Drawn as rain or snowfall over the image. */
|
|
105
|
+
precipitation: number;
|
|
106
|
+
precipitationKind: 'rain' | 'snow';
|
|
107
|
+
/** Snow cover 0–1. Where it settles is up to the content (an environment slot). */
|
|
108
|
+
snowCover: number;
|
|
109
|
+
/** Wetness 0–1: darker and glossier surfaces. */
|
|
110
|
+
wetness: number;
|
|
111
|
+
/** Fog and haze 0–1. Densest at the floor of the fog layer. */
|
|
112
|
+
fog: number;
|
|
113
|
+
}
|
|
114
|
+
export interface EnvironmentConfig {
|
|
115
|
+
mode?: LightMode;
|
|
116
|
+
studio?: Partial<StudioLight>;
|
|
117
|
+
/** Direction and numbers of the 'fixed' mode. */
|
|
118
|
+
fixed?: Partial<FixedLight>;
|
|
119
|
+
/** Place and date for 'day' mode. */
|
|
120
|
+
site?: Partial<SunSite>;
|
|
121
|
+
day?: Partial<DayLight>;
|
|
122
|
+
wind?: Partial<WindConfig>;
|
|
123
|
+
clouds?: Partial<CloudConfig>;
|
|
124
|
+
weather?: Partial<WeatherState>;
|
|
125
|
+
/** Vertical extent of the fog layer. */
|
|
126
|
+
fogLayer?: FogLayer;
|
|
127
|
+
/** Snow colour as a multiple of the light (albedo). */
|
|
128
|
+
snowAlbedo?: RGB;
|
|
129
|
+
/** Initial hour of day (0–24) and the speed of its run in hours per second. */
|
|
130
|
+
hour?: number;
|
|
131
|
+
hoursPerSecond?: number;
|
|
132
|
+
/** Should wind and clouds run right from the start? */
|
|
133
|
+
animate?: boolean;
|
|
134
|
+
}
|
|
135
|
+
export declare const DEFAULT_STUDIO: StudioLight;
|
|
136
|
+
/** The 'fixed' light: the studio colours, from the south-west, 44° high. */
|
|
137
|
+
export declare const DEFAULT_FIXED: FixedLight;
|
|
138
|
+
export declare const DEFAULT_SITE: SunSite;
|
|
139
|
+
export declare const DEFAULT_DAY: DayLight;
|
|
140
|
+
export declare const DEFAULT_WIND: WindConfig;
|
|
141
|
+
export declare const DEFAULT_CLOUDS: CloudConfig;
|
|
142
|
+
export declare const DEFAULT_WEATHER: WeatherState;
|
|
143
|
+
export declare const DEFAULT_SNOW_ALBEDO: RGB;
|
|
144
|
+
/**
|
|
145
|
+
* The cloud terms `Environment.frame` derives from a cloud cover, for code that needs them per place: the noise
|
|
146
|
+
* thresholds of the shadow pattern, its darkness, the overcast share and the share of sunlight left by that overcast.
|
|
147
|
+
*/
|
|
148
|
+
export declare function cloudCoverTerms(cover: number, darkness: number): {
|
|
149
|
+
lo: number;
|
|
150
|
+
hi: number;
|
|
151
|
+
darkness: number;
|
|
152
|
+
overcast: number;
|
|
153
|
+
sunShare: number;
|
|
154
|
+
};
|
|
155
|
+
/**
|
|
156
|
+
* GLSL twin of `cloudCoverTerms` for shaders that look the cover up per place (not exported from the package):
|
|
157
|
+
* `vec4 cloudCoverTerms(float cover, float darkness)` = (lo, hi, darkness, sun share).
|
|
158
|
+
*/
|
|
159
|
+
export declare const CLOUD_TERMS_GLSL: string;
|
|
160
|
+
/**
|
|
161
|
+
* The sun for a world whose up depends on the place: `sunDir` is the unit direction to the sun in the world's axes
|
|
162
|
+
* (the same for every place), `up` the unit up where the observer stands.
|
|
163
|
+
*/
|
|
164
|
+
export interface SunObserver {
|
|
165
|
+
up: Vec3;
|
|
166
|
+
sunDir: Vec3;
|
|
167
|
+
}
|
|
168
|
+
export declare class Environment {
|
|
169
|
+
mode: LightMode;
|
|
170
|
+
studio: StudioLight;
|
|
171
|
+
/** The 'fixed' mode's light; its fields may be changed (or the object replaced) at any time. */
|
|
172
|
+
fixed: FixedLight;
|
|
173
|
+
site: SunSite;
|
|
174
|
+
dayLight: DayLight;
|
|
175
|
+
wind: WindConfig;
|
|
176
|
+
clouds: CloudConfig;
|
|
177
|
+
/** Weather: changed directly, applies from the next frame. */
|
|
178
|
+
weather: WeatherState;
|
|
179
|
+
snowAlbedo: RGB;
|
|
180
|
+
/** Vertical extent of the fog layer; set when the scene is known. */
|
|
181
|
+
fogLayer: FogLayer;
|
|
182
|
+
/**
|
|
183
|
+
* In 'day' mode, for a world whose up depends on the place (default null: the sun follows `site` and up is +y).
|
|
184
|
+
* When set, the sun stands in the world direction `sunDir` whatever the site says, and everything that follows its
|
|
185
|
+
* height (light colours, exposure, sky colours, the swap to the moon) is computed for an observer whose up is `up`.
|
|
186
|
+
* Light directions of the frame are then world directions. Set it every frame from the eye's place.
|
|
187
|
+
*/
|
|
188
|
+
observer: SunObserver | null;
|
|
189
|
+
/** Animation time in seconds. Drives wind and clouds, later everything else that moves too. */
|
|
190
|
+
readonly time: Clock;
|
|
191
|
+
/** Hour of day 0–24 in civil time. Speed is in hours per second. */
|
|
192
|
+
readonly day: Clock;
|
|
193
|
+
constructor(config?: EnvironmentConfig);
|
|
194
|
+
/** Clock for the frame loop. */
|
|
195
|
+
get clocks(): Clock[];
|
|
196
|
+
/** Switches the lighting mode. In studio and fixed the hour of day means nothing, so its run is stopped. */
|
|
197
|
+
setMode(mode: LightMode): void;
|
|
198
|
+
/** Switches to the 'fixed' mode with the light toward `toLight` (world axes) and, optionally, other numbers of it. */
|
|
199
|
+
setFixedLight(toLight: Vec3, light?: Partial<Omit<FixedLight, 'toLight'>>): void;
|
|
200
|
+
/** Day of year (1–366). Drives the sun path; slots may read it too. */
|
|
201
|
+
get dayOfYear(): number;
|
|
202
|
+
/** Sets the date. Optionally also the local time offset from UTC (daylight saving time). */
|
|
203
|
+
setDate(dayOfYear: number, utcOffsetHours?: number): void;
|
|
204
|
+
/** Where the sun is now according to place, date and hour of day. */
|
|
205
|
+
sun(): SunPosition;
|
|
206
|
+
/** Environment state for one frame. Pure function of the clocks, settings and (in studio) the view heading. */
|
|
207
|
+
frame(view: Pick<View, 'heading'>): FrameEnvironment;
|
|
208
|
+
/** Fog and haze veil the sky too: the horizon goes almost to the fog colour, the zenith less. */
|
|
209
|
+
private applySkyFog;
|
|
210
|
+
/**
|
|
211
|
+
* Continuous cloud cover: direct sun weakens, its light is scattered into the surroundings and sky, colours cool.
|
|
212
|
+
* Scene shadows fade by themselves, since only direct sun makes them.
|
|
213
|
+
*/
|
|
214
|
+
private applyClouds;
|
|
215
|
+
/** Light without the influence of cloud cover: fixed, studio, or day according to the sun position. */
|
|
216
|
+
private lightFrame;
|
|
217
|
+
}
|