leaflet-city-mapper 0.0.3 → 0.0.5
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/README.md +44 -36
- package/cucumber.mjs +9 -9
- package/dist/leaflet-city-mapper-src.js +16302 -0
- package/dist/leaflet-city-mapper-src.js.map +7 -0
- package/dist/leaflet-city-mapper-worker-src.js +955 -0
- package/dist/leaflet-city-mapper-worker-src.js.map +7 -0
- package/dist/leaflet-city-mapper-worker.js +2 -0
- package/dist/leaflet-city-mapper-worker.js.map +7 -0
- package/dist/leaflet-city-mapper.js +4 -3
- package/dist/leaflet-city-mapper.js.map +4 -4
- package/libs/leaflet-lens.js +122 -0
- package/libs/leaflet.js +76 -0
- package/libs/openlayers-bindings.js +1128 -0
- package/libs/openlayers-bindings.min.js +99 -0
- package/libs/openlayers-bindings.min.js.map +7 -0
- package/package.json +6 -4
- package/src/animations/cancelCameraAnimation.js +17 -0
- package/src/animations/cancelGridFade.js +15 -0
- package/src/animations/endZoom.js +27 -0
- package/src/animations/mapAnimateCamera.js +26 -0
- package/src/animations/mapStopPitchBearingAnimation.js +6 -0
- package/src/animations/onZoomAnim.js +19 -0
- package/src/animations/renderPendingZoomAnimation.js +13 -0
- package/src/animations/runCameraAnimations.js +33 -0
- package/src/animations/runGridFades.js +20 -0
- package/src/animations/runMarkerPanFrame.js +14 -0
- package/src/animations/scheduleCameraAnimation.js +14 -0
- package/src/animations/scheduleGridFade.js +16 -0
- package/src/animations/scheduleMarkerPan.js +11 -0
- package/src/{scene → animations}/startZoom.js +5 -1
- package/src/animations/synchronizeZoomView.js +28 -0
- package/src/animations/updateZoomCamera.js +21 -0
- package/src/archives/decodeDirectory.js +44 -26
- package/src/archives/decodeHeader.js +15 -11
- package/src/archives/decompress.js +7 -2
- package/src/archives/findDirectoryEntry.js +9 -0
- package/src/archives/findTile.js +31 -0
- package/src/archives/getDirectoryEntries.js +19 -0
- package/src/archives/getHeader.js +12 -4
- package/src/archives/getTileData.js +13 -0
- package/src/archives/getZxy.js +10 -65
- package/src/archives/loadDirectory.js +3 -3
- package/src/archives/loadSource.js +25 -10
- package/src/archives/readArchiveRange.js +34 -0
- package/src/archives/readVarint.js +19 -0
- package/src/archives/tileId.js +7 -3
- package/src/astronomy/horizontalPosition.js +16 -0
- package/src/astronomy/moonPosition.js +18 -0
- package/src/astronomy/solarPosition.js +18 -0
- package/src/astronomy/solarTime.js +11 -0
- package/src/camera/cameraMapReady.js +5 -1
- package/src/camera/cleanupCameraMap.js +10 -5
- package/src/camera/createSceneCamera.js +21 -0
- package/src/camera/fitCameraBounds.js +36 -26
- package/src/camera/getBearing.js +5 -0
- package/src/camera/getPitch.js +5 -0
- package/src/camera/initializeCameraMap.js +10 -3
- package/src/camera/mapCamera.js +23 -43
- package/src/camera/mapContainerPointToLayerPoint.js +6 -4
- package/src/camera/mapGetBearing.js +5 -1
- package/src/camera/mapGetBounds.js +14 -8
- package/src/camera/mapGetBoundsCenterZoom.js +6 -3
- package/src/camera/mapGetBoundsZoom.js +19 -9
- package/src/camera/mapGetCenterLayerPoint.js +3 -2
- package/src/camera/mapGetPitch.js +5 -1
- package/src/camera/mapLayerPointToContainerPoint.js +5 -4
- package/src/camera/mapLimitCenter.js +13 -8
- package/src/camera/mapLimitOffset.js +7 -3
- package/src/camera/mapPanBy.js +5 -4
- package/src/camera/mapPanInside.js +17 -11
- package/src/camera/mapResetNorth.js +4 -1
- package/src/camera/mapResetNorthPitch.js +4 -1
- package/src/camera/mapSetBearing.js +3 -1
- package/src/camera/mapSetPitch.js +3 -1
- package/src/camera/mapSetPitchAndBearing.js +21 -11
- package/src/camera/mapSetZoomAround.js +12 -8
- package/src/camera/mapTryAnimatedPan.js +3 -2
- package/src/camera/mapUpdateCameraOverlays.js +3 -2
- package/src/camera/updateMapCamera.js +50 -0
- package/src/camera/updateSceneCamera.js +57 -0
- package/src/camera/updateSky.js +21 -14
- package/src/cog/decodeCogTile.js +24 -0
- package/src/cog/finiteCogValues.js +5 -0
- package/src/cog/getCogAssetEntry.js +15 -0
- package/src/cog/getCogBase.js +10 -0
- package/src/cog/getCogHeader.js +3 -0
- package/src/cog/getCogProfile.js +16 -0
- package/src/cog/getCogTile.js +12 -0
- package/src/cog/getColorTile.js +25 -0
- package/src/cog/getElevationTile.js +16 -0
- package/src/cog/hasCogProjection.js +9 -0
- package/src/cog/initCog.js +7 -0
- package/src/cog/invalidCogFullResponse.js +3 -0
- package/src/cog/openCog.js +30 -0
- package/src/cog/openCogAsset.js +14 -0
- package/src/cog/readCog.js +25 -0
- package/src/cog/readCogBlock.js +8 -0
- package/src/cog/readCogBody.js +20 -0
- package/src/cog/readCogDirectories.js +20 -0
- package/src/cog/readCogDirectory.js +21 -0
- package/src/cog/readCogLevel.js +27 -0
- package/src/cog/readCogTag.js +15 -0
- package/src/cog/validCogDimensions.js +6 -0
- package/src/cog/validCogEncoding.js +5 -0
- package/src/cog/validCogGeoArrays.js +8 -0
- package/src/cog/validCogGrid.js +9 -0
- package/src/cog/validCogTileCoordinates.js +4 -0
- package/src/cog/validateCogContainer.js +9 -0
- package/src/cog/validateCogContentRange.js +8 -0
- package/src/cog/validateCogOffsets.js +10 -0
- package/src/cog/validateCogRange.js +7 -0
- package/src/cog/validateCogResponse.js +15 -0
- package/src/collision/collider.js +31 -24
- package/src/collision/hiddenLightHit.js +8 -0
- package/src/collision/indexTriangle.js +11 -0
- package/src/collision/insideMesh.js +53 -0
- package/src/collision/insideWalker.js +46 -0
- package/src/collision/intersectMeshes.js +32 -133
- package/src/collision/localRay.js +21 -0
- package/src/collision/mergeHits.js +11 -0
- package/src/collision/rayBounds.js +19 -0
- package/src/collision/readTriangle.js +20 -0
- package/src/collision/sortHits.js +5 -11
- package/src/collision/trafficCollision.js +60 -0
- package/src/collision/transformTriangle.js +9 -0
- package/src/collision/triangleDistance.js +21 -0
- package/src/collision/worldHit.js +18 -0
- package/src/colors/formatRGB.js +8 -0
- package/src/colors/mixColor.js +7 -0
- package/src/{utils → colors}/parseColor.js +5 -5
- package/src/controls/addCameraHandler.js +11 -0
- package/src/controls/adjustCameraDrag.js +9 -3
- package/src/controls/cameraControls.js +56 -22
- package/src/controls/cameraDragClick.js +8 -7
- package/src/controls/cameraDragContextMenu.js +3 -2
- package/src/controls/cameraDragDown.js +21 -18
- package/src/controls/cameraDragEnd.js +3 -2
- package/src/controls/cameraDragMove.js +11 -6
- package/src/controls/changeCameraTouch.js +8 -2
- package/src/controls/cleanupCameraTouch.js +23 -16
- package/src/controls/compassAddHooks.js +13 -10
- package/src/controls/compassOrientation.js +2 -1
- package/src/controls/containerResizeAddHooks.js +3 -3
- package/src/controls/dragCamera.js +18 -14
- package/src/controls/endAllCameraDrags.js +4 -2
- package/src/controls/endAllCameraTouches.js +4 -2
- package/src/controls/endCameraTouch.js +3 -2
- package/src/controls/endCameraTouchEvent.js +5 -2
- package/src/controls/failCompassPermission.js +4 -0
- package/src/controls/finishCompassPermission.js +10 -9
- package/src/controls/loadCameraControls.js +2 -2
- package/src/controls/moveCameraTouch.js +18 -9
- package/src/controls/pitchDragAddHooks.js +3 -1
- package/src/controls/refreshRotateControl.js +9 -6
- package/src/controls/removeCameraDrag.js +7 -4
- package/src/controls/rotateButtonClick.js +8 -4
- package/src/controls/rotateButtonKeydown.js +8 -4
- package/src/controls/rotateControl.js +3 -2
- package/src/controls/rotateOnAdd.js +32 -28
- package/src/controls/shiftRotateAddHooks.js +6 -4
- package/src/controls/shiftRotateWheel.js +4 -2
- package/src/controls/startCameraTouch.js +34 -22
- package/src/core/adjustCameraMarkerPan.js +26 -20
- package/src/core/cameraCircleBounds.js +3 -2
- package/src/core/cameraMarkerDrag.js +16 -13
- package/src/core/cameraMarkerOnDrag.js +7 -2
- package/src/core/closestCameraLayerPoint.js +3 -2
- package/src/core/fireRasterLoad.js +3 -2
- package/src/core/gridlayerGetEvents.js +7 -4
- package/src/core/gridlayerGetTiledPixelBounds.js +8 -4
- package/src/core/initializeGridContainer.js +3 -2
- package/src/core/initializeNativeLayer.js +19 -20
- package/src/core/layerCallInitHooks.js +15 -0
- package/src/core/markerGetEvents.js +6 -2
- package/src/core/markerInitInteraction.js +4 -2
- package/src/core/markerSetIcon.js +6 -3
- package/src/core/markerSetPos.js +11 -6
- package/src/core/markerSetRotation.js +9 -7
- package/src/core/markerUpdateZIndex.js +10 -5
- package/src/core/popupAdjustPan.js +25 -19
- package/src/core/popupGetEvents.js +5 -2
- package/src/core/popupUpdatePosition.js +6 -3
- package/src/core/redrawPath.js +6 -0
- package/src/core/removeLayer.js +23 -0
- package/src/core/setRotation.js +5 -0
- package/src/core/tooltipGetEvents.js +5 -2
- package/src/core/tooltipSetPosition.js +6 -3
- package/src/core/updateGridOpacity.js +9 -5
- package/src/core/whenReady.js +11 -0
- package/src/geometry/addBridges.js +33 -87
- package/src/geometry/addGeneratedTriangle.js +7 -0
- package/src/{sources/addTriangle.js → geometry/appendAreaTriangle.js} +5 -5
- package/src/geometry/appendRouteDash.js +15 -0
- package/src/geometry/appendRouteSegment.js +15 -0
- package/src/geometry/assembleAreaGeometry.js +41 -0
- package/src/geometry/boundsQuad.js +12 -0
- package/src/geometry/box.js +6 -1
- package/src/geometry/bridgeEdge.js +11 -0
- package/src/geometry/bridgeElevation.js +3 -1
- package/src/geometry/bridgeFaces.js +15 -0
- package/src/geometry/bridgePaths.js +11 -0
- package/src/geometry/bridgePolygon.js +31 -0
- package/src/geometry/bridgeSides.js +11 -0
- package/src/geometry/buildExtrudedPolygon.js +10 -0
- package/src/geometry/{build.js → buildGeometryParts.js} +10 -6
- package/src/geometry/buildProjectedPoint.js +21 -0
- package/src/{sources/buildAreaPolygon.js → geometry/buildProjectedPolygon.js} +25 -29
- package/src/geometry/circleAt.js +4 -2
- package/src/geometry/circleGeometry.js +34 -0
- package/src/geometry/clipLine.js +1 -1
- package/src/geometry/clipSegment.js +11 -7
- package/src/geometry/computeBounds.js +28 -12
- package/src/geometry/conformModelToTerrain.js +25 -14
- package/src/geometry/createLampRing.js +14 -0
- package/src/geometry/createModelGeometry.js +41 -0
- package/src/geometry/createRasterQuadGeometry.js +29 -0
- package/src/geometry/createTreeRing.js +15 -0
- package/src/geometry/crossVector.js +7 -0
- package/src/geometry/dashValues.js +14 -0
- package/src/geometry/dashedSegment.js +16 -0
- package/src/geometry/disk.js +1 -1
- package/src/geometry/diskAt.js +4 -2
- package/src/geometry/emitter.js +2 -2
- package/src/{sources → geometry}/generateTreeGeometry.js +5 -3
- package/src/geometry/indexBridge.js +30 -0
- package/src/{sources → geometry}/instanceAreaGeometry.js +9 -7
- package/src/{traffic/along.js → geometry/interpolateRoute.js} +8 -2
- package/src/geometry/lampPostGeometry.js +14 -8
- package/src/geometry/lightGeometry.js +3 -3
- package/src/geometry/line.js +21 -54
- package/src/geometry/lineJoin.js +26 -0
- package/src/geometry/markerImageBounds.js +11 -0
- package/src/geometry/markerQuadCorners.js +51 -0
- package/src/geometry/meshShadowBounds.js +24 -0
- package/src/geometry/nativeGeometry.js +11 -45
- package/src/geometry/offsetBelowGround.js +3 -0
- package/src/geometry/polygon.js +5 -4
- package/src/geometry/quad.js +8 -3
- package/src/geometry/restoreGeometry.js +23 -0
- package/src/geometry/roofCoverage.js +26 -52
- package/src/geometry/roofFootprint.js +32 -0
- package/src/geometry/routeGeometry.js +21 -0
- package/src/geometry/segment.js +3 -2
- package/src/geometry/setVertexColor.js +3 -1
- package/src/geometry/shadowBounds.js +23 -0
- package/src/geometry/subtractRoofTile.js +19 -0
- package/src/geometry/subtractVector.js +6 -0
- package/src/geometry/surface.js +3 -2
- package/src/geometry/terrainBuffers.js +29 -0
- package/src/geometry/terrainGrid.js +32 -0
- package/src/geometry/terrainTileGeometry.js +19 -0
- package/src/geometry/treeGeometry.js +7 -8
- package/src/geometry/triangle.js +8 -7
- package/src/geometry/validateTree.js +7 -0
- package/src/geometry/vertexNormals.js +10 -16
- package/src/geometry/{visit.js → visitNativeCoordinates.js} +2 -1
- package/src/{constants → globals}/CELL.js +0 -1
- package/src/globals/Compass.js +1 -0
- package/src/globals/ContainerResize.js +1 -0
- package/src/{constants → globals}/HEIGHT.js +1 -1
- package/src/globals/L.js +1 -0
- package/src/globals/PitchDrag.js +1 -0
- package/src/globals/ShiftRotate.js +1 -0
- package/src/globals/TouchMode.js +1 -0
- package/src/globals/alphaBlend.js +12 -0
- package/src/globals/archiveDecoder.js +1 -0
- package/src/globals/archiveNorthWest.js +1 -0
- package/src/globals/archiveSouthEast.js +1 -0
- package/src/globals/atmosphereColor.js +1 -0
- package/src/globals/atmosphereStops.js +22 -0
- package/src/globals/blobParts.js +1 -0
- package/src/globals/cameraAngles.js +1 -0
- package/src/globals/cameraAnimatedOptions.js +3 -0
- package/src/globals/cameraAnimationFrame.js +1 -0
- package/src/globals/cameraAnimations.js +1 -0
- package/src/globals/cameraBearingSensitivity.js +1 -0
- package/src/globals/cameraDragSensitivity.js +1 -0
- package/src/globals/cameraDrags.js +1 -0
- package/src/globals/cameraEmptyOptions.js +1 -0
- package/src/globals/cameraFocusOptions.js +3 -0
- package/src/globals/cameraFov.js +3 -0
- package/src/globals/cameraListenerOptions.js +4 -0
- package/src/globals/cameraTouchStates.js +1 -0
- package/src/globals/cameraZeroPadding.js +1 -0
- package/src/globals/cogTags.js +1 -0
- package/src/globals/colorLayout.js +8 -0
- package/src/globals/coreEventTypes.js +4 -0
- package/src/globals/coreMatrixKeys.js +4 -0
- package/src/globals/coreQuadIndices.js +1 -0
- package/src/globals/coreQuadUV.js +1 -0
- package/src/globals/coreSampler.js +4 -0
- package/src/globals/coreWhite.js +1 -0
- package/src/globals/cosObliquity.js +3 -0
- package/src/globals/coverageTiles.js +1 -0
- package/src/globals/defaultMaterial.js +1 -0
- package/src/globals/degrees.js +1 -0
- package/src/globals/demBuffer.js +4 -0
- package/src/globals/demLayout.js +3 -0
- package/src/globals/demSize.js +1 -0
- package/src/globals/demTarget.js +3 -0
- package/src/globals/demTexture.js +5 -0
- package/src/globals/depthBindGroup.js +9 -0
- package/src/globals/depthTexture.js +5 -0
- package/src/globals/directoryReader.js +4 -0
- package/src/globals/disabledShadow.js +1 -0
- package/src/globals/drawEntries.js +1 -0
- package/src/globals/drawFrameEntry.js +7 -0
- package/src/globals/drawMeshEntry.js +7 -0
- package/src/globals/drawSamplerEntries.js +18 -0
- package/src/globals/drawTerrainEntry.js +4 -0
- package/src/globals/drawTextureEntries.js +18 -0
- package/src/globals/earthCirc.js +1 -0
- package/src/{constants → globals}/elevationWGSL.js +1 -1
- package/src/globals/fragmentShader.js +3 -0
- package/src/globals/frameBuffer.js +4 -0
- package/src/globals/frameCommands.js +1 -0
- package/src/globals/frameLayoutEntry.js +7 -0
- package/src/globals/geometryDecoder.js +1 -0
- package/src/globals/geometryEmpty.js +1 -0
- package/src/globals/geometryImageOptions.js +4 -0
- package/src/globals/geometryPixelStates.js +1 -0
- package/src/globals/geometryQuaternion.js +1 -0
- package/src/globals/geometryScale.js +1 -0
- package/src/globals/geometrySemantics.js +5 -0
- package/src/globals/geometryTranslation.js +1 -0
- package/src/globals/geometryWorkerUrl.js +3 -0
- package/src/globals/gridEvents.js +1 -0
- package/src/globals/gridFadeFrame.js +1 -0
- package/src/globals/halfRadians.js +1 -0
- package/src/globals/headerBounds.js +1 -0
- package/src/globals/headerFlags.js +1 -0
- package/src/globals/headerOffsets.js +5 -0
- package/src/globals/hull.js +10 -0
- package/src/globals/instanceLayout.js +9 -0
- package/src/globals/lampDirections.js +8 -0
- package/src/globals/layerCallInitHooks.js +1 -0
- package/src/globals/layerProto.js +1 -0
- package/src/globals/lightScale.js +1 -0
- package/src/{constants → globals}/limbs.js +0 -1
- package/src/globals/loading.js +1 -0
- package/src/globals/mapMethods.js +1 -0
- package/src/globals/markerMethods.js +1 -0
- package/src/globals/markerPanFrame.js +1 -0
- package/src/globals/meshBindGroup.js +4 -0
- package/src/globals/meshBuffer.js +4 -0
- package/src/globals/meshCopySize.js +1 -0
- package/src/globals/meshImage.js +4 -0
- package/src/globals/meshLayoutEntry.js +8 -0
- package/src/globals/meshOffsets.js +1 -0
- package/src/globals/meshPipeline.js +27 -0
- package/src/globals/meshStack.js +3 -0
- package/src/globals/meshTarget.js +3 -0
- package/src/globals/nativeMethodHandlers.js +31 -0
- package/src/globals/nextId.js +1 -0
- package/src/globals/normalLayout.js +8 -0
- package/src/globals/parts.js +24 -0
- package/src/globals/pendingGridFades.js +1 -0
- package/src/globals/pendingInitializations.js +1 -0
- package/src/globals/pendingMapChanges.js +1 -0
- package/src/globals/pendingMarkerPan.js +1 -0
- package/src/globals/pendingPlacements.js +1 -0
- package/src/globals/pendingRasterLoads.js +1 -0
- package/src/globals/pendingZoomAnimations.js +1 -0
- package/src/globals/pipelineLayout.js +3 -0
- package/src/globals/popupEvents.js +1 -0
- package/src/globals/popupPan.js +1 -0
- package/src/globals/popupPosition.js +1 -0
- package/src/globals/positionLayout.js +8 -0
- package/src/globals/programEntries.js +1 -0
- package/src/globals/programLayout.js +3 -0
- package/src/globals/radians.js +1 -0
- package/src/globals/rasterBuffer.js +4 -0
- package/src/globals/rasterIndices.js +1 -0
- package/src/globals/rasterNormals.js +1 -0
- package/src/globals/rasterPoint.js +4 -0
- package/src/globals/rasterPositions.js +1 -0
- package/src/globals/rasterSampler.js +6 -0
- package/src/globals/rasterTexture.js +5 -0
- package/src/globals/rasterUVs.js +1 -0
- package/src/globals/removeLayer.js +1 -0
- package/src/globals/renderEmpty.js +1 -0
- package/src/globals/ringDirections.js +49 -0
- package/src/globals/roofBindGroup.js +17 -0
- package/src/globals/roofBlitSampler.js +4 -0
- package/src/globals/roofBuffer.js +4 -0
- package/src/globals/roofCommands.js +1 -0
- package/src/globals/roofCopySize.js +1 -0
- package/src/globals/roofImage.js +3 -0
- package/src/globals/roofMin.js +4 -0
- package/src/globals/roofOpacities.js +1 -0
- package/src/globals/roofPass.js +13 -0
- package/src/globals/roofPipeline.js +29 -0
- package/src/globals/roofSampler.js +4 -0
- package/src/globals/roofShader.js +16 -0
- package/src/globals/roofSignatures.js +1 -0
- package/src/globals/roofSize.js +4 -0
- package/src/globals/roofTarget.js +3 -0
- package/src/globals/roofTexture.js +5 -0
- package/src/globals/roofTiles.js +1 -0
- package/src/globals/roundProfile.js +7 -0
- package/src/globals/samplerLayoutEntries.js +36 -0
- package/src/globals/sceneCleanupFields.js +1 -0
- package/src/globals/sceneEmptyOptions.js +1 -0
- package/src/globals/scenePass.js +19 -0
- package/src/globals/sceneSunlightUniforms.js +3 -0
- package/src/globals/sceneTransferFields.js +1 -0
- package/src/globals/sceneWalkHandlers.js +1 -0
- package/src/globals/shadowBindGroup.js +10 -0
- package/src/globals/shadowBounds.js +4 -0
- package/src/globals/shadowCamera.js +15 -0
- package/src/globals/shadowDepthLayout.js +9 -0
- package/src/globals/shadowHigh.js +1 -0
- package/src/globals/shadowInstanceLayouts.js +4 -0
- package/src/globals/shadowLayouts.js +3 -0
- package/src/globals/shadowLow.js +1 -0
- package/src/globals/shadowMeshLayout.js +10 -0
- package/src/globals/shadowOffsets.js +1 -0
- package/src/globals/shadowPass.js +9 -0
- package/src/globals/shadowPipeline.js +24 -0
- package/src/globals/shadowPipelineLayout.js +3 -0
- package/src/globals/shadowShader.js +3 -0
- package/src/globals/shadowTexture.js +5 -0
- package/src/globals/shadowValues.js +1 -0
- package/src/globals/sinObliquity.js +3 -0
- package/src/globals/sizes.js +6 -0
- package/src/globals/sunBindGroup.js +20 -0
- package/src/globals/tau.js +1 -0
- package/src/globals/terrainLayoutEntry.js +8 -0
- package/src/globals/textureLayoutEntries.js +41 -0
- package/src/globals/tiledBounds.js +1 -0
- package/src/globals/tooltipEvents.js +1 -0
- package/src/globals/tooltipPosition.js +1 -0
- package/src/globals/trafficClocks.js +1 -0
- package/src/globals/trafficEmptyList.js +1 -0
- package/src/globals/trafficEmptyOptions.js +1 -0
- package/src/globals/trafficRouteMaterial.js +1 -0
- package/src/{constants → globals}/trafficShader.js +49 -49
- package/src/globals/triangleContexts.js +1 -0
- package/src/globals/uVLayout.js +8 -0
- package/src/{constants → globals}/vehicles.js +24 -9
- package/src/globals/vertexShader.js +3 -0
- package/src/globals/wantedTiles.js +1 -0
- package/src/gpu/initializeRendererResources.js +36 -0
- package/src/gpu/initializeSharedRenderer.js +52 -0
- package/src/gpu/mountRenderer.js +26 -0
- package/src/{scene → gpu}/releaseRenderer.js +2 -2
- package/src/gpu/rendererDeviceError.js +16 -0
- package/src/gpu/rendererDeviceLost.js +16 -0
- package/src/gpu/reportShaderCompilation.js +17 -0
- package/src/gpu/requestAdapter.js +12 -0
- package/src/gpu/requestDevice.js +9 -0
- package/src/index.js +34 -37
- package/src/layer-controls/layerCountTitle.js +6 -0
- package/src/{scene → layer-controls}/placeEntry.js +3 -1
- package/src/layer-controls/placeEntryElement.js +22 -0
- package/src/{scene → layer-controls}/removeEntry.js +2 -0
- package/src/layer-controls/renderLayerCount.js +20 -0
- package/src/{scene → layer-controls}/replaceEntry.js +4 -2
- package/src/{scene → layer-controls}/runPlacements.js +4 -2
- package/src/{scene → layer-controls}/underEntry.js +2 -3
- package/src/layer-controls/updateLayerCount.js +24 -0
- package/src/lighting/cacheLightGrid.js +14 -5
- package/src/lighting/collectLightMeshes.js +4 -1
- package/src/lighting/lightGrid.js +10 -9
- package/src/lighting/updatePointLights.js +19 -12
- package/src/lighting/visitLightCells.js +13 -0
- package/src/lighting/visitLightGridCells.js +8 -0
- package/src/lighting/worldLights.js +10 -12
- package/src/lighting/writeLightCell.js +5 -0
- package/src/materials/createProgram.js +76 -0
- package/src/materials/createProgramLayout.js +36 -0
- package/src/materials/createProgramUniforms.js +17 -0
- package/src/materials/modelMaterialFor.js +21 -0
- package/src/materials/prepareMeshCutout.js +12 -0
- package/src/materials/terrainRasterProgram.js +58 -0
- package/src/materials/validateRoofMaterial.js +10 -0
- package/src/models/applyModelTransform.js +14 -0
- package/src/models/buildModelNodes.js +14 -0
- package/src/models/createModelContext.js +15 -0
- package/src/models/decodeModel.js +9 -6
- package/src/models/loadBuffer.js +2 -2
- package/src/models/loadModel.js +31 -51
- package/src/models/loadModelResources.js +20 -0
- package/src/models/modelNode.js +26 -71
- package/src/models/normalizeAccessor.js +11 -0
- package/src/models/readAccessor.js +11 -31
- package/src/models/readAccessorValue.js +7 -0
- package/src/models/readAccessorValues.js +10 -6
- package/src/models/readModelAttributes.js +20 -0
- package/src/models/readModelIndices.js +16 -0
- package/src/models/readSparseAccessor.js +19 -0
- package/src/models/releaseModelResources.js +10 -0
- package/src/{core → native}/beforeNativeRender.js +1 -1
- package/src/native/bypassNativeEvent.js +11 -0
- package/src/{core → native}/disposeNativeLayer.js +14 -10
- package/src/native/forwardNativeError.js +3 -0
- package/src/native/handleNativeMapEvent.js +28 -0
- package/src/{core → native}/hideTargets.js +6 -4
- package/src/{core → native}/initNativeGPU.js +14 -7
- package/src/native/isCurrentNativeLayer.js +7 -0
- package/src/native/nativeEventSource.js +18 -0
- package/src/{core → native}/nativeEvents.js +8 -3
- package/src/native/nativeLayer.js +79 -0
- package/src/{core → native}/nativeLayerMethod.js +17 -3
- package/src/native/pruneNativeResources.js +20 -0
- package/src/{core → native}/putNativeMesh.js +12 -9
- package/src/native/quadNativeMesh.js +20 -0
- package/src/native/readyNativeGPU.js +10 -0
- package/src/native/refreshNativeLayer.js +35 -0
- package/src/native/refreshNativeLayerContract.js +9 -0
- package/src/{core → native}/rejectNativeReady.js +1 -0
- package/src/{core → native}/removeNativeEvents.js +2 -1
- package/src/native/removeTargets.js +13 -0
- package/src/native/reorderNativeLayer.js +17 -0
- package/src/{core → native}/resolveNativeReady.js +1 -0
- package/src/{core → native}/styleNativeMesh.js +6 -1
- package/src/{core → native}/syncGridLayer.js +11 -4
- package/src/{core → native}/syncImageOverlay.js +1 -1
- package/src/{core → native}/syncMarker.js +5 -3
- package/src/native/syncVectorLayer.js +29 -0
- package/src/{core → native}/synchronizeNativeLayer.js +10 -18
- package/src/native/updateNativeHover.js +7 -0
- package/src/native/updateNativeLayerView.js +10 -0
- package/src/picking/findFeature.js +17 -10
- package/src/picking/hit.js +23 -14
- package/src/picking/hitColliderCell.js +19 -0
- package/src/picking/hitMesh.js +12 -16
- package/src/picking/onClick.js +6 -2
- package/src/picking/onPointerLeave.js +6 -2
- package/src/picking/onPointerMove.js +15 -6
- package/src/picking/raycast.js +50 -38
- package/src/picking/setHighlight.js +16 -8
- package/src/picking/shouldSkipOther.js +5 -1
- package/src/picking/showFeature.js +21 -13
- package/src/picking/validateCameraInverse.js +8 -0
- package/src/projections/cameraAngles.js +14 -0
- package/src/projections/groundBounds.js +18 -0
- package/src/projections/localPixelForGeometry.js +7 -0
- package/src/projections/localPosition.js +11 -0
- package/src/projections/markerCameraIconPoint.js +12 -0
- package/src/projections/projectBridgePoint.js +5 -0
- package/src/projections/projectCameraPoint.js +27 -0
- package/src/projections/projectCelestialBody.js +13 -0
- package/src/projections/projectRing.js +26 -0
- package/src/projections/projectTreePoint.js +17 -0
- package/src/projections/toPoint.js +5 -0
- package/src/{camera/animationPoint.js → projections/transformZoomAnimationPoint.js} +5 -1
- package/src/projections/walkerLocalPosition.js +18 -0
- package/src/raster/addRasterTile.js +55 -90
- package/src/raster/comparePendingTiles.js +2 -2
- package/src/raster/createRasterMesh.js +78 -44
- package/src/raster/finishRasterAttachment.js +17 -0
- package/src/raster/finishRasterTile.js +58 -41
- package/src/raster/getRasterEvents.js +3 -3
- package/src/raster/getRasterTileSize.js +5 -3
- package/src/raster/initRaster.js +28 -24
- package/src/raster/isRasterLoading.js +8 -0
- package/src/raster/loadRasterTile.js +11 -7
- package/src/raster/onPMTileAdd.js +11 -7
- package/src/raster/onPMTileRemove.js +8 -4
- package/src/raster/pruneRasterTiles.js +23 -14
- package/src/raster/pumpRasterTiles.js +14 -8
- package/src/raster/rasterTileRange.js +23 -0
- package/src/raster/readyRaster.js +14 -10
- package/src/raster/registerTerrainTile.js +14 -9
- package/src/raster/releaseRasterTile.js +20 -14
- package/src/raster/releaseRasterTiles.js +15 -9
- package/src/raster/removeRasterTile.js +10 -5
- package/src/raster/{reportError.js → reportRasterError.js} +3 -3
- package/src/raster/retainRasterTiles.js +16 -0
- package/src/raster/setPMTileOpacity.js +4 -4
- package/src/raster/setPMTileZIndex.js +4 -4
- package/src/raster/setRasterOpacity.js +10 -5
- package/src/raster/setRasterTerrain.js +15 -8
- package/src/raster/setRasterZIndex.js +10 -5
- package/src/raster/updateAttachedTiles.js +8 -4
- package/src/raster/updateRasterTiles.js +40 -43
- package/src/rendering/collectFrameMeshes.js +26 -12
- package/src/rendering/collectMeshes.js +2 -24
- package/src/rendering/collectVisibleMesh.js +36 -0
- package/src/rendering/compareMeshDepth.js +6 -0
- package/src/rendering/compareMeshes.js +8 -10
- package/src/rendering/createMesh.js +28 -15
- package/src/rendering/disposeMesh.js +3 -3
- package/src/rendering/drawGeometry.js +22 -108
- package/src/rendering/drawPipeline.js +34 -0
- package/src/rendering/drawSceneMeshes.js +20 -21
- package/src/rendering/prepareFrameBuffer.js +18 -0
- package/src/rendering/prepareFrameMeshes.js +12 -14
- package/src/rendering/prepareFrameUniforms.js +12 -14
- package/src/rendering/prepareMeshUniforms.js +25 -0
- package/src/rendering/render.js +50 -31
- package/src/rendering/resizeRenderer.js +23 -16
- package/src/rendering/revealRoofMesh.js +34 -0
- package/src/scene/addRegisteredLayer.js +47 -0
- package/src/scene/addSceneLayer.js +18 -0
- package/src/scene/attachLayer.js +9 -5
- package/src/scene/attachSharedScene.js +69 -0
- package/src/scene/callLayer.js +28 -0
- package/src/scene/cancelUpdate.js +9 -5
- package/src/scene/createLayer.js +7 -0
- package/src/scene/createSceneNode.js +12 -0
- package/src/scene/emptyEvents.js +1 -1
- package/src/scene/failAttachment.js +9 -5
- package/src/scene/get3DEvents.js +14 -9
- package/src/scene/getLocation.js +8 -0
- package/src/scene/init3D.js +40 -25
- package/src/scene/initializeLayer.js +13 -5
- package/src/scene/initializerFor.js +3 -1
- package/src/scene/isNativeLayer.js +13 -0
- package/src/scene/layerInitialize.js +29 -14
- package/src/scene/onAdd3DLayer.js +33 -23
- package/src/scene/onMapChange.js +10 -7
- package/src/scene/onRemove3DLayer.js +61 -49
- package/src/scene/ready3D.js +40 -21
- package/src/scene/releaseSharedScene.js +31 -0
- package/src/scene/removeLayerEvents.js +12 -0
- package/src/scene/removeSceneLayer.js +16 -0
- package/src/scene/renderPendingMapChange.js +12 -5
- package/src/scene/renderPendingUpdates.js +14 -7
- package/src/scene/reportLayerError.js +3 -0
- package/src/scene/resolveNextInitialization.js +7 -6
- package/src/scene/restoreObject.js +26 -60
- package/src/scene/scheduleSceneUpdate.js +25 -0
- package/src/shaders/materialBaseShader.js +17 -0
- package/src/shaders/materialShaders.js +15 -131
- package/src/shaders/materialSurfaceShader.js +47 -0
- package/src/shaders/materialVertexShader.js +72 -0
- package/src/shaders/roofVertexShader.js +9 -0
- package/src/shadows/bindSunlight.js +19 -9
- package/src/shadows/drawShadowMeshes.js +26 -15
- package/src/shadows/ensureShadowPipeline.js +46 -35
- package/src/shadows/renderSunlight.js +14 -11
- package/src/shadows/resizeSunlight.js +17 -10
- package/src/shadows/shadowCacheMatches.js +3 -9
- package/src/shadows/shadowMatrix.js +38 -28
- package/src/shadows/shadowMeshMatches.js +11 -0
- package/src/sources/attachAreaMesh.js +44 -33
- package/src/sources/buildArea.js +25 -13
- package/src/sources/buildAreaFeature.js +24 -20
- package/src/sources/buildAreaPoint.js +3 -21
- package/src/sources/compareAreaDistance.js +1 -2
- package/src/sources/extrusionStyle.js +10 -0
- package/src/sources/featureAnchor.js +9 -0
- package/src/sources/initializeGeoJSON.js +5 -2
- package/src/sources/pendingSourceAreas.js +21 -0
- package/src/sources/prepareAreaGeometryJob.js +33 -0
- package/src/sources/pumpSourceAreas.js +37 -0
- package/src/sources/releaseArea.js +12 -7
- package/src/sources/setGeoJSONData.js +6 -2
- package/src/sources/sourceAreaContext.js +19 -8
- package/src/sources/updateArea.js +36 -25
- package/src/sources/updateSourceStatus.js +16 -0
- package/src/sunlight/{addTo.js → addTimeControlToMap.js} +2 -1
- package/src/sunlight/addTimeLayer.js +5 -1
- package/src/sunlight/atmosphere.js +9 -12
- package/src/sunlight/createSun.js +54 -0
- package/src/sunlight/initSunlight.js +8 -5
- package/src/sunlight/initializeTimeControl.js +16 -0
- package/src/sunlight/onAddSun.js +27 -65
- package/src/sunlight/onRemoveSun.js +10 -0
- package/src/sunlight/removeSun.js +12 -4
- package/src/sunlight/{remove.js → removeTimeControl.js} +1 -0
- package/src/sunlight/removeTimeLayer.js +6 -1
- package/src/sunlight/requestSunlightRender.js +9 -0
- package/src/sunlight/styleTimeControl.js +3 -3
- package/src/sunlight/updateCelestialDisc.js +12 -0
- package/src/sunlight/updateSky.js +14 -15
- package/src/sunlight/updateSun.js +15 -7
- package/src/sunlight/useSelectedTime.js +9 -5
- package/src/terrain/applyTerrain.js +24 -0
- package/src/terrain/clearLayerTerrain.js +9 -5
- package/src/terrain/copyTerrainTile.js +12 -0
- package/src/terrain/getElevation.js +12 -4
- package/src/terrain/initTerrain.js +17 -9
- package/src/terrain/loadTerrain.js +37 -48
- package/src/terrain/loadTerrainTiles.js +9 -4
- package/src/terrain/mapElevationOf.js +7 -0
- package/src/terrain/onTerrainAdd.js +17 -9
- package/src/terrain/onTerrainChange.js +6 -2
- package/src/terrain/onTerrainRemove.js +37 -19
- package/src/terrain/readBridges.js +1 -1
- package/src/terrain/readyTerrainOf.js +7 -0
- package/src/terrain/setLayerTerrain.js +9 -5
- package/src/terrain/setTerrainHeight.js +19 -10
- package/src/terrain/terrainAtlas.js +7 -13
- package/src/terrain/terrainElevation.js +6 -11
- package/src/terrain/terrainTileQueue.js +27 -0
- package/src/textures/addImageState.js +8 -0
- package/src/{core/addRasterImage.js → textures/attachRasterImage.js} +5 -3
- package/src/textures/bindMeshTextures.js +50 -0
- package/src/textures/collectRoofTiles.js +16 -0
- package/src/{rendering → textures}/compareRoofTiles.js +4 -4
- package/src/textures/composeRoofAtlas.js +71 -0
- package/src/textures/destroyTexture.js +10 -0
- package/src/{rendering/destroyAfterSubmission.js → textures/destroyTextureAfterSubmission.js} +8 -8
- package/src/textures/ensureRoofBlit.js +20 -0
- package/src/textures/loadModelImage.js +19 -0
- package/src/{models/textureFor.js → textures/modelTextureFor.js} +12 -8
- package/src/textures/modelTextureSampler.js +10 -0
- package/src/textures/nativeImageError.js +13 -0
- package/src/textures/nativeImageRefresh.js +11 -0
- package/src/{core/textureFor.js → textures/nativeTextureFor.js} +43 -44
- package/src/textures/prepareMeshTextures.js +23 -0
- package/src/textures/rebuildRoofAtlas.js +55 -0
- package/src/textures/removeImageState.js +9 -0
- package/src/textures/resizeRoofTexture.js +25 -0
- package/src/textures/restoreMaterialTextures.js +16 -0
- package/src/{rendering → textures}/textureBinding.js +7 -7
- package/src/textures/updateRoofAtlas.js +23 -0
- package/src/textures/updateRoofRaster.js +29 -0
- package/src/{core → textures}/uploadCanvasTexture.js +20 -17
- package/src/textures/uploadMeshTexture.js +26 -0
- package/src/textures/uploadNativeImage.js +13 -0
- package/src/textures/uploadRoofTile.js +23 -0
- package/src/traffic/addTraffic.js +6 -3
- package/src/traffic/destroyTrafficGpu.js +4 -2
- package/src/traffic/disposeTrafficObject.js +7 -2
- package/src/traffic/drawTrafficRoute.js +6 -3
- package/src/traffic/failTraffic.js +2 -2
- package/src/traffic/featuresToTrafficLanes.js +24 -0
- package/src/traffic/fetchTrafficLanes.js +4 -4
- package/src/traffic/groundTraffic.js +7 -3
- package/src/traffic/initTraffic.js +60 -48
- package/src/traffic/loadTraffic.js +9 -9
- package/src/traffic/loadedTrafficLanes.js +1 -1
- package/src/traffic/locateTraffic.js +8 -6
- package/src/traffic/moveTraffic.js +2 -2
- package/src/traffic/placeTraffic.js +2 -1
- package/src/traffic/prepareTraffic.js +12 -6
- package/src/traffic/rebaseTraffic.js +33 -30
- package/src/traffic/rebuildTrafficMesh.js +10 -6
- package/src/traffic/refreshTrafficTrips.js +32 -0
- package/src/traffic/removeTraffic.js +16 -13
- package/src/traffic/routeColor.js +3 -3
- package/src/traffic/scheduledTrips.js +22 -11
- package/src/traffic/startTraffic.js +1 -1
- package/src/traffic/tickTraffic.js +11 -41
- package/src/traffic/trafficBounds.js +6 -2
- package/src/traffic/trafficNow.js +10 -3
- package/src/traffic/trafficStatusText.js +5 -0
- package/src/traffic/trafficStorage.js +2 -2
- package/src/traffic/trafficTooltip.js +9 -0
- package/src/traffic/tripsAt.js +4 -4
- package/src/traffic/updateTraffic.js +5 -1
- package/src/traffic/updateTrafficLights.js +18 -0
- package/src/traffic/updateTrafficPose.js +8 -0
- package/src/traffic/uploadTrafficLanes.js +21 -0
- package/src/traffic/vehicleOffsets.js +3 -2
- package/src/transforms/composeLocalTransform.js +16 -0
- package/src/{models/nodeMatrix.js → transforms/modelNodeMatrix.js} +8 -3
- package/src/transforms/transformNativePoint.js +7 -0
- package/src/transforms/updateWorldMatrix.js +43 -0
- package/src/transforms/worldMatrixChanged.js +18 -0
- package/src/triangulation/clean.js +1 -1
- package/src/triangulation/clipEars.js +23 -0
- package/src/triangulation/connectHole.js +18 -0
- package/src/triangulation/mergeHoles.js +11 -0
- package/src/triangulation/minimumX.js +3 -3
- package/src/triangulation/polygonRings.js +14 -0
- package/src/triangulation/sortHoles.js +7 -12
- package/src/triangulation/triangulate.js +18 -56
- package/src/triangulation/validateArea.js +10 -0
- package/src/vehicles/bicycleModel.js +21 -20
- package/src/vehicles/boatBenches.js +4 -3
- package/src/vehicles/boatModel.js +26 -18
- package/src/vehicles/buildCarriage.js +20 -0
- package/src/vehicles/busModel.js +1 -1
- package/src/vehicles/carModel.js +27 -11
- package/src/vehicles/metroModel.js +2 -2
- package/src/vehicles/mirrorVehiclePart.js +8 -0
- package/src/vehicles/pedestrianModel.js +15 -14
- package/src/vehicles/tramModel.js +2 -2
- package/src/walk/animateWalker.js +52 -0
- package/src/walk/createWalk.js +70 -60
- package/src/walk/initWalk.js +5 -4
- package/src/walk/{initialize.js → initializeWalkControl.js} +1 -0
- package/src/walk/{blocked.js → isWalkBlocked.js} +4 -4
- package/src/walk/landWalker.js +38 -0
- package/src/walk/moveWalker.js +24 -0
- package/src/walk/onAddWalkControl.js +31 -0
- package/src/walk/onRemoveWalkControl.js +12 -0
- package/src/walk/{onKey.js → onWalkKey.js} +13 -10
- package/src/walk/onWalkPointer.js +18 -0
- package/src/walk/{onTerrain.js → onWalkTerrain.js} +1 -1
- package/src/walk/{place.js → placeWalker.js} +6 -4
- package/src/walk/resolveWalkerPosition.js +28 -0
- package/src/walk/startWalking.js +49 -0
- package/src/walk/stepWalkerHeight.js +11 -0
- package/src/walk/{stop.js → stopWalking.js} +11 -8
- package/src/walk/{toggle.js → toggleWalking.js} +2 -2
- package/src/walk/updateWalkerView.js +22 -0
- package/src/weakmaps/addedByLayer.js +1 -0
- package/src/weakmaps/archiveHeaderByLayer.js +1 -0
- package/src/weakmaps/areasByLayer.js +1 -0
- package/src/weakmaps/boundsMethods.js +1 -0
- package/src/weakmaps/bridgeMeshByLayer.js +1 -0
- package/src/weakmaps/bridgesByLayer.js +1 -0
- package/src/weakmaps/cameraAnimationByMap.js +1 -0
- package/src/weakmaps/cameraBearingByMap.js +1 -0
- package/src/weakmaps/cameraByLayer.js +1 -0
- package/src/weakmaps/cameraDraggableByMap.js +1 -0
- package/src/weakmaps/cameraFields.js +37 -0
- package/src/weakmaps/cameraFrameByMap.js +1 -0
- package/src/weakmaps/cameraHandlersByMap.js +1 -0
- package/src/weakmaps/cameraMaps.js +1 -0
- package/src/weakmaps/cameraPitchByMap.js +1 -0
- package/src/weakmaps/cameraReadyByMap.js +1 -0
- package/src/weakmaps/cameraTouchStateByMap.js +1 -0
- package/src/weakmaps/cameraViewByMap.js +1 -0
- package/src/weakmaps/cameraZIndexOffsetByLayer.js +1 -0
- package/src/weakmaps/closestMethods.js +1 -0
- package/src/{constants → weakmaps}/colliders.js +0 -1
- package/src/weakmaps/containerByLayer.js +1 -0
- package/src/weakmaps/controlByLayer.js +1 -0
- package/src/weakmaps/countStatusByLayer.js +1 -0
- package/src/weakmaps/cursorByLayer.js +1 -0
- package/src/weakmaps/demByLayer.js +1 -0
- package/src/weakmaps/directoriesByLayer.js +1 -0
- package/src/weakmaps/dragByHandler.js +1 -0
- package/src/weakmaps/dragStates.js +1 -0
- package/src/weakmaps/etagByLayer.js +1 -0
- package/src/weakmaps/eventMapByLayer.js +1 -0
- package/src/weakmaps/eventsByLayer.js +1 -0
- package/src/weakmaps/fadeFrameByLayer.js +1 -0
- package/src/weakmaps/fadeVersionByLayer.js +1 -0
- package/src/weakmaps/frameByLayer.js +1 -0
- package/src/weakmaps/geojsonByLayer.js +1 -0
- package/src/weakmaps/geometryWorkersByMap.js +1 -0
- package/src/weakmaps/gridInitializers.js +1 -0
- package/src/weakmaps/groupByLayer.js +1 -0
- package/src/weakmaps/headerByLayer.js +1 -0
- package/src/weakmaps/highlightedFeatureByLayer.js +1 -0
- package/src/weakmaps/hoveredFeatureByLayer.js +1 -0
- package/src/weakmaps/imageStates.js +1 -0
- package/src/weakmaps/inflightByLayer.js +1 -0
- package/src/weakmaps/kindByLayer.js +1 -0
- package/src/weakmaps/layersByLayer.js +1 -0
- package/src/weakmaps/loadingTilesByLayer.js +1 -0
- package/src/weakmaps/locationByLayer.js +1 -0
- package/src/weakmaps/modelByLayer.js +1 -0
- package/src/weakmaps/modelUrlByLayer.js +1 -0
- package/src/weakmaps/nativeGPUBackByMap.js +1 -0
- package/src/weakmaps/nativeGPUByLayer.js +1 -0
- package/src/weakmaps/nativeGPUOrderByMap.js +1 -0
- package/src/weakmaps/nativeRenderByLayer.js +1 -0
- package/src/weakmaps/pitchSkyByMap.js +1 -0
- package/src/weakmaps/pointerEventsByLayer.js +1 -0
- package/src/weakmaps/pruneAfterByLayer.js +1 -0
- package/src/weakmaps/pruneVersionByLayer.js +1 -0
- package/src/weakmaps/pruneWantedByLayer.js +1 -0
- package/src/weakmaps/queuedByLayer.js +1 -0
- package/src/weakmaps/rasterGeometryByLayer.js +1 -0
- package/src/weakmaps/rasterProgramByLayer.js +1 -0
- package/src/weakmaps/rasterTilesByLayer.js +1 -0
- package/src/weakmaps/rasterVersionByLayer.js +1 -0
- package/src/weakmaps/raycasterByLayer.js +1 -0
- package/src/weakmaps/readyByLayer.js +1 -0
- package/src/weakmaps/rendererByLayer.js +1 -0
- package/src/weakmaps/rendererDevices.js +1 -0
- package/src/weakmaps/rendererReadyByLayer.js +1 -0
- package/src/weakmaps/roofRasterByLayer.js +1 -0
- package/src/weakmaps/roofRastersByLayer.js +1 -0
- package/src/weakmaps/rootByLayer.js +1 -0
- package/src/weakmaps/rotateControlByMap.js +1 -0
- package/src/weakmaps/sceneByLayer.js +1 -0
- package/src/weakmaps/sceneFields.js +159 -0
- package/src/weakmaps/sceneLayers.js +1 -0
- package/src/weakmaps/sceneOriginByLayer.js +1 -0
- package/src/weakmaps/shadowMeshesByLayer.js +1 -0
- package/src/weakmaps/sharedByLayer.js +1 -0
- package/src/weakmaps/sizeByLayer.js +1 -0
- package/src/weakmaps/state3dByLayer.js +1 -0
- package/src/weakmaps/sunByMap.js +1 -0
- package/src/weakmaps/sunlightByControl.js +1 -0
- package/src/weakmaps/sunlightByMap.js +1 -0
- package/src/weakmaps/terrain3DByLayer.js +1 -0
- package/src/weakmaps/terrain3DByMap.js +1 -0
- package/src/weakmaps/terrainArchiveByLayer.js +1 -0
- package/src/weakmaps/terrainBaseYByLayer.js +1 -0
- package/src/weakmaps/terrainBoundsByLayer.js +1 -0
- package/src/weakmaps/terrainControllerByLayer.js +1 -0
- package/src/weakmaps/terrainGridsByLayer.js +1 -0
- package/src/weakmaps/terrainLoadingByLayer.js +1 -0
- package/src/weakmaps/terrainOriginElevationByLayer.js +1 -0
- package/src/weakmaps/terrainPromiseByLayer.js +1 -0
- package/src/weakmaps/terrainReadyByLayer.js +1 -0
- package/src/weakmaps/terrainRequestByLayer.js +1 -0
- package/src/weakmaps/terrainSourceByLayer.js +1 -0
- package/src/weakmaps/terrainTilesByLayer.js +1 -0
- package/src/weakmaps/terrainZoomByLayer.js +1 -0
- package/src/weakmaps/tileZoomByLayer.js +1 -0
- package/src/weakmaps/timeControlByMap.js +1 -0
- package/src/weakmaps/tooltipByLayer.js +1 -0
- package/src/weakmaps/touchByContainer.js +1 -0
- package/src/weakmaps/touchPitchByMap.js +1 -0
- package/src/weakmaps/touchRotateByMap.js +1 -0
- package/src/weakmaps/trafficByLayer.js +1 -0
- package/src/weakmaps/typeByLayer.js +1 -0
- package/src/weakmaps/urlByLayer.js +1 -0
- package/src/weakmaps/visibleMeshesByLayer.js +1 -0
- package/src/weakmaps/walkByMap.js +1 -0
- package/src/weakmaps/walkerByLayer.js +1 -0
- package/src/weakmaps/wantedRasterTilesByLayer.js +1 -0
- package/src/weakmaps/zoomLevelByLayer.js +1 -0
- package/src/weakmaps/zoomTransitionsByLayer.js +1 -0
- package/src/weakmaps/zoomViewByLayer.js +1 -0
- package/src/workers/acquireGeometryWorker.js +32 -0
- package/src/workers/buildAreaInWorker.js +36 -0
- package/src/workers/closeGeometryWorkers.js +11 -0
- package/src/workers/geometryWorker.js +14 -0
- package/src/workers/settleGeometryWorker.js +10 -0
- package/src/workers/startGeometryWorker.js +16 -0
- package/src/archives/read.js +0 -29
- package/src/archives/varint.js +0 -15
- package/src/camera/angles.js +0 -6
- package/src/camera/cancelCameraAnimation.js +0 -11
- package/src/camera/groundBounds.js +0 -11
- package/src/camera/mapAnimateCamera.js +0 -17
- package/src/camera/mapStopPitchBearingAnimation.js +0 -6
- package/src/camera/pointOf.js +0 -3
- package/src/camera/project.js +0 -20
- package/src/camera/runCameraAnimations.js +0 -28
- package/src/camera/scheduleCameraAnimation.js +0 -8
- package/src/constants/Compass.js +0 -7
- package/src/constants/ContainerResize.js +0 -7
- package/src/constants/PitchDrag.js +0 -7
- package/src/constants/ShiftRotate.js +0 -7
- package/src/constants/TouchMode.js +0 -6
- package/src/constants/accessorSizes.js +0 -1
- package/src/constants/attachState.js +0 -1
- package/src/constants/cameraControlsState.js +0 -1
- package/src/constants/cityMapper.js +0 -6
- package/src/constants/hull.js +0 -1
- package/src/constants/indexState.js +0 -1
- package/src/constants/mapCameraState.js +0 -1
- package/src/constants/nativeLayerState.js +0 -1
- package/src/constants/nativeMethodHandlers.js +0 -31
- package/src/constants/onMapChangeState.js +0 -1
- package/src/constants/onZoomAnimState.js +0 -1
- package/src/constants/parts.js +0 -19
- package/src/constants/pumpState.js +0 -1
- package/src/constants/ringDirections.js +0 -10
- package/src/constants/roundProfile.js +0 -1
- package/src/constants/underEntryState.js +0 -1
- package/src/core/addImageState.js +0 -7
- package/src/core/boundsQuad.js +0 -11
- package/src/core/bringNativeLayerToBack.js +0 -3
- package/src/core/bringNativeLayerToFront.js +0 -3
- package/src/core/cancelGridFade.js +0 -10
- package/src/core/current.js +0 -3
- package/src/core/forwardNativeError.js +0 -3
- package/src/core/handleNativeMapEvent.js +0 -47
- package/src/core/localPixelForGeometry.js +0 -6
- package/src/core/localPosition.js +0 -6
- package/src/core/markerCameraIconPoint.js +0 -9
- package/src/core/markerQuadCorners.js +0 -31
- package/src/core/nativeImageError.js +0 -8
- package/src/core/nativeImageRefresh.js +0 -7
- package/src/core/nativeLayer.js +0 -97
- package/src/core/quadNativeMesh.js +0 -15
- package/src/core/readyNativeGPU.js +0 -6
- package/src/core/refreshNativeLayer.js +0 -29
- package/src/core/refreshNativeLayerContract.js +0 -3
- package/src/core/removeImageState.js +0 -8
- package/src/core/removeTargets.js +0 -8
- package/src/core/reorderNativeLayer.js +0 -6
- package/src/core/runGridFades.js +0 -14
- package/src/core/runMarkerPanFrame.js +0 -12
- package/src/core/scheduleGridFade.js +0 -9
- package/src/core/scheduleMarkerPan.js +0 -8
- package/src/core/syncVectorLayer.js +0 -26
- package/src/core/updateNativeLayerView.js +0 -6
- package/src/geometry/below.js +0 -3
- package/src/geometry/bridgeLocal.js +0 -4
- package/src/geometry/cross.js +0 -3
- package/src/geometry/dot.js +0 -6
- package/src/geometry/lampRing.js +0 -11
- package/src/geometry/push.js +0 -3
- package/src/geometry/sub.js +0 -6
- package/src/geometry/treeRing.js +0 -14
- package/src/lighting/visitCells.js +0 -15
- package/src/models/loadImage.js +0 -15
- package/src/models/materialFor.js +0 -21
- package/src/models/textureSampler.js +0 -10
- package/src/raster/createGeometry.js +0 -22
- package/src/raster/finishAttachment.js +0 -11
- package/src/raster/isLoading.js +0 -5
- package/src/rendering/composeRoofAtlas.js +0 -52
- package/src/rendering/createProgram.js +0 -92
- package/src/rendering/destroyTexture.js +0 -6
- package/src/rendering/ensureRoofBlit.js +0 -40
- package/src/rendering/rebuildRoofAtlas.js +0 -67
- package/src/rendering/reportCompilation.js +0 -17
- package/src/rendering/sortMeshes.js +0 -6
- package/src/rendering/synchronizeZoomView.js +0 -34
- package/src/rendering/updateMapCamera.js +0 -32
- package/src/rendering/updateRoofRaster.js +0 -32
- package/src/scene/attach.js +0 -161
- package/src/scene/emptyNode.js +0 -11
- package/src/scene/endZoom.js +0 -16
- package/src/scene/layerLayerAdd.js +0 -21
- package/src/scene/onZoomAnim.js +0 -16
- package/src/scene/renderPendingZoomAnimation.js +0 -7
- package/src/scene/rendererDeviceError.js +0 -10
- package/src/scene/rendererDeviceLost.js +0 -11
- package/src/scene/reportError.js +0 -3
- package/src/scene/requestAdapter.js +0 -12
- package/src/scene/requestDevice.js +0 -9
- package/src/scene/update.js +0 -19
- package/src/scene/updateCamera.js +0 -34
- package/src/scene/updateWorldMatrix.js +0 -48
- package/src/shadows/shadowBounds.js +0 -32
- package/src/sources/addGeneratedTriangle.js +0 -6
- package/src/sources/projectRing.js +0 -20
- package/src/sources/projectedTree.js +0 -13
- package/src/sources/pump.js +0 -54
- package/src/sources/updateStatus.js +0 -12
- package/src/sunlight/horizontalPosition.js +0 -16
- package/src/sunlight/initialize.js +0 -11
- package/src/sunlight/mix.js +0 -6
- package/src/sunlight/moonPosition.js +0 -17
- package/src/sunlight/projectCelestialBody.js +0 -13
- package/src/sunlight/render.js +0 -7
- package/src/sunlight/rgb.js +0 -6
- package/src/sunlight/solarPosition.js +0 -17
- package/src/terrain/terrainGrid.js +0 -24
- package/src/traffic/routeGeometry.js +0 -31
- package/src/traffic/toLanes.js +0 -16
- package/src/traffic/tooltip.js +0 -11
- package/src/vehicles/carriage.js +0 -19
- package/src/vehicles/mirror.js +0 -8
- package/src/walk/local.js +0 -10
- package/src/walk/onAdd.js +0 -4
- package/src/walk/onPointer.js +0 -13
- package/src/walk/onRemove.js +0 -4
- package/src/walk/start.js +0 -37
- package/src/walk/step.js +0 -53
- /package/src/{utils/channel.js → colors/hslChannel.js} +0 -0
- /package/src/{utils → colors}/toSRGB.js +0 -0
- /package/src/controls/{editable.js → isEditableTarget.js} +0 -0
- /package/src/geometry/{nativeTriangle.js → appendNativeTriangle.js} +0 -0
- /package/src/{constants → globals}/TILE_RADIUS.js +0 -0
- /package/src/{constants → globals}/TILE_SIZE.js +0 -0
- /package/src/{constants → globals}/dark.js +0 -0
- /package/src/{constants → globals}/glass.js +0 -0
- /package/src/{constants → globals}/headlight.js +0 -0
- /package/src/{constants → globals}/moves.js +0 -0
- /package/src/{constants → globals}/paints.js +0 -0
- /package/src/{constants → globals}/pendingUpdates.js +0 -0
- /package/src/{constants → globals}/shirt.js +0 -0
- /package/src/{constants → globals}/skin.js +0 -0
- /package/src/{constants → globals}/speed.js +0 -0
- /package/src/{constants → globals}/taillight.js +0 -0
- /package/src/{constants → globals}/trousers.js +0 -0
- /package/src/{constants/accessorTypes.js → globals/types.js} +0 -0
- /package/src/{constants → globals}/tyre.js +0 -0
- /package/src/{constants → globals}/white.js +0 -0
- /package/src/{scene → gpu}/showWebGPUWarning.js +0 -0
- /package/src/{scene → layer-controls}/placeUnderEntry.js +0 -0
- /package/src/{core → native}/compareNativeHits.js +0 -0
- /package/src/{core → native}/nativeAddLatLng.js +0 -0
- /package/src/{core → native}/nativeBringToBack.js +0 -0
- /package/src/{core → native}/nativeBringToFront.js +0 -0
- /package/src/{core → native}/nativeRedraw.js +0 -0
- /package/src/{core → native}/nativeSetBounds.js +0 -0
- /package/src/{core → native}/nativeSetIcon.js +0 -0
- /package/src/{core → native}/nativeSetLatLng.js +0 -0
- /package/src/{core → native}/nativeSetLatLngs.js +0 -0
- /package/src/{core → native}/nativeSetOpacity.js +0 -0
- /package/src/{core → native}/nativeSetRadius.js +0 -0
- /package/src/{core → native}/nativeSetStyle.js +0 -0
- /package/src/{core → native}/nativeSetUrl.js +0 -0
- /package/src/{core → native}/nativeSetZIndex.js +0 -0
- /package/src/{core → native}/nativeSetZIndexOffset.js +0 -0
- /package/src/{core → native}/refreshNativeEvent.js +0 -0
- /package/src/{core → native}/restoreNativeEvents.js +0 -0
- /package/src/{camera/displayPoint.js → projections/displayContainerPoint.js} +0 -0
- /package/src/{core → projections}/localPixel.js +0 -0
- /package/src/{camera → projections}/verticalGroundY.js +0 -0
- /package/src/sunlight/{onAdd.js → onAddTimeControl.js} +0 -0
- /package/src/terrain/{sample.js → sampleTerrainTile.js} +0 -0
- /package/src/walk/{onBlur.js → onWalkBlur.js} +0 -0
- /package/src/{constants → weakmaps}/nativeEventMaps.js +0 -0
- /package/src/{constants → weakmaps}/renderers.js +0 -0
|
@@ -1,84 +1,21 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { defaultMaterial } from '../globals/defaultMaterial.js';
|
|
2
|
+
import { textureBinding } from '../textures/textureBinding.js';
|
|
3
|
+
import { validateRoofMaterial } from '../materials/validateRoofMaterial.js';
|
|
4
|
+
import { materialVertexShader } from './materialVertexShader.js';
|
|
5
|
+
import { materialSurfaceShader } from './materialSurfaceShader.js';
|
|
2
6
|
|
|
3
7
|
/** Material WGSL and texture bindings, without a GPU device or Leaflet layer. */
|
|
4
|
-
export function materialShaders(material =
|
|
8
|
+
export function materialShaders(material = defaultMaterial, sparkle = false, elevationWGSL = '') {
|
|
5
9
|
const hasBase = Boolean(material.baseTexture);
|
|
6
10
|
const hasMetal = Boolean(material.metalTexture);
|
|
7
11
|
const hasEmissive = Boolean(material.emissiveTexture);
|
|
8
12
|
const hasOcclusion = Boolean(material.occlusionTexture);
|
|
9
|
-
const hasRoof = Boolean(material.roofTexture);
|
|
13
|
+
const hasRoof = Boolean(material.roofTexture || material.wallTexture);
|
|
14
|
+
validateRoofMaterial(material);
|
|
10
15
|
const hasTerrain = Boolean(material.terrain);
|
|
11
16
|
const textured = hasBase || hasMetal || hasEmissive || hasOcclusion || material.nightLight;
|
|
12
|
-
const vertex =
|
|
13
|
-
|
|
14
|
-
worldMatrix: mat4x4<f32>,
|
|
15
|
-
baseColor: vec4<f32>,
|
|
16
|
-
material: vec4<f32>,
|
|
17
|
-
emissive: vec4<f32>,
|
|
18
|
-
terrain: vec4<f32>,
|
|
19
|
-
highlight: vec4<f32>,
|
|
20
|
-
};
|
|
21
|
-
struct Frame {
|
|
22
|
-
viewMatrix: mat4x4<f32>,
|
|
23
|
-
projectionMatrix: mat4x4<f32>,
|
|
24
|
-
roofMatrix: mat4x4<f32>,
|
|
25
|
-
lightDirection: vec4<f32>,
|
|
26
|
-
skyDirection: vec4<f32>,
|
|
27
|
-
atmosphereTint: vec4<f32>,
|
|
28
|
-
};
|
|
29
|
-
@group(0) @binding(0) var<uniform> u: Mesh;
|
|
30
|
-
@group(0) @binding(1) var<uniform> frame: Frame;
|
|
31
|
-
struct Solar { matrix: mat4x4<f32>, params: vec4<f32> };
|
|
32
|
-
@group(1) @binding(0) var<uniform> solar: Solar;
|
|
33
|
-
${hasTerrain ? /* wgsl */ `@group(0) @binding(2) var dem: texture_2d<f32>;${elevationWGSL}` : ''}
|
|
34
|
-
struct VertexInput {
|
|
35
|
-
@location(0) position: vec3<f32>,
|
|
36
|
-
@location(1) normal: vec3<f32>,
|
|
37
|
-
${material.instanced ? '@location(4) instanceOffset: vec4<f32>,' : ''}
|
|
38
|
-
${material.vertexColors ? '@location(2) color: vec3<f32>,' : ''}
|
|
39
|
-
${textured ? '@location(3) uv: vec2<f32>,' : ''}
|
|
40
|
-
};
|
|
41
|
-
struct VertexOutput {
|
|
42
|
-
@builtin(position) position: vec4<f32>,
|
|
43
|
-
@location(0) color: vec3<f32>,
|
|
44
|
-
@location(1) normal: vec3<f32>,
|
|
45
|
-
@location(2) viewPosition: vec3<f32>,
|
|
46
|
-
@location(6) shadowPosition: vec4<f32>,
|
|
47
|
-
@location(7) worldPosition: vec3<f32>,
|
|
48
|
-
${sparkle ? '@location(8) localPosition: vec3<f32>,' : ''}
|
|
49
|
-
${textured ? '@location(3) uv: vec2<f32>,' : ''}
|
|
50
|
-
${hasRoof ? '@location(4) roofUv: vec2<f32>, @location(5) roof: f32,' : ''}
|
|
51
|
-
};
|
|
52
|
-
@vertex fn vertexMain(input: VertexInput, @builtin(vertex_index) vertexIndex: u32) -> VertexOutput {
|
|
53
|
-
var output: VertexOutput;
|
|
54
|
-
var position = input.position${material.instanced ? ' + input.instanceOffset.xyz' : ''};
|
|
55
|
-
${hasTerrain ? 'position.y = elevation(u.terrain.xy + input.uv * u.terrain.z, u.terrain.w) - u.terrain.w;' : ''}
|
|
56
|
-
let featureVertex = f32(vertexIndex)${material.instanced ? ' + input.instanceOffset.w' : ''};
|
|
57
|
-
let highlighted = featureVertex >= u.highlight.x && featureVertex < u.highlight.y;
|
|
58
|
-
output.color = ${material.vertexColors
|
|
59
|
-
? 'select(input.color, vec3<f32>(72.0 / 255.0, 217.0 / 255.0, 1.0), highlighted)'
|
|
60
|
-
: 'u.baseColor.rgb'};
|
|
61
|
-
// Inverse-transpose from cofactors; the camera view matrix is orthonormal.
|
|
62
|
-
let m = mat3x3<f32>(u.worldMatrix[0].xyz, u.worldMatrix[1].xyz, u.worldMatrix[2].xyz);
|
|
63
|
-
let normal = (cross(m[1], m[2]) * input.normal.x + cross(m[2], m[0]) * input.normal.y +
|
|
64
|
-
cross(m[0], m[1]) * input.normal.z) / determinant(m);
|
|
65
|
-
output.normal = (frame.viewMatrix * vec4<f32>(normal, 0.0)).xyz;
|
|
66
|
-
let world = u.worldMatrix * vec4<f32>(position, 1.0);
|
|
67
|
-
output.shadowPosition = solar.matrix * world;
|
|
68
|
-
output.worldPosition = world.xyz / world.w;
|
|
69
|
-
${sparkle ? `output.localPosition = input.position${material.instanced ? ' + input.instanceOffset.xyz' : ''};` : ''}
|
|
70
|
-
let viewPosition = frame.viewMatrix * world;
|
|
71
|
-
output.viewPosition = viewPosition.xyz;
|
|
72
|
-
${textured ? 'output.uv = input.uv;' : ''}
|
|
73
|
-
${hasRoof ? /* wgsl */ `
|
|
74
|
-
output.roofUv = (frame.roofMatrix * world).xz;
|
|
75
|
-
output.roof = select(0.0, 1.0, input.normal.y >= 0.5 && !highlighted);
|
|
76
|
-
` : ''}
|
|
77
|
-
output.position = frame.projectionMatrix * viewPosition;
|
|
78
|
-
return output;
|
|
79
|
-
}
|
|
80
|
-
`;
|
|
81
|
-
const bindings = [];
|
|
17
|
+
const vertex = materialVertexShader(material, sparkle, elevationWGSL, hasTerrain, textured, hasRoof);
|
|
18
|
+
const bindings = /* alloc */ [];
|
|
82
19
|
const baseBinding = textureBinding(bindings, 'baseTexture', hasBase);
|
|
83
20
|
const metalBinding = textureBinding(bindings, 'metalTexture', hasMetal);
|
|
84
21
|
const emissiveBinding = textureBinding(bindings, 'emissiveTexture', hasEmissive);
|
|
@@ -92,6 +29,7 @@ export function materialShaders(material = {}, sparkle = false, elevationWGSL =
|
|
|
92
29
|
emissive: vec4<f32>,
|
|
93
30
|
terrain: vec4<f32>,
|
|
94
31
|
highlight: vec4<f32>,
|
|
32
|
+
cutout: vec4<f32>,
|
|
95
33
|
};
|
|
96
34
|
struct Frame {
|
|
97
35
|
viewMatrix: mat4x4<f32>,
|
|
@@ -171,6 +109,8 @@ export function materialShaders(material = {}, sparkle = false, elevationWGSL =
|
|
|
171
109
|
if (u.highlight.w < 1.0 && noise >= u.highlight.w) { discard; }
|
|
172
110
|
}
|
|
173
111
|
@fragment fn fragmentMain(input: FragmentInput, @builtin(front_facing) frontFacing: bool) -> @location(0) vec4<f32> {
|
|
112
|
+
let cutoutDistance = distance(input.position.xy, u.cutout.xy);
|
|
113
|
+
if (select((cutoutDistance < u.cutout.z), (cutoutDistance >= u.cutout.z), u.cutout.w > 0.0)) { discard; }
|
|
174
114
|
${material.nightLight ? /* wgsl */ `
|
|
175
115
|
if (input.uv.x <= 2.0) {
|
|
176
116
|
let radial = max(0.0, 1.0 - dot(input.uv, input.uv));
|
|
@@ -183,64 +123,8 @@ export function materialShaders(material = {}, sparkle = false, elevationWGSL =
|
|
|
183
123
|
let sunlight = sunVisibility(input.shadowPosition);
|
|
184
124
|
let worldNormal = normalize(transpose(mat3x3<f32>(frame.viewMatrix[0].xyz, frame.viewMatrix[1].xyz, frame.viewMatrix[2].xyz)) * normalize(input.normal)) * select(-1.0, 1.0, frontFacing);
|
|
185
125
|
let artificial = localLighting(input.worldPosition, worldNormal);
|
|
186
|
-
${material
|
|
187
|
-
let rasterTexel = ${hasBase ? 'textureSample(baseTexture, baseTextureSampler, input.uv)' : 'vec4<f32>(input.color, 1.0)'};
|
|
188
|
-
return vec4<f32>(toSRGB(toLinear(rasterTexel.rgb) * (frame.atmosphereTint.rgb * (0.55 + 0.45 * sunlight) + artificial)), ${material.alphaMode === 'BLEND' ? 'u.material.z * rasterTexel.a' : '1.0'});
|
|
189
|
-
` : /* wgsl */ `
|
|
190
|
-
var normal = normalize(input.normal) * select(-1.0, 1.0, frontFacing);
|
|
191
|
-
let texel = ${hasBase ? 'textureSample(baseTexture, baseTextureSampler, input.uv)' : 'vec4<f32>(1.0)'};
|
|
192
|
-
let alpha = u.material.z * texel.a;
|
|
193
|
-
${material.alphaMode === 'MASK' ? 'if (alpha < u.material.w) { discard; }' : ''}
|
|
194
|
-
${material.alphaMode === 'BLEND' ? 'if (alpha < 0.01) { discard; }' : ''}
|
|
195
|
-
var base = ${material.vertexColors ? 'toLinear(min(input.color, vec3<f32>(1.0)))' : 'input.color'} *
|
|
196
|
-
${material.baseTexture?.srgb ? 'texel.rgb' : 'toLinear(texel.rgb)'};
|
|
197
|
-
${hasRoof ? /* wgsl */ `
|
|
198
|
-
if (input.roof > 0.5 && all(input.roofUv >= vec2<f32>(0.0)) &&
|
|
199
|
-
all(input.roofUv <= vec2<f32>(1.0))) {
|
|
200
|
-
let roof = textureSampleLevel(roofTexture, roofTextureSampler, input.roofUv, 0.0);
|
|
201
|
-
base = mix(base, toLinear(roof.rgb), roof.a);
|
|
202
|
-
}
|
|
203
|
-
` : ''}
|
|
204
|
-
let mr = ${hasMetal ? 'textureSample(metalTexture, metalTextureSampler, input.uv)' : 'vec4<f32>(1.0)'};
|
|
205
|
-
let metal = clamp(u.material.x * mr.b, 0.0, 1.0);
|
|
206
|
-
let rough = clamp(u.material.y * mr.g, 0.08, 1.0);
|
|
207
|
-
let view = normalize(-input.viewPosition);
|
|
208
|
-
let halfVector = normalize(view + frame.lightDirection.xyz);
|
|
209
|
-
let nl = max(dot(normal, frame.lightDirection.xyz), 0.0) * frame.lightDirection.w * sunlight;
|
|
210
|
-
let nv = max(dot(normal, view), 0.001);
|
|
211
|
-
let nh = max(dot(normal, halfVector), 0.0);
|
|
212
|
-
let vh = max(dot(view, halfVector), 0.0);
|
|
213
|
-
let a2 = pow(rough, 4.0);
|
|
214
|
-
let d = a2 / max(PI * pow(nh * nh * (a2 - 1.0) + 1.0, 2.0), 0.0001);
|
|
215
|
-
let gv = nl * sqrt(nv * nv * (1.0 - a2) + a2);
|
|
216
|
-
let gl = nv * sqrt(nl * nl * (1.0 - a2) + a2);
|
|
217
|
-
let visibility = 0.5 / max(gv + gl, 0.0001);
|
|
218
|
-
let f0 = mix(vec3<f32>(0.04), base, metal);
|
|
219
|
-
let fresnel = f0 + (1.0 - f0) * pow(1.0 - vh, 5.0);
|
|
220
|
-
let specular = d * visibility * fresnel;
|
|
221
|
-
let diffuse = (1.0 - metal) * base / PI;
|
|
222
|
-
let sky = dot(normal, frame.skyDirection.xyz) * 0.5 + 0.5;
|
|
223
|
-
let ambient = mix(toLinear(vec3<f32>(0.455, 0.412, 0.322)), vec3<f32>(1.0), sky) * (2.0 / PI);
|
|
224
|
-
let ao = ${hasOcclusion ? 'mix(1.0, textureSample(occlusionTexture, occlusionTextureSampler, input.uv).r, u.emissive.w)' : '1.0'};
|
|
225
|
-
${sparkle ? /* wgsl */ `
|
|
226
|
-
let lattice = (fract(input.localPosition / 2.5) - 0.5) * 2.5;
|
|
227
|
-
let pointGlow = (1.0 - smoothstep(0.16, 0.42, length(lattice))) * u.highlight.z;
|
|
228
|
-
` : ''}
|
|
229
|
-
// Vertex colour components above 1 are self-lit (e.g. vehicle lamps): dim by day, bright at night.
|
|
230
|
-
let glow = ${sparkle ? 'vec3<f32>(3.0, 2.6, 1.8) * pointGlow +' : ''}${material.vertexColors
|
|
231
|
-
? ' max(input.color - vec3<f32>(1.0), vec3<f32>(0.0)) * (0.3 + 5.0 * frame.skyDirection.w) +' : ''} u.emissive.rgb * ${hasEmissive
|
|
232
|
-
? material.emissiveTexture.srgb
|
|
233
|
-
? 'textureSample(emissiveTexture, emissiveTextureSampler, input.uv).rgb'
|
|
234
|
-
: 'toLinear(textureSample(emissiveTexture, emissiveTextureSampler, input.uv).rgb)'
|
|
235
|
-
: 'vec3<f32>(1.0)'};
|
|
236
|
-
var color = ambient * base * (1.0 - metal) * ao +
|
|
237
|
-
(diffuse + specular) * nl * toLinear(vec3<f32>(1.0, 0.937, 0.835)) * 3.0 + glow;
|
|
238
|
-
${material.vertexColors ? 'color = base * (ambient + toLinear(vec3<f32>(1.0, 0.937, 0.835)) * (3.0 / PI) * nl) + glow;' : ''}
|
|
239
|
-
color = (color - glow) * frame.atmosphereTint.rgb + base * artificial * (1.0 - metal * 0.5) + glow;
|
|
240
|
-
appearance(input.position.xy);
|
|
241
|
-
return vec4<f32>(toSRGB(color), ${material.alphaMode === 'BLEND' ? 'alpha' : '1.0'});
|
|
242
|
-
`}
|
|
126
|
+
${materialSurfaceShader(material, sparkle, hasBase, hasMetal, hasEmissive, hasOcclusion, hasRoof)}
|
|
243
127
|
}
|
|
244
128
|
`;
|
|
245
|
-
return { vertex, fragment, bindings, textured, hasTerrain };
|
|
129
|
+
return /* alloc */ { vertex, fragment, bindings, textured, hasTerrain };
|
|
246
130
|
}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { materialBaseShader } from './materialBaseShader.js';
|
|
2
|
+
|
|
3
|
+
export function materialSurfaceShader(material, sparkle, hasBase, hasMetal, hasEmissive, hasOcclusion, hasRoof) {
|
|
4
|
+
return material.unlit ? /* wgsl */ `
|
|
5
|
+
let rasterTexel = ${hasBase ? 'textureSample(baseTexture, baseTextureSampler, input.uv)' : 'vec4<f32>(input.color, 1.0)'};
|
|
6
|
+
return vec4<f32>(toSRGB(toLinear(rasterTexel.rgb) * (frame.atmosphereTint.rgb * (0.55 + 0.45 * sunlight) + artificial)), ${material.alphaMode === 'BLEND' ? 'u.material.z * rasterTexel.a' : '1.0'});
|
|
7
|
+
` : /* wgsl */ `${materialBaseShader(material, hasBase, hasRoof)}
|
|
8
|
+
let mr = ${hasMetal ? 'textureSample(metalTexture, metalTextureSampler, input.uv)' : 'vec4<f32>(1.0)'};
|
|
9
|
+
let metal = clamp(u.material.x * mr.b, 0.0, 1.0);
|
|
10
|
+
let rough = clamp(u.material.y * mr.g, 0.08, 1.0);
|
|
11
|
+
let view = normalize(-input.viewPosition);
|
|
12
|
+
let halfVector = normalize(view + frame.lightDirection.xyz);
|
|
13
|
+
let nl = max(dot(normal, frame.lightDirection.xyz), 0.0) * frame.lightDirection.w * sunlight;
|
|
14
|
+
let nv = max(dot(normal, view), 0.001);
|
|
15
|
+
let nh = max(dot(normal, halfVector), 0.0);
|
|
16
|
+
let vh = max(dot(view, halfVector), 0.0);
|
|
17
|
+
let a2 = pow(rough, 4.0);
|
|
18
|
+
let d = a2 / max(PI * pow(nh * nh * (a2 - 1.0) + 1.0, 2.0), 0.0001);
|
|
19
|
+
let gv = nl * sqrt(nv * nv * (1.0 - a2) + a2);
|
|
20
|
+
let gl = nv * sqrt(nl * nl * (1.0 - a2) + a2);
|
|
21
|
+
let visibility = 0.5 / max(gv + gl, 0.0001);
|
|
22
|
+
let f0 = mix(vec3<f32>(0.04), base, metal);
|
|
23
|
+
let fresnel = f0 + (1.0 - f0) * pow(1.0 - vh, 5.0);
|
|
24
|
+
let specular = d * visibility * fresnel;
|
|
25
|
+
let diffuse = (1.0 - metal) * base / PI;
|
|
26
|
+
let sky = dot(normal, frame.skyDirection.xyz) * 0.5 + 0.5;
|
|
27
|
+
let ambient = mix(toLinear(vec3<f32>(0.455, 0.412, 0.322)), vec3<f32>(1.0), sky) * (2.0 / PI);
|
|
28
|
+
let ao = ${hasOcclusion ? 'mix(1.0, textureSample(occlusionTexture, occlusionTextureSampler, input.uv).r, u.emissive.w)' : '1.0'};
|
|
29
|
+
${sparkle ? /* wgsl */ `
|
|
30
|
+
let lattice = (fract(input.localPosition / 2.5) - 0.5) * 2.5;
|
|
31
|
+
let pointGlow = (1.0 - smoothstep(0.16, 0.42, length(lattice))) * u.highlight.z;
|
|
32
|
+
` : ''}
|
|
33
|
+
// Vertex colour components above 1 are self-lit (e.g. vehicle lamps): dim by day, bright at night.
|
|
34
|
+
let glow = ${sparkle ? 'vec3<f32>(3.0, 2.6, 1.8) * pointGlow +' : ''}${material.vertexColors
|
|
35
|
+
? ' max(input.color - vec3<f32>(1.0), vec3<f32>(0.0)) * (0.3 + 5.0 * frame.skyDirection.w) +' : ''} u.emissive.rgb * ${hasEmissive
|
|
36
|
+
? material.emissiveTexture.srgb
|
|
37
|
+
? 'textureSample(emissiveTexture, emissiveTextureSampler, input.uv).rgb'
|
|
38
|
+
: 'toLinear(textureSample(emissiveTexture, emissiveTextureSampler, input.uv).rgb)'
|
|
39
|
+
: 'vec3<f32>(1.0)'};
|
|
40
|
+
var color = ambient * base * (1.0 - metal) * ao +
|
|
41
|
+
(diffuse + specular) * nl * toLinear(vec3<f32>(1.0, 0.937, 0.835)) * 3.0 + glow;
|
|
42
|
+
${material.vertexColors ? 'color = base * (ambient + toLinear(vec3<f32>(1.0, 0.937, 0.835)) * (3.0 / PI) * nl) + glow;' : ''}
|
|
43
|
+
color = (color - glow) * frame.atmosphereTint.rgb + base * artificial * (1.0 - metal * 0.5) + glow;
|
|
44
|
+
appearance(input.position.xy);
|
|
45
|
+
return vec4<f32>(toSRGB(color), ${material.alphaMode === 'BLEND' ? 'alpha' : '1.0'});
|
|
46
|
+
`;
|
|
47
|
+
}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { roofVertexShader } from './roofVertexShader.js';
|
|
2
|
+
|
|
3
|
+
export function materialVertexShader(material, sparkle, elevationWGSL, hasTerrain, textured, hasRoof) {
|
|
4
|
+
const instanceOffset = material.instanced ? ' + input.instanceOffset.xyz' : '';
|
|
5
|
+
return /* wgsl */ `
|
|
6
|
+
struct Mesh {
|
|
7
|
+
worldMatrix: mat4x4<f32>,
|
|
8
|
+
baseColor: vec4<f32>,
|
|
9
|
+
material: vec4<f32>,
|
|
10
|
+
emissive: vec4<f32>,
|
|
11
|
+
terrain: vec4<f32>,
|
|
12
|
+
highlight: vec4<f32>,
|
|
13
|
+
cutout: vec4<f32>,
|
|
14
|
+
};
|
|
15
|
+
struct Frame {
|
|
16
|
+
viewMatrix: mat4x4<f32>,
|
|
17
|
+
projectionMatrix: mat4x4<f32>,
|
|
18
|
+
roofMatrix: mat4x4<f32>,
|
|
19
|
+
lightDirection: vec4<f32>,
|
|
20
|
+
skyDirection: vec4<f32>,
|
|
21
|
+
atmosphereTint: vec4<f32>,
|
|
22
|
+
};
|
|
23
|
+
@group(0) @binding(0) var<uniform> u: Mesh;
|
|
24
|
+
@group(0) @binding(1) var<uniform> frame: Frame;
|
|
25
|
+
struct Solar { matrix: mat4x4<f32>, params: vec4<f32> };
|
|
26
|
+
@group(1) @binding(0) var<uniform> solar: Solar;
|
|
27
|
+
${hasTerrain ? /* wgsl */ `@group(0) @binding(2) var dem: texture_2d<f32>;${elevationWGSL}` : ''}
|
|
28
|
+
struct VertexInput {
|
|
29
|
+
@location(0) position: vec3<f32>,
|
|
30
|
+
@location(1) normal: vec3<f32>,
|
|
31
|
+
${material.instanced ? '@location(4) instanceOffset: vec4<f32>,' : ''}
|
|
32
|
+
${material.vertexColors ? '@location(2) color: vec3<f32>,' : ''}
|
|
33
|
+
${textured ? '@location(3) uv: vec2<f32>,' : ''}
|
|
34
|
+
};
|
|
35
|
+
struct VertexOutput {
|
|
36
|
+
@builtin(position) position: vec4<f32>,
|
|
37
|
+
@location(0) color: vec3<f32>,
|
|
38
|
+
@location(1) normal: vec3<f32>,
|
|
39
|
+
@location(2) viewPosition: vec3<f32>,
|
|
40
|
+
@location(6) shadowPosition: vec4<f32>,
|
|
41
|
+
@location(7) worldPosition: vec3<f32>,
|
|
42
|
+
${sparkle ? '@location(8) localPosition: vec3<f32>,' : ''}
|
|
43
|
+
${textured ? '@location(3) uv: vec2<f32>,' : ''}
|
|
44
|
+
${hasRoof ? '@location(4) roofUv: vec2<f32>, @location(5) roof: f32,' : ''}
|
|
45
|
+
};
|
|
46
|
+
@vertex fn vertexMain(input: VertexInput, @builtin(vertex_index) vertexIndex: u32) -> VertexOutput {
|
|
47
|
+
var output: VertexOutput;
|
|
48
|
+
var position = input.position${instanceOffset};
|
|
49
|
+
${hasTerrain ? 'position.y = elevation(u.terrain.xy + input.uv * u.terrain.z, u.terrain.w) - u.terrain.w;' : ''}
|
|
50
|
+
let featureVertex = f32(vertexIndex)${material.instanced ? ' + input.instanceOffset.w' : ''};
|
|
51
|
+
let highlighted = featureVertex >= u.highlight.x && featureVertex < u.highlight.y;
|
|
52
|
+
output.color = ${material.vertexColors
|
|
53
|
+
? 'select(input.color, vec3<f32>(72.0 / 255.0, 217.0 / 255.0, 1.0), highlighted)'
|
|
54
|
+
: 'u.baseColor.rgb'};
|
|
55
|
+
// Inverse-transpose from cofactors; the camera view matrix is orthonormal.
|
|
56
|
+
let m = mat3x3<f32>(u.worldMatrix[0].xyz, u.worldMatrix[1].xyz, u.worldMatrix[2].xyz);
|
|
57
|
+
let normal = (cross(m[1], m[2]) * input.normal.x + cross(m[2], m[0]) * input.normal.y +
|
|
58
|
+
cross(m[0], m[1]) * input.normal.z) / determinant(m);
|
|
59
|
+
output.normal = (frame.viewMatrix * vec4<f32>(normal, 0.0)).xyz;
|
|
60
|
+
let world = u.worldMatrix * vec4<f32>(position, 1.0);
|
|
61
|
+
output.shadowPosition = solar.matrix * world;
|
|
62
|
+
output.worldPosition = world.xyz / world.w;
|
|
63
|
+
${sparkle ? `output.localPosition = input.position${instanceOffset};` : ''}
|
|
64
|
+
let viewPosition = frame.viewMatrix * world;
|
|
65
|
+
output.viewPosition = viewPosition.xyz;
|
|
66
|
+
${textured ? 'output.uv = input.uv;' : ''}
|
|
67
|
+
${hasRoof ? roofVertexShader(material) : ''}
|
|
68
|
+
output.position = frame.projectionMatrix * viewPosition;
|
|
69
|
+
return output;
|
|
70
|
+
}
|
|
71
|
+
`;
|
|
72
|
+
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export function roofVertexShader(material) {
|
|
2
|
+
const roofOpacity = Number(material.roofTexture ?? 0);
|
|
3
|
+
const wallOpacity = Number(material.wallTexture ?? 0);
|
|
4
|
+
return /* wgsl */ `
|
|
5
|
+
output.roofUv = (frame.roofMatrix * world).xz;
|
|
6
|
+
output.roof = select(0.0, select(${wallOpacity.toFixed(8)}, ${roofOpacity.toFixed(8)}, input.normal.y >= 0.5), ((${Boolean(material.roofTexture)} && input.normal.y >= 0.5) ||
|
|
7
|
+
(${Boolean(material.wallTexture)} && abs(input.normal.y) < 0.5)) && !highlighted);
|
|
8
|
+
`;
|
|
9
|
+
}
|
|
@@ -1,12 +1,22 @@
|
|
|
1
|
+
import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
|
|
2
|
+
|
|
3
|
+
import { sunBindGroup } from '../globals/sunBindGroup.js';
|
|
4
|
+
|
|
5
|
+
|
|
1
6
|
|
|
2
7
|
export function bindSunlight(layer) {
|
|
3
|
-
const sun = layer.
|
|
4
|
-
sun.bindGroup = layer.
|
|
5
|
-
layout
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
const sun = rendererByLayer.get(layer).sunlight;
|
|
9
|
+
sun.bindGroup = rendererByLayer.get(layer).device.createBindGroup((
|
|
10
|
+
sunBindGroup.layout = sun.layout,
|
|
11
|
+
sunBindGroup.entries[0].resource.buffer = sun.buffer,
|
|
12
|
+
sunBindGroup.entries[1].resource = sun.texture.createView(),
|
|
13
|
+
sunBindGroup.entries[2].resource = sun.sampler,
|
|
14
|
+
sunBindGroup.entries[3].resource.buffer = sun.lights,
|
|
15
|
+
sunBindGroup
|
|
16
|
+
));
|
|
17
|
+
sunBindGroup.layout = null;
|
|
18
|
+
sunBindGroup.entries[0].resource.buffer = null;
|
|
19
|
+
sunBindGroup.entries[1].resource = null;
|
|
20
|
+
sunBindGroup.entries[2].resource = null;
|
|
21
|
+
sunBindGroup.entries[3].resource.buffer = null;
|
|
12
22
|
}
|
|
@@ -1,12 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
1
|
+
import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
|
|
2
|
+
|
|
3
|
+
import { shadowPass } from '../globals/shadowPass.js';
|
|
4
|
+
import { shadowBindGroup } from '../globals/shadowBindGroup.js';
|
|
5
|
+
import { shadowOffsets } from '../globals/shadowOffsets.js';
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
export function drawShadowMeshes(layer, encoder, meshes) {
|
|
9
|
+
const renderer = rendererByLayer.get(layer), device = renderer.device, sun = renderer.sunlight;
|
|
10
|
+
const pass = encoder.beginRenderPass((
|
|
11
|
+
shadowPass.depthStencilAttachment.view = sun.texture.createView(),
|
|
12
|
+
shadowPass
|
|
13
|
+
));
|
|
14
|
+
shadowPass.depthStencilAttachment.view = null;
|
|
10
15
|
let pipeline = sun.pipeline;
|
|
11
16
|
pass.setPipeline(pipeline);
|
|
12
17
|
pass.setBindGroup(1, sun.depthBindGroup);
|
|
@@ -23,11 +28,13 @@ export function drawShadowMeshes(backend, encoder, meshes) {
|
|
|
23
28
|
renderer.uniformData[offset / 4 + 35] = mesh._appearance ?? 1;
|
|
24
29
|
if (mesh._shadowBuffer !== renderer.uniformBuffer) {
|
|
25
30
|
mesh._shadowBuffer = renderer.uniformBuffer;
|
|
26
|
-
mesh._shadowBindGroup = device.createBindGroup(
|
|
27
|
-
layout
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
+
mesh._shadowBindGroup = device.createBindGroup((
|
|
32
|
+
shadowBindGroup.layout = sun.meshLayout,
|
|
33
|
+
shadowBindGroup.entries[0].resource.buffer = renderer.uniformBuffer,
|
|
34
|
+
shadowBindGroup
|
|
35
|
+
));
|
|
36
|
+
shadowBindGroup.layout = null;
|
|
37
|
+
shadowBindGroup.entries[0].resource.buffer = null;
|
|
31
38
|
}
|
|
32
39
|
for (attribute of Object.values(mesh.geometry.attributes)) {
|
|
33
40
|
if (attribute.needsUpdate) {
|
|
@@ -35,7 +42,11 @@ export function drawShadowMeshes(backend, encoder, meshes) {
|
|
|
35
42
|
attribute.needsUpdate = false;
|
|
36
43
|
}
|
|
37
44
|
}
|
|
38
|
-
pass.setBindGroup(0, mesh._shadowBindGroup,
|
|
45
|
+
pass.setBindGroup(0, mesh._shadowBindGroup, (
|
|
46
|
+
shadowOffsets[0] = offset,
|
|
47
|
+
shadowOffsets
|
|
48
|
+
));
|
|
49
|
+
|
|
39
50
|
pass.setVertexBuffer(0, mesh.geometry.attributes.position.buffer);
|
|
40
51
|
if (instances) pass.setVertexBuffer(1, instances.buffer);
|
|
41
52
|
index = mesh.geometry.attributes.index, range = mesh.geometry.drawRange;
|
|
@@ -1,24 +1,37 @@
|
|
|
1
|
+
import { shadowMeshLayout } from '../globals/shadowMeshLayout.js';
|
|
2
|
+
import { shadowDepthLayout } from '../globals/shadowDepthLayout.js';
|
|
3
|
+
import { depthBindGroup as sharedDepthBindGroup } from '../globals/depthBindGroup.js';
|
|
4
|
+
import { shadowShader } from '../globals/shadowShader.js';
|
|
5
|
+
import { shadowPipeline } from '../globals/shadowPipeline.js';
|
|
6
|
+
import { shadowPipelineLayout } from '../globals/shadowPipelineLayout.js';
|
|
7
|
+
import { shadowInstanceLayouts } from '../globals/shadowInstanceLayouts.js';
|
|
8
|
+
import { shadowLayouts } from '../globals/shadowLayouts.js';
|
|
9
|
+
|
|
1
10
|
export function ensureShadowPipeline(device, sun, instanced = false) {
|
|
2
11
|
const key = instanced ? 'instancePipeline' : 'pipeline';
|
|
3
12
|
if (!sun[key]) {
|
|
4
13
|
if (!sun.meshLayout) {
|
|
5
|
-
sun.meshLayout = device.createBindGroupLayout(
|
|
6
|
-
entries
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
14
|
+
sun.meshLayout = device.createBindGroupLayout((
|
|
15
|
+
shadowMeshLayout.entries[0].visibility = GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT,
|
|
16
|
+
shadowMeshLayout
|
|
17
|
+
));
|
|
18
|
+
|
|
10
19
|
// Do not bind the sampled depth texture while it is a render attachment.
|
|
11
|
-
sun.depthLayout = device.createBindGroupLayout(
|
|
12
|
-
entries
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
sun.depthBindGroup = device.createBindGroup(
|
|
17
|
-
layout
|
|
18
|
-
|
|
20
|
+
sun.depthLayout = device.createBindGroupLayout((
|
|
21
|
+
shadowDepthLayout.entries[0].visibility = GPUShaderStage.VERTEX,
|
|
22
|
+
shadowDepthLayout
|
|
23
|
+
));
|
|
24
|
+
|
|
25
|
+
sun.depthBindGroup = device.createBindGroup((
|
|
26
|
+
sharedDepthBindGroup.layout = sun.depthLayout,
|
|
27
|
+
sharedDepthBindGroup.entries[0].resource.buffer = sun.buffer,
|
|
28
|
+
sharedDepthBindGroup
|
|
29
|
+
));
|
|
30
|
+
sharedDepthBindGroup.layout = null;
|
|
31
|
+
sharedDepthBindGroup.entries[0].resource.buffer = null;
|
|
19
32
|
}
|
|
20
|
-
const shader = device.createShaderModule(
|
|
21
|
-
code
|
|
33
|
+
const shader = device.createShaderModule((
|
|
34
|
+
shadowShader.code = /* wgsl */`
|
|
22
35
|
struct Mesh { world: mat4x4<f32>, padding: array<vec4<f32>, 4>, highlight: vec4<f32> };
|
|
23
36
|
@group(0) @binding(0) var<uniform> mesh: Mesh;
|
|
24
37
|
@group(1) @binding(0) var<uniform> matrix: mat4x4<f32>;
|
|
@@ -29,25 +42,23 @@ export function ensureShadowPipeline(device, sun, instanced = false) {
|
|
|
29
42
|
let noise = fract(52.9829189 * fract(dot(floor(position.xy), vec2<f32>(0.06711056, 0.00583715))));
|
|
30
43
|
if (mesh.highlight.w < 1.0 && noise >= mesh.highlight.w) { discard; }
|
|
31
44
|
}
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
},
|
|
51
|
-
});
|
|
45
|
+
`,
|
|
46
|
+
shadowShader
|
|
47
|
+
));
|
|
48
|
+
shadowShader.code = null;
|
|
49
|
+
const buffers = instanced ? shadowInstanceLayouts : shadowLayouts;
|
|
50
|
+
sun[key] = device.createRenderPipeline((
|
|
51
|
+
shadowPipeline.layout = device.createPipelineLayout((shadowPipelineLayout.bindGroupLayouts[0] = sun.meshLayout, shadowPipelineLayout.bindGroupLayouts[1] = sun.depthLayout, shadowPipelineLayout)),
|
|
52
|
+
shadowPipeline.vertex.module = shader,
|
|
53
|
+
shadowPipeline.vertex.buffers = buffers,
|
|
54
|
+
shadowPipeline.fragment.module = shader,
|
|
55
|
+
shadowPipeline
|
|
56
|
+
));
|
|
57
|
+
shadowPipelineLayout.bindGroupLayouts[0] = null;
|
|
58
|
+
shadowPipelineLayout.bindGroupLayouts[1] = null;
|
|
59
|
+
shadowPipeline.layout = null;
|
|
60
|
+
shadowPipeline.vertex.module = null;
|
|
61
|
+
shadowPipeline.vertex.buffers = null;
|
|
62
|
+
shadowPipeline.fragment.module = null;
|
|
52
63
|
}
|
|
53
64
|
}
|
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
|
|
2
|
+
|
|
3
|
+
import { disabledShadow } from '../globals/disabledShadow.js';
|
|
4
|
+
import { shadowValues } from '../globals/shadowValues.js';
|
|
5
|
+
|
|
1
6
|
import { shadowCacheMatches } from './shadowCacheMatches.js';
|
|
2
7
|
import { shadowMatrix } from './shadowMatrix.js';
|
|
3
8
|
import { ensureShadowPipeline } from './ensureShadowPipeline.js';
|
|
@@ -6,21 +11,19 @@ import { resizeSunlight } from './resizeSunlight.js';
|
|
|
6
11
|
|
|
7
12
|
/** One shared directional depth map. Off-screen but loaded geometry can cast shadows. */
|
|
8
13
|
|
|
9
|
-
export function renderSunlight(
|
|
10
|
-
const renderer =
|
|
14
|
+
export function renderSunlight(layer, encoder, meshes, sunlight) {
|
|
15
|
+
const renderer = rendererByLayer.get(layer), device = renderer.device, sun = renderer.sunlight;
|
|
11
16
|
if (!meshes.length || !sunlight || sunlight.altitude < 3) {
|
|
12
17
|
if (!sun.enabled) return;
|
|
13
|
-
|
|
14
|
-
values.set([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
|
|
15
|
-
device.queue.writeBuffer(sun.buffer, 0, values);
|
|
18
|
+
device.queue.writeBuffer(sun.buffer, 0, disabledShadow);
|
|
16
19
|
sun.enabled = false;
|
|
17
20
|
sun.cache = null;
|
|
18
21
|
return;
|
|
19
22
|
}
|
|
20
23
|
if (shadowCacheMatches(sun, meshes, sunlight)) return;
|
|
21
|
-
const values =
|
|
24
|
+
const values = shadowValues;
|
|
22
25
|
sun.enabled = true;
|
|
23
|
-
resizeSunlight(
|
|
26
|
+
resizeSunlight(layer, Math.min(2048, device.limits.maxTextureDimension2D));
|
|
24
27
|
values.set(shadowMatrix(meshes, sunlight));
|
|
25
28
|
values[16] = 1;
|
|
26
29
|
device.queue.writeBuffer(sun.buffer, 0, values);
|
|
@@ -32,15 +35,15 @@ export function renderSunlight(backend, encoder, meshes, sunlight) {
|
|
|
32
35
|
break;
|
|
33
36
|
}
|
|
34
37
|
}
|
|
35
|
-
drawShadowMeshes(
|
|
36
|
-
const snapshots = new Map();
|
|
38
|
+
drawShadowMeshes(layer, encoder, meshes);
|
|
39
|
+
const snapshots = /* alloc */ new Map();
|
|
37
40
|
let mesh2;
|
|
38
41
|
for (mesh2 of meshes) {
|
|
39
|
-
snapshots.set(mesh2, {
|
|
42
|
+
snapshots.set(mesh2, /* alloc */ {
|
|
40
43
|
world: mesh2._worldMatrixVersion, geometry: mesh2.geometry,
|
|
41
44
|
start: mesh2.geometry.drawRange.start, count: mesh2.geometry.drawRange.count,
|
|
42
45
|
appearance: mesh2._appearance ?? 1,
|
|
43
46
|
});
|
|
44
47
|
}
|
|
45
|
-
sun.cache = { direction: [...sunlight.direction], meshes: snapshots };
|
|
48
|
+
sun.cache = /* alloc */ { direction: /* alloc */ [...sunlight.direction], meshes: snapshots };
|
|
46
49
|
}
|
|
@@ -1,15 +1,22 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
|
|
2
|
+
|
|
3
|
+
import { shadowTexture } from '../globals/shadowTexture.js';
|
|
3
4
|
|
|
4
5
|
|
|
5
|
-
|
|
6
|
-
|
|
6
|
+
import { bindSunlight } from './bindSunlight.js';
|
|
7
|
+
import { destroyTexture } from '../textures/destroyTexture.js';
|
|
8
|
+
|
|
9
|
+
export function resizeSunlight(layer, size) {
|
|
10
|
+
const device = rendererByLayer.get(layer).device, sun = rendererByLayer.get(layer).sunlight;
|
|
7
11
|
if (sun.size === size) return;
|
|
8
|
-
if (sun.texture) destroyTexture(
|
|
12
|
+
if (sun.texture) destroyTexture(layer, sun.texture);
|
|
9
13
|
sun.size = size;
|
|
10
|
-
sun.texture = device.createTexture(
|
|
11
|
-
size
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
14
|
+
sun.texture = device.createTexture((
|
|
15
|
+
shadowTexture.size[0] = size,
|
|
16
|
+
shadowTexture.size[1] = size,
|
|
17
|
+
shadowTexture.usage = GPUTextureUsage.RENDER_ATTACHMENT | GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_SRC,
|
|
18
|
+
shadowTexture
|
|
19
|
+
));
|
|
20
|
+
|
|
21
|
+
bindSunlight(layer);
|
|
15
22
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export function shadowCacheMatches(sun, meshes, sunlight) {
|
|
2
2
|
const cache = sun.cache;
|
|
3
3
|
let unchanged = sun.enabled && cache?.meshes.size === meshes.length;
|
|
4
|
-
let i, mesh
|
|
4
|
+
let i, mesh;
|
|
5
5
|
if (unchanged) {
|
|
6
6
|
for (i = 0; i < sunlight.direction.length; i++) {
|
|
7
7
|
if (sunlight.direction[i] !== cache.direction[i]) { unchanged = false; break; }
|
|
@@ -9,15 +9,9 @@ export function shadowCacheMatches(sun, meshes, sunlight) {
|
|
|
9
9
|
}
|
|
10
10
|
if (unchanged) {
|
|
11
11
|
for (mesh of meshes) {
|
|
12
|
-
|
|
13
|
-
if (!(previous && previous.world === mesh._worldMatrixVersion && previous.geometry === mesh.geometry &&
|
|
14
|
-
previous.start === range.start && previous.count === range.count &&
|
|
15
|
-
previous.appearance === (mesh._appearance ?? 1))) { unchanged = false; break; }
|
|
16
|
-
for (attribute of Object.values(mesh.geometry.attributes)) {
|
|
17
|
-
if (attribute.needsUpdate) { unchanged = false; break; }
|
|
18
|
-
}
|
|
19
|
-
if (!unchanged) break;
|
|
12
|
+
if (!shadowMeshMatches(cache, mesh)) { unchanged = false; break; }
|
|
20
13
|
}
|
|
21
14
|
}
|
|
22
15
|
return unchanged;
|
|
23
16
|
}
|
|
17
|
+
import { shadowMeshMatches } from './shadowMeshMatches.js';
|