leaflet-city-mapper 0.0.3 → 0.0.4
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 +22 -26
- package/cucumber.mjs +1 -1
- package/dist/leaflet-city-mapper-src.js +15326 -0
- package/dist/leaflet-city-mapper-src.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 +4 -3
- package/src/archives/decodeDirectory.js +43 -25
- 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 +18 -0
- package/src/archives/getHeader.js +7 -3
- package/src/archives/getTileData.js +13 -0
- package/src/archives/getZxy.js +7 -63
- package/src/archives/loadSource.js +24 -10
- package/src/archives/read.js +12 -9
- package/src/archives/tileId.js +7 -3
- package/src/archives/varint.js +7 -3
- package/src/camera/angles.js +12 -4
- package/src/camera/animationPoint.js +4 -1
- package/src/camera/cameraMapReady.js +4 -1
- package/src/camera/cancelCameraAnimation.js +11 -7
- package/src/camera/cleanupCameraMap.js +7 -4
- package/src/camera/fitCameraBounds.js +33 -23
- package/src/camera/getBearing.js +5 -0
- package/src/camera/getPitch.js +5 -0
- package/src/camera/groundBounds.js +13 -6
- package/src/camera/initializeCameraMap.js +8 -3
- package/src/camera/mapAnimateCamera.js +20 -13
- package/src/camera/mapCamera.js +22 -42
- package/src/camera/mapContainerPointToLayerPoint.js +4 -2
- package/src/camera/mapGetBearing.js +4 -1
- package/src/camera/mapGetBounds.js +12 -6
- package/src/camera/mapGetBoundsCenterZoom.js +6 -3
- package/src/camera/mapGetBoundsZoom.js +17 -7
- package/src/camera/mapGetCenterLayerPoint.js +3 -2
- package/src/camera/mapGetPitch.js +4 -1
- package/src/camera/mapLayerPointToContainerPoint.js +3 -2
- package/src/camera/mapLimitCenter.js +12 -7
- package/src/camera/mapLimitOffset.js +6 -2
- package/src/camera/mapPanBy.js +3 -2
- package/src/camera/mapPanInside.js +16 -10
- 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 +19 -11
- package/src/camera/mapSetZoomAround.js +12 -8
- package/src/camera/mapStopPitchBearingAnimation.js +3 -3
- package/src/camera/mapTryAnimatedPan.js +3 -2
- package/src/camera/mapUpdateCameraOverlays.js +3 -2
- package/src/camera/pointOf.js +4 -2
- package/src/camera/project.js +23 -16
- package/src/camera/runCameraAnimations.js +15 -12
- package/src/camera/scheduleCameraAnimation.js +9 -4
- package/src/camera/updateSky.js +20 -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 +13 -20
- package/src/collision/hiddenLightHit.js +8 -0
- package/src/collision/indexTriangle.js +11 -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/transformTriangle.js +9 -0
- package/src/collision/triangleDistance.js +21 -0
- package/src/collision/worldHit.js +18 -0
- package/src/controls/addCameraHandler.js +9 -0
- package/src/controls/adjustCameraDrag.js +7 -2
- package/src/controls/cameraControls.js +53 -22
- package/src/controls/cameraDragClick.js +3 -2
- package/src/controls/cameraDragContextMenu.js +3 -2
- package/src/controls/cameraDragDown.js +20 -17
- package/src/controls/cameraDragEnd.js +3 -2
- package/src/controls/cameraDragMove.js +11 -6
- package/src/controls/changeCameraTouch.js +5 -2
- package/src/controls/cleanupCameraTouch.js +21 -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 +16 -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 +3 -1
- package/src/controls/startCameraTouch.js +32 -22
- package/src/core/addImageState.js +6 -5
- package/src/core/addRasterImage.js +4 -2
- package/src/core/adjustCameraMarkerPan.js +24 -18
- package/src/core/beforeNativeRender.js +1 -1
- package/src/core/boundsQuad.js +7 -6
- package/src/core/bringNativeLayerToBack.js +6 -1
- package/src/core/bringNativeLayerToFront.js +6 -1
- package/src/core/bypassNativeEvent.js +11 -0
- package/src/core/cameraCircleBounds.js +3 -2
- package/src/core/cameraMarkerDrag.js +16 -13
- package/src/core/cameraMarkerOnDrag.js +7 -2
- package/src/core/cancelGridFade.js +10 -6
- package/src/core/closestCameraLayerPoint.js +3 -2
- package/src/core/current.js +4 -1
- package/src/core/disposeNativeLayer.js +6 -2
- package/src/core/fireRasterLoad.js +3 -2
- package/src/core/forwardNativeError.js +2 -2
- package/src/core/gridlayerGetEvents.js +7 -4
- package/src/core/gridlayerGetTiledPixelBounds.js +8 -4
- package/src/core/handleNativeMapEvent.js +16 -36
- package/src/core/hideTargets.js +6 -4
- package/src/core/initNativeGPU.js +10 -6
- package/src/core/initializeGridContainer.js +3 -2
- package/src/core/initializeNativeLayer.js +16 -18
- package/src/core/layerCallInitHooks.js +14 -0
- package/src/core/localPixelForGeometry.js +3 -2
- package/src/core/localPosition.js +8 -4
- package/src/core/markerCameraIconPoint.js +9 -6
- package/src/core/markerGetEvents.js +6 -2
- package/src/core/markerImageBounds.js +11 -0
- package/src/core/markerInitInteraction.js +4 -2
- package/src/core/markerQuadCorners.js +41 -24
- package/src/core/markerSetIcon.js +5 -2
- package/src/core/markerSetPos.js +10 -5
- package/src/core/markerSetRotation.js +9 -7
- package/src/core/markerUpdateZIndex.js +9 -5
- package/src/core/nativeEventSource.js +18 -0
- package/src/core/nativeEvents.js +8 -3
- package/src/core/nativeImageError.js +8 -3
- package/src/core/nativeImageRefresh.js +6 -2
- package/src/core/nativeLayer.js +24 -21
- package/src/core/nativeLayerMethod.js +8 -3
- package/src/core/popupAdjustPan.js +24 -18
- package/src/core/popupGetEvents.js +5 -2
- package/src/core/popupUpdatePosition.js +5 -2
- package/src/core/pruneNativeResources.js +20 -0
- package/src/core/putNativeMesh.js +11 -8
- package/src/core/quadNativeMesh.js +9 -4
- package/src/core/readyNativeGPU.js +4 -1
- package/src/core/redrawPath.js +6 -0
- package/src/core/refreshNativeLayer.js +11 -6
- package/src/core/refreshNativeLayerContract.js +6 -1
- package/src/core/rejectNativeReady.js +1 -0
- package/src/core/removeImageState.js +4 -3
- package/src/core/removeLayer.js +22 -0
- package/src/core/removeNativeEvents.js +2 -1
- package/src/core/removeTargets.js +6 -2
- package/src/core/reorderNativeLayer.js +4 -1
- package/src/core/resolveNativeReady.js +1 -0
- package/src/core/runGridFades.js +11 -6
- package/src/core/runMarkerPanFrame.js +6 -4
- package/src/core/scheduleGridFade.js +10 -5
- package/src/core/scheduleMarkerPan.js +7 -4
- package/src/core/setRotation.js +5 -0
- package/src/core/styleNativeMesh.js +5 -1
- package/src/core/syncGridLayer.js +10 -3
- package/src/core/syncMarker.js +4 -2
- package/src/core/syncVectorLayer.js +12 -9
- package/src/core/synchronizeNativeLayer.js +8 -17
- package/src/core/textureFor.js +41 -43
- package/src/core/tooltipGetEvents.js +5 -2
- package/src/core/tooltipSetPosition.js +5 -2
- package/src/core/transformNativePoint.js +7 -0
- package/src/core/updateGridOpacity.js +7 -3
- package/src/core/updateNativeHover.js +7 -0
- package/src/core/updateNativeLayerView.js +4 -1
- package/src/core/uploadCanvasTexture.js +18 -15
- package/src/core/uploadNativeImage.js +13 -0
- package/src/geometry/addBridges.js +29 -88
- package/src/geometry/below.js +1 -1
- 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/bridgeLocal.js +3 -2
- package/src/geometry/bridgePaths.js +11 -0
- package/src/geometry/bridgePolygon.js +31 -0
- package/src/geometry/bridgeSides.js +11 -0
- package/src/geometry/build.js +10 -6
- 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 +9 -4
- package/src/geometry/conformModelToTerrain.js +17 -12
- package/src/geometry/cross.js +5 -1
- package/src/geometry/dashValues.js +14 -0
- package/src/geometry/dashedSegment.js +16 -0
- package/src/geometry/diskAt.js +4 -2
- package/src/geometry/emitter.js +2 -2
- package/src/geometry/indexBridge.js +29 -0
- package/src/geometry/lampPostGeometry.js +12 -6
- package/src/geometry/lampRing.js +9 -6
- package/src/geometry/lightGeometry.js +2 -2
- package/src/geometry/line.js +21 -54
- package/src/geometry/lineJoin.js +26 -0
- package/src/geometry/nativeGeometry.js +10 -44
- package/src/geometry/polygon.js +4 -3
- package/src/geometry/quad.js +8 -3
- package/src/geometry/roofCoverage.js +23 -52
- package/src/geometry/roofFootprint.js +29 -0
- package/src/geometry/segment.js +2 -1
- package/src/geometry/setVertexColor.js +3 -1
- package/src/geometry/sub.js +2 -2
- package/src/geometry/subtractRoofTile.js +19 -0
- package/src/geometry/surface.js +2 -1
- package/src/geometry/treeGeometry.js +5 -6
- package/src/geometry/treeRing.js +9 -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 +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/boundsMethods.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/cameraByMap.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/closestMethods.js +1 -0
- package/src/globals/cogTags.js +1 -0
- package/src/{constants → globals}/colliders.js +0 -1
- 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/dragByHandler.js +1 -0
- package/src/globals/dragStates.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/gridEvents.js +1 -0
- package/src/globals/gridFadeFrame.js +1 -0
- package/src/globals/gridInitializers.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/imageStates.js +1 -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/nativeRenderByLayer.js +1 -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/rendererDevices.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/sceneByLayer.js +1 -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/sunByMap.js +1 -0
- package/src/globals/sunlightByControl.js +1 -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/touchByContainer.js +1 -0
- package/src/globals/trafficByLayer.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/walkByMap.js +1 -0
- package/src/globals/wantedTiles.js +1 -0
- package/src/index.js +27 -25
- package/src/lighting/cacheLightGrid.js +14 -5
- package/src/lighting/collectLightMeshes.js +4 -1
- package/src/lighting/lightGrid.js +9 -8
- package/src/lighting/updatePointLights.js +11 -7
- package/src/lighting/visitCells.js +4 -11
- package/src/lighting/visitLightCells.js +13 -0
- package/src/lighting/worldLights.js +10 -12
- package/src/lighting/writeLightCell.js +5 -0
- package/src/models/applyModelTransform.js +13 -0
- package/src/models/buildModelNodes.js +14 -0
- package/src/models/createModelContext.js +15 -0
- package/src/models/createModelGeometry.js +40 -0
- package/src/models/decodeModel.js +9 -6
- package/src/models/loadBuffer.js +2 -2
- package/src/models/loadImage.js +9 -5
- package/src/models/loadModel.js +24 -49
- package/src/models/loadModelResources.js +19 -0
- package/src/models/materialFor.js +9 -9
- package/src/models/modelNode.js +25 -69
- package/src/models/nodeMatrix.js +8 -3
- 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/models/textureFor.js +9 -6
- package/src/models/textureSampler.js +5 -5
- package/src/picking/findFeature.js +12 -9
- package/src/picking/hit.js +11 -10
- package/src/picking/hitColliderCell.js +19 -0
- package/src/picking/hitMesh.js +12 -16
- package/src/picking/onClick.js +5 -2
- package/src/picking/onPointerLeave.js +5 -2
- package/src/picking/onPointerMove.js +8 -5
- package/src/picking/raycast.js +42 -35
- package/src/picking/setHighlight.js +12 -5
- package/src/picking/shouldSkipOther.js +4 -1
- package/src/picking/showFeature.js +13 -10
- package/src/picking/validateCameraInverse.js +8 -0
- package/src/raster/addRasterTile.js +39 -84
- package/src/raster/comparePendingTiles.js +2 -2
- package/src/raster/createGeometry.js +17 -10
- package/src/raster/createRasterMesh.js +71 -42
- package/src/raster/finishAttachment.js +7 -3
- package/src/raster/finishRasterTile.js +54 -40
- package/src/raster/getRasterEvents.js +3 -3
- package/src/raster/getRasterTileSize.js +5 -3
- package/src/raster/initRaster.js +14 -19
- package/src/raster/isLoading.js +4 -2
- package/src/raster/loadRasterTile.js +10 -7
- package/src/raster/onPMTileAdd.js +4 -1
- package/src/raster/onPMTileRemove.js +4 -1
- package/src/raster/pruneRasterTiles.js +15 -12
- package/src/raster/pumpRasterTiles.js +9 -5
- package/src/raster/rasterTileRange.js +23 -0
- package/src/raster/readyRaster.js +13 -10
- package/src/raster/registerTerrainTile.js +12 -9
- package/src/raster/releaseRasterTile.js +15 -12
- package/src/raster/releaseRasterTiles.js +9 -6
- package/src/raster/removeRasterTile.js +6 -3
- package/src/raster/reportError.js +3 -3
- package/src/raster/retainRasterTiles.js +15 -0
- package/src/raster/setRasterOpacity.js +5 -2
- package/src/raster/setRasterTerrain.js +10 -6
- package/src/raster/setRasterZIndex.js +5 -2
- package/src/raster/terrainTileGeometry.js +16 -0
- package/src/raster/updateAttachedTiles.js +5 -2
- package/src/raster/updateRasterTiles.js +29 -37
- package/src/rendering/bindMeshTextures.js +50 -0
- package/src/rendering/collectFrameMeshes.js +17 -10
- package/src/rendering/collectMeshes.js +2 -24
- package/src/rendering/collectRoofTiles.js +15 -0
- package/src/rendering/collectVisibleMesh.js +27 -0
- package/src/rendering/compareMeshDepth.js +6 -0
- package/src/rendering/compareMeshes.js +8 -10
- package/src/rendering/compareRoofTiles.js +4 -4
- package/src/rendering/composeRoofAtlas.js +53 -36
- package/src/rendering/createMesh.js +22 -11
- package/src/rendering/createProgram.js +47 -64
- package/src/rendering/createProgramLayout.js +36 -0
- package/src/rendering/createProgramUniforms.js +17 -0
- package/src/rendering/destroyAfterSubmission.js +8 -8
- package/src/rendering/destroyTexture.js +4 -1
- package/src/rendering/drawGeometry.js +18 -106
- package/src/rendering/drawPipeline.js +34 -0
- package/src/rendering/drawSceneMeshes.js +14 -17
- package/src/rendering/ensureRoofBlit.js +14 -34
- package/src/rendering/prepareFrameBuffer.js +17 -0
- package/src/rendering/prepareFrameMeshes.js +6 -11
- package/src/rendering/prepareFrameUniforms.js +7 -12
- package/src/rendering/prepareMeshCutout.js +12 -0
- package/src/rendering/prepareMeshTextures.js +23 -0
- package/src/rendering/prepareMeshUniforms.js +25 -0
- package/src/rendering/rebuildRoofAtlas.js +41 -56
- package/src/rendering/render.js +25 -13
- package/src/rendering/reportCompilation.js +6 -6
- package/src/rendering/resizeRenderer.js +19 -14
- package/src/rendering/resizeRoofTexture.js +24 -0
- package/src/rendering/revealRoofMesh.js +15 -0
- package/src/rendering/synchronizeZoomView.js +10 -18
- package/src/rendering/textureBinding.js +7 -7
- package/src/rendering/updateMapCamera.js +30 -16
- package/src/rendering/updateRoofAtlas.js +20 -0
- package/src/rendering/updateRoofRaster.js +12 -19
- package/src/rendering/updateZoomCamera.js +18 -0
- package/src/rendering/uploadMeshTexture.js +26 -0
- package/src/rendering/uploadRoofTile.js +23 -0
- package/src/scene/addSceneLayer.js +17 -0
- package/src/scene/attach.js +54 -161
- package/src/scene/attachLayer.js +5 -2
- package/src/scene/callLayer.js +26 -0
- package/src/scene/cancelUpdate.js +6 -3
- package/src/scene/composeLocalTransform.js +16 -0
- package/src/scene/createLayer.js +7 -0
- package/src/scene/createSceneCamera.js +21 -0
- package/src/scene/emptyEvents.js +1 -1
- package/src/scene/emptyNode.js +8 -7
- package/src/scene/endZoom.js +13 -6
- package/src/scene/failAttachment.js +6 -3
- package/src/scene/get3DEvents.js +12 -9
- package/src/scene/getLocation.js +7 -0
- package/src/scene/init3D.js +28 -15
- package/src/scene/initializeLayer.js +11 -5
- package/src/scene/initializeRendererResources.js +35 -0
- package/src/scene/initializeSharedRenderer.js +45 -0
- package/src/scene/initializerFor.js +3 -1
- package/src/scene/isNativeLayer.js +12 -0
- package/src/scene/layerCountTitle.js +4 -0
- package/src/scene/layerInitialize.js +24 -14
- package/src/scene/layerLayerAdd.js +31 -9
- package/src/scene/mountRenderer.js +25 -0
- package/src/scene/onAdd3DLayer.js +16 -12
- package/src/scene/onMapChange.js +8 -6
- package/src/scene/onRemove3DLayer.js +30 -36
- package/src/scene/onZoomAnim.js +8 -6
- package/src/scene/placeEntry.js +3 -1
- package/src/scene/placeEntryElement.js +22 -0
- package/src/scene/ready.js +9 -0
- package/src/scene/ready3D.js +28 -18
- package/src/scene/releaseRenderer.js +1 -1
- package/src/scene/releaseSharedScene.js +25 -0
- package/src/scene/removeEntry.js +2 -0
- package/src/scene/removeLayerEvents.js +9 -0
- package/src/scene/removeSceneLayer.js +15 -0
- package/src/scene/renderLayerCount.js +13 -0
- package/src/scene/renderPendingMapChange.js +8 -4
- package/src/scene/renderPendingUpdates.js +8 -4
- package/src/scene/renderPendingZoomAnimation.js +7 -3
- package/src/scene/rendererDeviceError.js +10 -6
- package/src/scene/rendererDeviceLost.js +10 -7
- package/src/scene/replaceEntry.js +4 -2
- package/src/scene/reportError.js +2 -2
- package/src/scene/requestAdapter.js +1 -1
- package/src/scene/resolveNextInitialization.js +7 -6
- package/src/scene/restoreGeometry.js +23 -0
- package/src/scene/restoreMaterialTextures.js +16 -0
- package/src/scene/restoreObject.js +22 -58
- package/src/scene/runPlacements.js +4 -2
- package/src/scene/startZoom.js +4 -1
- package/src/scene/underEntry.js +2 -3
- package/src/scene/update.js +8 -4
- package/src/scene/updateCamera.js +51 -28
- package/src/scene/updateLayerCount.js +22 -0
- package/src/scene/updateWorldMatrix.js +23 -28
- package/src/scene/worldMatrixChanged.js +18 -0
- package/src/shaders/materialBaseShader.js +17 -0
- package/src/shaders/materialShaders.js +14 -130
- package/src/shaders/materialSurfaceShader.js +47 -0
- package/src/shaders/materialVertexShader.js +72 -0
- package/src/shaders/roofVertexShader.js +9 -0
- package/src/shaders/validateRoofMaterial.js +10 -0
- package/src/shadows/bindSunlight.js +18 -9
- package/src/shadows/drawShadowMeshes.js +24 -14
- package/src/shadows/ensureShadowPipeline.js +46 -35
- package/src/shadows/meshShadowBounds.js +24 -0
- package/src/shadows/renderSunlight.js +10 -8
- package/src/shadows/resizeSunlight.js +12 -6
- package/src/shadows/shadowBounds.js +10 -19
- package/src/shadows/shadowCacheMatches.js +3 -9
- package/src/shadows/shadowMatrix.js +36 -26
- package/src/shadows/shadowMeshMatches.js +11 -0
- package/src/sources/addGeneratedTriangle.js +3 -2
- package/src/sources/attachAreaMesh.js +32 -26
- package/src/sources/buildArea.js +12 -8
- package/src/sources/buildAreaFeature.js +12 -17
- package/src/sources/buildAreaPoint.js +4 -4
- package/src/sources/buildAreaPolygon.js +3 -3
- package/src/sources/compareAreaDistance.js +1 -2
- package/src/sources/extrusionStyle.js +10 -0
- package/src/sources/featureAnchor.js +9 -0
- package/src/sources/generateTreeGeometry.js +5 -3
- package/src/sources/initializeGeoJSON.js +4 -2
- package/src/sources/instanceAreaGeometry.js +9 -7
- package/src/sources/pendingSourceAreas.js +20 -0
- package/src/sources/projectRing.js +17 -10
- package/src/sources/projectedTree.js +16 -10
- package/src/sources/pump.js +16 -26
- package/src/sources/releaseArea.js +5 -2
- package/src/sources/setGeoJSONData.js +5 -2
- package/src/sources/sourceAreaContext.js +16 -6
- package/src/sources/updateArea.js +23 -16
- package/src/sources/updateStatus.js +5 -2
- package/src/sunlight/addTimeLayer.js +4 -1
- package/src/sunlight/addTo.js +1 -0
- package/src/sunlight/atmosphere.js +7 -10
- package/src/sunlight/createSun.js +54 -0
- package/src/sunlight/horizontalPosition.js +8 -8
- package/src/sunlight/initSunlight.js +3 -0
- package/src/sunlight/initialize.js +7 -4
- package/src/sunlight/mix.js +4 -3
- package/src/sunlight/moonPosition.js +10 -9
- package/src/sunlight/onAddSun.js +27 -66
- package/src/sunlight/onRemoveSun.js +10 -0
- package/src/sunlight/projectCelestialBody.js +5 -5
- package/src/sunlight/remove.js +1 -0
- package/src/sunlight/removeSun.js +9 -3
- package/src/sunlight/removeTimeLayer.js +5 -1
- package/src/sunlight/render.js +4 -2
- package/src/sunlight/rgb.js +6 -4
- package/src/sunlight/solarPosition.js +10 -9
- package/src/sunlight/solarTime.js +11 -0
- package/src/sunlight/styleTimeControl.js +3 -3
- package/src/sunlight/updateCelestialDisc.js +12 -0
- package/src/sunlight/updateSky.js +12 -15
- package/src/sunlight/updateSun.js +10 -4
- package/src/sunlight/useSelectedTime.js +7 -4
- package/src/terrain/applyTerrain.js +21 -0
- package/src/terrain/clearLayerTerrain.js +8 -5
- package/src/terrain/copyTerrainTile.js +12 -0
- package/src/terrain/getElevation.js +7 -3
- package/src/terrain/initTerrain.js +12 -9
- package/src/terrain/loadTerrain.js +25 -45
- package/src/terrain/loadTerrainTiles.js +7 -3
- package/src/terrain/onTerrainAdd.js +10 -6
- package/src/terrain/onTerrainChange.js +5 -2
- package/src/terrain/onTerrainRemove.js +22 -18
- package/src/terrain/rasterProgram.js +51 -0
- package/src/terrain/readBridges.js +1 -1
- package/src/terrain/setLayerTerrain.js +8 -5
- package/src/terrain/setTerrainHeight.js +9 -5
- package/src/terrain/terrainAtlas.js +7 -13
- package/src/terrain/terrainBuffers.js +27 -0
- package/src/terrain/terrainElevation.js +5 -10
- package/src/terrain/terrainGrid.js +19 -11
- package/src/terrain/terrainTileQueue.js +25 -0
- package/src/traffic/addTraffic.js +6 -3
- package/src/traffic/along.js +8 -2
- package/src/traffic/appendRouteDash.js +15 -0
- package/src/traffic/appendRouteSegment.js +15 -0
- package/src/traffic/destroyTrafficGpu.js +4 -2
- package/src/traffic/disposeTrafficObject.js +5 -2
- package/src/traffic/drawTrafficRoute.js +5 -2
- package/src/traffic/failTraffic.js +2 -2
- package/src/traffic/fetchTrafficLanes.js +4 -4
- package/src/traffic/groundTraffic.js +5 -1
- package/src/traffic/initTraffic.js +60 -48
- package/src/traffic/loadTraffic.js +9 -9
- package/src/traffic/locateTraffic.js +7 -5
- package/src/traffic/moveTraffic.js +2 -2
- package/src/traffic/prepareTraffic.js +11 -6
- package/src/traffic/rebaseTraffic.js +32 -30
- package/src/traffic/rebuildTrafficMesh.js +9 -5
- package/src/traffic/refreshTrafficTrips.js +32 -0
- package/src/traffic/removeTraffic.js +16 -13
- package/src/traffic/routeColor.js +3 -3
- package/src/traffic/routeGeometry.js +11 -21
- package/src/traffic/scheduledTrips.js +22 -11
- package/src/traffic/tickTraffic.js +9 -40
- package/src/traffic/toLanes.js +16 -8
- package/src/traffic/tooltip.js +4 -6
- package/src/traffic/trafficBounds.js +6 -2
- package/src/traffic/trafficNow.js +9 -3
- package/src/traffic/trafficStatusText.js +5 -0
- package/src/traffic/trafficStorage.js +2 -2
- package/src/traffic/tripsAt.js +4 -4
- package/src/traffic/updateTraffic.js +4 -1
- package/src/traffic/updateTrafficLights.js +16 -0
- package/src/traffic/updateTrafficPose.js +8 -0
- package/src/traffic/uploadTrafficLanes.js +21 -0
- package/src/traffic/vehicleOffsets.js +3 -2
- 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/utils/parseColor.js +4 -4
- package/src/vehicles/bicycleModel.js +21 -20
- package/src/vehicles/boatBenches.js +3 -2
- package/src/vehicles/boatModel.js +25 -17
- package/src/vehicles/carModel.js +26 -10
- package/src/vehicles/carriage.js +17 -16
- package/src/vehicles/metroModel.js +1 -1
- package/src/vehicles/mirror.js +3 -3
- package/src/vehicles/pedestrianModel.js +15 -14
- package/src/vehicles/tramModel.js +1 -1
- package/src/walk/blocked.js +4 -4
- package/src/walk/createWalk.js +66 -60
- package/src/walk/initWalk.js +1 -0
- package/src/walk/initialize.js +1 -0
- package/src/walk/land.js +32 -0
- package/src/walk/local.js +15 -7
- package/src/walk/moveWalker.js +23 -0
- package/src/walk/onAdd.js +25 -0
- package/src/walk/onKey.js +12 -9
- package/src/walk/onPointer.js +17 -12
- package/src/walk/onRemove.js +9 -1
- package/src/walk/place.js +4 -2
- package/src/walk/start.js +19 -10
- package/src/walk/step.js +21 -29
- package/src/walk/stepWalkerHeight.js +11 -0
- package/src/walk/stop.js +7 -4
- package/src/walk/updateWalkerView.js +22 -0
- 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/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/{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}/nativeEventMaps.js +0 -0
- /package/src/{constants → globals}/nativeMethodHandlers.js +0 -0
- /package/src/{constants → globals}/paints.js +0 -0
- /package/src/{constants → globals}/pendingUpdates.js +0 -0
- /package/src/{constants → globals}/renderers.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
|
@@ -1,52 +1,69 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { roofBuffer } from '../globals/roofBuffer.js';
|
|
2
|
+
import { roofPass } from '../globals/roofPass.js';
|
|
3
|
+
import { uploadRoofTile } from './uploadRoofTile.js';
|
|
4
|
+
import { roofBindGroup } from '../globals/roofBindGroup.js';
|
|
5
|
+
import { roofCommands } from '../globals/roofCommands.js';
|
|
6
|
+
import { sceneByLayer } from '../globals/sceneByLayer.js';
|
|
7
|
+
import { roofOpacities } from '../globals/roofOpacities.js';
|
|
8
|
+
import { TILE_SIZE } from '../globals/TILE_SIZE.js';
|
|
9
|
+
|
|
10
|
+
|
|
2
11
|
import { compareRoofTiles } from './compareRoofTiles.js';
|
|
3
12
|
|
|
4
13
|
export function composeRoofAtlas(backend, tiles, zoom, min, size, width, height) {
|
|
5
|
-
const renderer = backend.renderer, device = renderer.device, map = backend._map;
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
14
|
+
const renderer = sceneByLayer.get(backend).renderer, device = renderer.device, map = backend._map;
|
|
15
|
+
const opacityLength = Math.max(1, tiles.length) * 64;
|
|
16
|
+
if (roofOpacities.value.length < opacityLength) {
|
|
17
|
+
roofOpacities.value = /* alloc */ new Float32Array(opacityLength);
|
|
18
|
+
}
|
|
19
|
+
const opacities = roofOpacities.value;
|
|
20
|
+
const opacityBuffer = device.createBuffer((
|
|
21
|
+
roofBuffer.size = opacities.byteLength,
|
|
22
|
+
roofBuffer.usage = GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST,
|
|
23
|
+
roofBuffer
|
|
24
|
+
));
|
|
25
|
+
|
|
11
26
|
const encoder = device.createCommandEncoder();
|
|
12
|
-
const atlasPass = encoder.beginRenderPass(
|
|
13
|
-
colorAttachments
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
storeOp: 'store',
|
|
18
|
-
}],
|
|
19
|
-
});
|
|
27
|
+
const atlasPass = encoder.beginRenderPass((
|
|
28
|
+
roofPass.colorAttachments[0].view = sceneByLayer.get(backend)._roofRaster.texture.texture.createView(),
|
|
29
|
+
roofPass
|
|
30
|
+
));
|
|
31
|
+
roofPass.colorAttachments[0].view = null;
|
|
20
32
|
atlasPass.setPipeline(renderer.roofBlit.pipeline);
|
|
21
33
|
tiles.sort(compareRoofTiles);
|
|
22
|
-
let i, tile, layer, coords,
|
|
34
|
+
let i, tile, layer, coords, source, tileSize, x, y;
|
|
23
35
|
for ([i, { tile, layer }] of tiles.entries()) {
|
|
24
|
-
({ coords
|
|
36
|
+
({ coords } = tile);
|
|
25
37
|
source = tile.texture;
|
|
26
|
-
|
|
27
|
-
device.queue.copyExternalImageToTexture({ source: image }, { texture: source.texture },
|
|
28
|
-
[source.texture.width, source.texture.height]);
|
|
29
|
-
source.uploaded = source.image;
|
|
30
|
-
}
|
|
38
|
+
uploadRoofTile(device, tile);
|
|
31
39
|
|
|
32
40
|
opacities[i * 64] = layer.options.opacity;
|
|
33
|
-
tileSize =
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
atlasPass.setViewport(x, y, Math.min(tileSize
|
|
37
|
-
Math.min(tileSize
|
|
38
|
-
atlasPass.setBindGroup(0, device.createBindGroup(
|
|
39
|
-
layout
|
|
40
|
-
entries
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
41
|
+
tileSize = TILE_SIZE * map.getZoomScale(zoom, coords.z);
|
|
42
|
+
x = (coords.x * tileSize - min.x) * width / size.x;
|
|
43
|
+
y = (coords.y * tileSize - min.y) * height / size.y;
|
|
44
|
+
atlasPass.setViewport(x, y, Math.min(tileSize * width / size.x, width - x),
|
|
45
|
+
Math.min(tileSize * height / size.y, height - y), 0, 1);
|
|
46
|
+
atlasPass.setBindGroup(0, device.createBindGroup((
|
|
47
|
+
roofBindGroup.layout = renderer.roofBlit.pipeline.getBindGroupLayout(0),
|
|
48
|
+
roofBindGroup.entries[0].resource = source.texture.createView(),
|
|
49
|
+
roofBindGroup.entries[1].resource = renderer.roofBlit.sampler,
|
|
50
|
+
roofBindGroup.entries[2].resource.buffer = opacityBuffer,
|
|
51
|
+
roofBindGroup.entries[2].resource.offset = i * 256,
|
|
52
|
+
roofBindGroup
|
|
53
|
+
)));
|
|
54
|
+
roofBindGroup.layout = null;
|
|
55
|
+
roofBindGroup.entries[0].resource = null;
|
|
56
|
+
roofBindGroup.entries[1].resource = null;
|
|
57
|
+
roofBindGroup.entries[2].resource.buffer = null;
|
|
58
|
+
|
|
46
59
|
atlasPass.draw(4);
|
|
47
60
|
}
|
|
48
61
|
atlasPass.end();
|
|
49
62
|
device.queue.writeBuffer(opacityBuffer, 0, opacities);
|
|
50
|
-
device.queue.submit(
|
|
63
|
+
device.queue.submit((
|
|
64
|
+
roofCommands[0] = encoder.finish(),
|
|
65
|
+
roofCommands
|
|
66
|
+
));
|
|
67
|
+
roofCommands[0] = null;
|
|
51
68
|
opacityBuffer.destroy();
|
|
52
69
|
}
|
|
@@ -1,4 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { defaultMaterial } from '../globals/defaultMaterial.js';
|
|
2
|
+
import { meshBuffer } from '../globals/meshBuffer.js';
|
|
3
|
+
import { sceneByLayer } from '../globals/sceneByLayer.js';
|
|
4
|
+
import { nextId } from '../globals/nextId.js';
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
|
|
2
8
|
import { emptyNode } from '../scene/emptyNode.js';
|
|
3
9
|
import { createProgram } from './createProgram.js';
|
|
4
10
|
import { setParent } from '../scene/setParent.js';
|
|
@@ -10,24 +16,29 @@ import { update } from '../scene/update.js';
|
|
|
10
16
|
* A supplied `program` shares compiled shaders and pipelines across compatible meshes.
|
|
11
17
|
*/
|
|
12
18
|
|
|
13
|
-
export function createMesh(backend, data, material =
|
|
14
|
-
const { device } = backend.renderer, attributes = {};
|
|
19
|
+
export function createMesh(backend, data, material = defaultMaterial, usage = 0, program) {
|
|
20
|
+
const { device } = sceneByLayer.get(backend).renderer, attributes = /* alloc */ {};
|
|
15
21
|
let name, values, array, size, buffer;
|
|
16
22
|
for ([name, values] of Object.entries(data)) {
|
|
17
|
-
array = new Float32Array(values);
|
|
23
|
+
array = /* alloc */ new Float32Array(values);
|
|
18
24
|
size = name === 'uv' ? 2 : 3;
|
|
19
|
-
buffer = device.createBuffer(
|
|
25
|
+
buffer = device.createBuffer((
|
|
26
|
+
meshBuffer.size = Math.max(4, array.byteLength),
|
|
27
|
+
meshBuffer.usage = GPUBufferUsage.VERTEX | GPUBufferUsage.COPY_DST | usage,
|
|
28
|
+
meshBuffer
|
|
29
|
+
));
|
|
30
|
+
|
|
20
31
|
device.queue.writeBuffer(buffer, 0, array);
|
|
21
|
-
attributes[name] = { size, data: array, count: array.length / size, buffer };
|
|
32
|
+
attributes[name] = /* alloc */ { size, data: array, count: array.length / size, buffer };
|
|
22
33
|
}
|
|
23
|
-
const mesh = {
|
|
34
|
+
const mesh = /* alloc */ {
|
|
24
35
|
...emptyNode(),
|
|
25
36
|
device,
|
|
26
|
-
geometry: { device, attributes, drawRange: { start: 0, count: attributes.position.count } },
|
|
27
|
-
program: program || createProgram(backend, { vertexColors: true, doubleSided: true, ...material }),
|
|
28
|
-
id:
|
|
37
|
+
geometry: /* alloc */ { device, attributes, drawRange: /* alloc */ { start: 0, count: attributes.position.count } },
|
|
38
|
+
program: program || createProgram(backend, /* alloc */ { vertexColors: true, doubleSided: true, ...material }),
|
|
39
|
+
id: nextId.value++, renderOrder: 0, extras: /* alloc */ {},
|
|
29
40
|
};
|
|
30
|
-
setParent(mesh, backend.root);
|
|
41
|
+
setParent(mesh, sceneByLayer.get(backend).root);
|
|
31
42
|
update(backend);
|
|
32
43
|
return mesh;
|
|
33
44
|
}
|
|
@@ -1,71 +1,67 @@
|
|
|
1
|
+
import { defaultMaterial } from '../globals/defaultMaterial.js';
|
|
2
|
+
import { vertexShader } from '../globals/vertexShader.js';
|
|
3
|
+
import { fragmentShader } from '../globals/fragmentShader.js';
|
|
4
|
+
import { pipelineLayout as sharedPipelineLayout } from '../globals/pipelineLayout.js';
|
|
5
|
+
import { elevationWGSL } from '../globals/elevationWGSL.js';
|
|
6
|
+
import { sceneByLayer } from '../globals/sceneByLayer.js';
|
|
7
|
+
import { positionLayout } from '../globals/positionLayout.js';
|
|
8
|
+
import { normalLayout } from '../globals/normalLayout.js';
|
|
9
|
+
import { colorLayout } from '../globals/colorLayout.js';
|
|
10
|
+
import { uVLayout } from '../globals/uVLayout.js';
|
|
11
|
+
import { instanceLayout } from '../globals/instanceLayout.js';
|
|
12
|
+
import { createProgramLayout } from './createProgramLayout.js';
|
|
13
|
+
import { createProgramUniforms } from './createProgramUniforms.js';
|
|
14
|
+
|
|
15
|
+
|
|
1
16
|
import { materialShaders } from '../shaders/materialShaders.js';
|
|
2
|
-
import { elevationWGSL } from '../constants/elevationWGSL.js';
|
|
3
|
-
import { reportCompilation } from './reportCompilation.js';
|
|
4
17
|
|
|
18
|
+
import { reportCompilation } from './reportCompilation.js';
|
|
5
19
|
|
|
6
|
-
export function createProgram(backend, material =
|
|
20
|
+
export function createProgram(backend, material = defaultMaterial) {
|
|
7
21
|
const shaders = materialShaders(
|
|
8
22
|
material,
|
|
9
23
|
!!backend.options.nightSparkle,
|
|
10
24
|
material.terrain ? elevationWGSL : ''
|
|
11
25
|
);
|
|
12
|
-
const vertex = backend.renderer.device.createShaderModule(
|
|
13
|
-
|
|
14
|
-
|
|
26
|
+
const vertex = sceneByLayer.get(backend).renderer.device.createShaderModule((
|
|
27
|
+
vertexShader.code = shaders.vertex,
|
|
28
|
+
vertexShader
|
|
29
|
+
));
|
|
30
|
+
vertexShader.code = null;
|
|
31
|
+
const fragment = sceneByLayer.get(backend).renderer.device.createShaderModule((
|
|
32
|
+
fragmentShader.code = shaders.fragment,
|
|
33
|
+
fragmentShader
|
|
34
|
+
));
|
|
35
|
+
fragmentShader.code = null;
|
|
36
|
+
reportCompilation(backend, /* alloc */ [
|
|
15
37
|
vertex.getCompilationInfo(),
|
|
16
38
|
fragment.getCompilationInfo()
|
|
17
39
|
]);
|
|
18
|
-
const vertexBuffers = [
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
material.vertexColors ?
|
|
22
|
-
shaders.textured ?
|
|
40
|
+
const vertexBuffers = /* alloc */ [
|
|
41
|
+
positionLayout,
|
|
42
|
+
normalLayout,
|
|
43
|
+
material.vertexColors ? colorLayout : null,
|
|
44
|
+
shaders.textured ? uVLayout : null,
|
|
23
45
|
];
|
|
24
|
-
if (material.instanced) vertexBuffers.push(
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
}];
|
|
37
|
-
if (shaders.hasTerrain) {
|
|
38
|
-
bindGroupEntries.push({
|
|
39
|
-
binding: 2,
|
|
40
|
-
visibility: GPUShaderStage.VERTEX,
|
|
41
|
-
texture: { sampleType: 'unfilterable-float', viewDimension: '2d' },
|
|
42
|
-
});
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
let texture;
|
|
46
|
-
for (texture of shaders.bindings) {
|
|
47
|
-
bindGroupEntries.push({
|
|
48
|
-
binding: texture.texture,
|
|
49
|
-
visibility: GPUShaderStage.FRAGMENT,
|
|
50
|
-
texture: { sampleType: 'float', viewDimension: '2d' },
|
|
51
|
-
});
|
|
52
|
-
bindGroupEntries.push({
|
|
53
|
-
binding: texture.sampler,
|
|
54
|
-
visibility: GPUShaderStage.FRAGMENT,
|
|
55
|
-
sampler: { type: 'filtering' },
|
|
56
|
-
});
|
|
57
|
-
}
|
|
58
|
-
const bindGroupLayout = backend.renderer.device.createBindGroupLayout({ entries: bindGroupEntries });
|
|
59
|
-
const pipelineLayout = backend.renderer.device.createPipelineLayout({ bindGroupLayouts: [bindGroupLayout, backend.renderer.sunlight.layout] });
|
|
60
|
-
return {
|
|
61
|
-
device: backend.renderer.device,
|
|
46
|
+
if (material.instanced) vertexBuffers.push(instanceLayout);
|
|
47
|
+
const bindGroupLayout = createProgramLayout(sceneByLayer.get(backend).renderer.device, shaders);
|
|
48
|
+
const pipelineLayout = sceneByLayer.get(backend).renderer.device.createPipelineLayout((
|
|
49
|
+
sharedPipelineLayout.bindGroupLayouts[0] = bindGroupLayout,
|
|
50
|
+
sharedPipelineLayout.bindGroupLayouts[1] = sceneByLayer.get(backend).renderer.sunlight.layout,
|
|
51
|
+
sharedPipelineLayout
|
|
52
|
+
));
|
|
53
|
+
sharedPipelineLayout.bindGroupLayouts[0] = null;
|
|
54
|
+
sharedPipelineLayout.bindGroupLayouts[1] = null;
|
|
55
|
+
const uniforms = createProgramUniforms(material);
|
|
56
|
+
return /* alloc */ {
|
|
57
|
+
device: sceneByLayer.get(backend).renderer.device,
|
|
62
58
|
vertex,
|
|
63
59
|
fragment,
|
|
64
60
|
bindings: shaders.bindings,
|
|
65
61
|
vertexBuffers,
|
|
66
62
|
bindGroupLayout,
|
|
67
63
|
pipelineLayout,
|
|
68
|
-
pipelineCache: new Map(),
|
|
64
|
+
pipelineCache: /* alloc */ new Map(),
|
|
69
65
|
cullMode: material.doubleSided ? 'none' : 'back',
|
|
70
66
|
transparent: material.alphaMode === 'BLEND',
|
|
71
67
|
depthWrite: material.depthWrite ?? material.alphaMode !== 'BLEND',
|
|
@@ -73,20 +69,7 @@ export function createProgram(backend, material = {}) {
|
|
|
73
69
|
terrain: material.terrain,
|
|
74
70
|
nightLight: Boolean(material.nightLight),
|
|
75
71
|
nightSparkle: !!backend.options.nightSparkle,
|
|
76
|
-
uniforms
|
|
77
|
-
baseColor: { value: material.color || [1, 1, 1] },
|
|
78
|
-
metallic: { value: material.metallic ?? 0 },
|
|
79
|
-
roughness: { value: material.roughness ?? 0.85 },
|
|
80
|
-
opacity: { value: material.opacity ?? 1 },
|
|
81
|
-
alphaCutoff: { value: material.alphaCutoff ?? 0.5 },
|
|
82
|
-
occlusionStrength: { value: material.occlusionStrength ?? 1 },
|
|
83
|
-
emissive: { value: material.emissive || [0, 0, 0] },
|
|
84
|
-
...(material.baseTexture ? { baseTexture: { value: material.baseTexture } } : {}),
|
|
85
|
-
...(material.metalTexture ? { metalTexture: { value: material.metalTexture } } : {}),
|
|
86
|
-
...(material.emissiveTexture ? { emissiveTexture: { value: material.emissiveTexture } } : {}),
|
|
87
|
-
...(material.occlusionTexture ? { occlusionTexture: { value: material.occlusionTexture } } : {}),
|
|
88
|
-
...(material.roofTexture ? { roofTexture: { value: null } } : {}),
|
|
89
|
-
},
|
|
72
|
+
uniforms,
|
|
90
73
|
_layerMaterial: material,
|
|
91
74
|
};
|
|
92
75
|
}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { programLayout } from '../globals/programLayout.js';
|
|
2
|
+
import { programEntries } from '../globals/programEntries.js';
|
|
3
|
+
import { meshLayoutEntry } from '../globals/meshLayoutEntry.js';
|
|
4
|
+
import { frameLayoutEntry } from '../globals/frameLayoutEntry.js';
|
|
5
|
+
import { terrainLayoutEntry } from '../globals/terrainLayoutEntry.js';
|
|
6
|
+
import { textureLayoutEntries } from '../globals/textureLayoutEntries.js';
|
|
7
|
+
import { samplerLayoutEntries } from '../globals/samplerLayoutEntries.js';
|
|
8
|
+
|
|
9
|
+
export function createProgramLayout(device, shaders) {
|
|
10
|
+
const bindGroupEntries = programEntries;
|
|
11
|
+
bindGroupEntries.length = 0;
|
|
12
|
+
meshLayoutEntry.visibility = GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT;
|
|
13
|
+
frameLayoutEntry.visibility = GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT;
|
|
14
|
+
bindGroupEntries.push(meshLayoutEntry, frameLayoutEntry);
|
|
15
|
+
if (shaders.hasTerrain) {
|
|
16
|
+
terrainLayoutEntry.visibility = GPUShaderStage.VERTEX;
|
|
17
|
+
bindGroupEntries.push(terrainLayoutEntry);
|
|
18
|
+
}
|
|
19
|
+
let texture, entry, index = 0;
|
|
20
|
+
for (texture of shaders.bindings) {
|
|
21
|
+
entry = textureLayoutEntries[index];
|
|
22
|
+
entry.binding = texture.texture;
|
|
23
|
+
entry.visibility = GPUShaderStage.FRAGMENT;
|
|
24
|
+
bindGroupEntries.push(entry);
|
|
25
|
+
entry = samplerLayoutEntries[index++];
|
|
26
|
+
entry.binding = texture.sampler;
|
|
27
|
+
entry.visibility = GPUShaderStage.FRAGMENT;
|
|
28
|
+
bindGroupEntries.push(entry);
|
|
29
|
+
}
|
|
30
|
+
const layout = device.createBindGroupLayout((
|
|
31
|
+
programLayout.entries = bindGroupEntries,
|
|
32
|
+
programLayout
|
|
33
|
+
));
|
|
34
|
+
programLayout.entries = null;
|
|
35
|
+
return layout;
|
|
36
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export function createProgramUniforms(material) {
|
|
2
|
+
const uniforms = /* alloc */ {
|
|
3
|
+
baseColor: /* alloc */ { value: material.color || /* alloc */ [1, 1, 1] },
|
|
4
|
+
metallic: /* alloc */ { value: material.metallic ?? 0 },
|
|
5
|
+
roughness: /* alloc */ { value: material.roughness ?? 0.85 },
|
|
6
|
+
opacity: /* alloc */ { value: material.opacity ?? 1 },
|
|
7
|
+
alphaCutoff: /* alloc */ { value: material.alphaCutoff ?? 0.5 },
|
|
8
|
+
occlusionStrength: /* alloc */ { value: material.occlusionStrength ?? 1 },
|
|
9
|
+
emissive: /* alloc */ { value: material.emissive || /* alloc */ [0, 0, 0] },
|
|
10
|
+
};
|
|
11
|
+
if (material.baseTexture) uniforms.baseTexture = /* alloc */ { value: material.baseTexture };
|
|
12
|
+
if (material.metalTexture) uniforms.metalTexture = /* alloc */ { value: material.metalTexture };
|
|
13
|
+
if (material.emissiveTexture) uniforms.emissiveTexture = /* alloc */ { value: material.emissiveTexture };
|
|
14
|
+
if (material.occlusionTexture) uniforms.occlusionTexture = /* alloc */ { value: material.occlusionTexture };
|
|
15
|
+
if (material.roofTexture || material.wallTexture) uniforms.roofTexture = /* alloc */ { value: null };
|
|
16
|
+
return uniforms;
|
|
17
|
+
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
export async function destroyAfterSubmission(layer, texture, submitted) {
|
|
2
|
-
try {
|
|
3
|
-
await submitted;
|
|
4
|
-
} catch (error) {
|
|
5
|
-
layer.fire('error', { error });
|
|
6
|
-
}
|
|
7
|
-
texture.destroy();
|
|
8
|
-
}
|
|
1
|
+
export async function destroyAfterSubmission(layer, texture, submitted) {
|
|
2
|
+
try {
|
|
3
|
+
await submitted;
|
|
4
|
+
} catch (error) {
|
|
5
|
+
layer.fire('error', /* alloc */ { error });
|
|
6
|
+
}
|
|
7
|
+
texture.destroy();
|
|
8
|
+
}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
import { sceneByLayer } from '../globals/sceneByLayer.js';
|
|
2
|
+
|
|
3
|
+
|
|
1
4
|
|
|
2
5
|
import { destroyAfterSubmission } from './destroyAfterSubmission.js';
|
|
3
6
|
|
|
4
7
|
export function destroyTexture(layer, texture) {
|
|
5
|
-
destroyAfterSubmission(layer, texture, layer.renderer.device.queue.onSubmittedWorkDone());
|
|
8
|
+
destroyAfterSubmission(layer, texture, sceneByLayer.get(layer).renderer.device.queue.onSubmittedWorkDone());
|
|
6
9
|
}
|
|
@@ -1,118 +1,30 @@
|
|
|
1
|
-
|
|
1
|
+
import { meshOffsets } from '../globals/meshOffsets.js';
|
|
2
|
+
import { sceneByLayer } from '../globals/sceneByLayer.js';
|
|
3
|
+
import { drawPipeline } from './drawPipeline.js';
|
|
4
|
+
import { prepareMeshUniforms } from './prepareMeshUniforms.js';
|
|
5
|
+
import { prepareMeshTextures } from './prepareMeshTextures.js';
|
|
2
6
|
|
|
7
|
+
/** Upload retained CPU data and draw one mesh in the active WebGPU render pass. */
|
|
3
8
|
export function drawGeometry(backend, mesh, pass, cullMode, frontFace) {
|
|
4
|
-
const { geometry
|
|
5
|
-
const
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
const pipelineKey = `${cullMode}:${frontFace}:${depthCompare}`;
|
|
11
|
-
let pipeline = program.pipelineCache.get(pipelineKey);
|
|
12
|
-
if (!pipeline) {
|
|
13
|
-
pipeline = device.createRenderPipeline({
|
|
14
|
-
layout: program.pipelineLayout,
|
|
15
|
-
vertex: {
|
|
16
|
-
module: program.vertex,
|
|
17
|
-
entryPoint: 'vertexMain',
|
|
18
|
-
buffers: program.vertexBuffers,
|
|
19
|
-
},
|
|
20
|
-
fragment: {
|
|
21
|
-
module: program.fragment,
|
|
22
|
-
entryPoint: 'fragmentMain',
|
|
23
|
-
targets: [{
|
|
24
|
-
format: backend.renderer.format,
|
|
25
|
-
blend: program.transparent ? {
|
|
26
|
-
color: { srcFactor: 'src-alpha', dstFactor: 'one-minus-src-alpha', operation: 'add' },
|
|
27
|
-
alpha: { srcFactor: 'one', dstFactor: 'one-minus-src-alpha', operation: 'add' },
|
|
28
|
-
} : undefined,
|
|
29
|
-
writeMask: GPUColorWrite.ALL,
|
|
30
|
-
}],
|
|
31
|
-
},
|
|
32
|
-
primitive: { topology: 'triangle-list', cullMode, frontFace },
|
|
33
|
-
depthStencil: {
|
|
34
|
-
format: 'depth24plus',
|
|
35
|
-
depthWriteEnabled: program.depthWrite,
|
|
36
|
-
depthCompare,
|
|
37
|
-
},
|
|
38
|
-
});
|
|
39
|
-
program.pipelineCache.set(pipelineKey, pipeline);
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
const uniforms = program.uniforms;
|
|
43
|
-
const renderer = backend.renderer;
|
|
44
|
-
const offset = renderer.uniformSlot++ * 256;
|
|
45
|
-
const data = renderer.uniformData, base = offset / 4;
|
|
46
|
-
data.set(mesh.worldMatrix, base);
|
|
47
|
-
data.set(uniforms.baseColor.value, base + 16);
|
|
48
|
-
data[base + 19] = 1;
|
|
49
|
-
data[base + 20] = uniforms.metallic.value;
|
|
50
|
-
data[base + 21] = uniforms.roughness.value;
|
|
51
|
-
data[base + 22] = uniforms.opacity.value * (mesh.ground ? mesh._appearance ?? 1 : 1);
|
|
52
|
-
data[base + 23] = uniforms.alphaCutoff.value;
|
|
53
|
-
data.set(uniforms.emissive.value, base + 24);
|
|
54
|
-
data[base + 27] = uniforms.occlusionStrength.value;
|
|
55
|
-
data[base + 28] = mesh.terrain?.[0] ?? 0;
|
|
56
|
-
data[base + 29] = mesh.terrain?.[1] ?? 0;
|
|
57
|
-
data[base + 30] = mesh.terrain?.[2] ?? 0;
|
|
58
|
-
data[base + 31] = mesh.terrain?.[3] ?? 0;
|
|
59
|
-
data[base + 32] = mesh.highlight?.[0] ?? 0;
|
|
60
|
-
data[base + 33] = mesh.highlight?.[1] ?? 0;
|
|
61
|
-
data[base + 34] = program.nightSparkle ? data[55] : 0;
|
|
62
|
-
data[base + 35] = mesh.ground ? 1 : mesh._appearance ?? 1;
|
|
63
|
-
|
|
64
|
-
const textures = mesh._textures ||= [];
|
|
65
|
-
textures.length = 0;
|
|
66
|
-
let binding, texture, i, attribute;
|
|
67
|
-
for (binding of program.bindings) {
|
|
68
|
-
texture = uniforms[binding.name]?.value;
|
|
69
|
-
if (!texture) throw new Error(`Missing Layer3D texture: ${binding.name}`);
|
|
70
|
-
if (texture.uploaded !== texture.image) {
|
|
71
|
-
device.queue.copyExternalImageToTexture(
|
|
72
|
-
{ source: texture.image, flipY: Boolean(texture.flipY) },
|
|
73
|
-
{ texture: texture.texture },
|
|
74
|
-
[texture.image.width, texture.image.height]
|
|
75
|
-
);
|
|
76
|
-
texture.uploaded = texture.image;
|
|
77
|
-
}
|
|
78
|
-
textures.push(texture);
|
|
79
|
-
}
|
|
80
|
-
let bindingsChanged = !mesh.bindGroup || mesh.boundBuffer !== renderer.uniformBuffer ||
|
|
81
|
-
textures.length !== mesh.boundTextures.length;
|
|
82
|
-
for (i = 0; !bindingsChanged && i < textures.length; i++) {
|
|
83
|
-
if (textures[i].texture !== mesh.boundTextures[i][0] ||
|
|
84
|
-
textures[i].sampler !== mesh.boundTextures[i][1]) bindingsChanged = true;
|
|
85
|
-
}
|
|
86
|
-
if (bindingsChanged) {
|
|
87
|
-
const entries = [
|
|
88
|
-
{ binding: 0, resource: { buffer: renderer.uniformBuffer, size: 144 } },
|
|
89
|
-
{ binding: 1, resource: { buffer: renderer.uniformBuffer, size: 240 } },
|
|
90
|
-
];
|
|
91
|
-
if (program.terrain) entries.push({ binding: 2, resource: program.terrain.texture.createView() });
|
|
92
|
-
mesh.boundBuffer = renderer.uniformBuffer;
|
|
93
|
-
const boundTextures = mesh.boundTextures ||= [];
|
|
94
|
-
boundTextures.length = textures.length;
|
|
95
|
-
for (i = 0; i < textures.length; i++) {
|
|
96
|
-
binding = program.bindings[i], texture = textures[i];
|
|
97
|
-
entries.push({ binding: binding.texture, resource: texture.texture.createView() });
|
|
98
|
-
entries.push({ binding: binding.sampler, resource: texture.sampler });
|
|
99
|
-
boundTextures[i] ||= [];
|
|
100
|
-
boundTextures[i][0] = texture.texture;
|
|
101
|
-
boundTextures[i][1] = texture.sampler;
|
|
102
|
-
}
|
|
103
|
-
mesh.bindGroup = device.createBindGroup({
|
|
104
|
-
layout: program.bindGroupLayout,
|
|
105
|
-
entries,
|
|
106
|
-
});
|
|
107
|
-
}
|
|
9
|
+
const { geometry } = mesh;
|
|
10
|
+
const renderer = sceneByLayer.get(backend).renderer;
|
|
11
|
+
const { device } = renderer;
|
|
12
|
+
const pipeline = drawPipeline(renderer, mesh, cullMode, frontFace);
|
|
13
|
+
const offset = prepareMeshUniforms(renderer, mesh);
|
|
14
|
+
prepareMeshTextures(renderer, mesh);
|
|
108
15
|
pass.setPipeline(pipeline);
|
|
109
|
-
pass.setBindGroup(0, mesh.bindGroup,
|
|
16
|
+
pass.setBindGroup(0, mesh.bindGroup, (
|
|
17
|
+
meshOffsets[0] = offset,
|
|
18
|
+
meshOffsets
|
|
19
|
+
));
|
|
20
|
+
|
|
110
21
|
pass.setVertexBuffer(0, geometry.attributes.position.buffer);
|
|
111
22
|
pass.setVertexBuffer(1, geometry.attributes.normal.buffer);
|
|
112
23
|
if (geometry.attributes.color) pass.setVertexBuffer(2, geometry.attributes.color.buffer);
|
|
113
24
|
if (geometry.attributes.uv) pass.setVertexBuffer(3, geometry.attributes.uv.buffer);
|
|
114
25
|
const instances = geometry.attributes.instanceOffset;
|
|
115
26
|
if (instances) pass.setVertexBuffer(4, instances.buffer);
|
|
27
|
+
let attribute;
|
|
116
28
|
for (attribute of Object.values(geometry.attributes)) {
|
|
117
29
|
if (!attribute.needsUpdate) continue;
|
|
118
30
|
device.queue.writeBuffer(attribute.buffer, 0, attribute.data);
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { meshPipeline } from '../globals/meshPipeline.js';
|
|
2
|
+
import { alphaBlend } from '../globals/alphaBlend.js';
|
|
3
|
+
|
|
4
|
+
export function drawPipeline(renderer, mesh, cullMode, frontFace) {
|
|
5
|
+
const { program } = mesh;
|
|
6
|
+
// Mixed-LOD imagery composites coarse-to-fine; its depth still occludes later 3D objects.
|
|
7
|
+
// ponytail: self-occlusion during LOD blending needs separate per-LOD depth passes.
|
|
8
|
+
const depthCompare = program.depthTest === false || (mesh.ground && renderer.groundOverlap)
|
|
9
|
+
? 'always' : 'less-equal';
|
|
10
|
+
const pipelineKey = `${cullMode}:${frontFace}:${depthCompare}`;
|
|
11
|
+
let pipeline = program.pipelineCache.get(pipelineKey);
|
|
12
|
+
if (!pipeline) {
|
|
13
|
+
pipeline = renderer.device.createRenderPipeline((
|
|
14
|
+
meshPipeline.layout = program.pipelineLayout,
|
|
15
|
+
meshPipeline.vertex.module = program.vertex,
|
|
16
|
+
meshPipeline.vertex.buffers = program.vertexBuffers,
|
|
17
|
+
meshPipeline.fragment.module = program.fragment,
|
|
18
|
+
meshPipeline.fragment.targets[0].format = renderer.format,
|
|
19
|
+
meshPipeline.fragment.targets[0].blend = program.transparent ? alphaBlend : undefined,
|
|
20
|
+
meshPipeline.fragment.targets[0].writeMask = GPUColorWrite.ALL,
|
|
21
|
+
meshPipeline.primitive.cullMode = cullMode,
|
|
22
|
+
meshPipeline.primitive.frontFace = frontFace,
|
|
23
|
+
meshPipeline.depthStencil.depthWriteEnabled = program.depthWrite,
|
|
24
|
+
meshPipeline.depthStencil.depthCompare = depthCompare,
|
|
25
|
+
meshPipeline
|
|
26
|
+
));
|
|
27
|
+
meshPipeline.layout = null;
|
|
28
|
+
meshPipeline.vertex.module = null;
|
|
29
|
+
meshPipeline.vertex.buffers = null;
|
|
30
|
+
meshPipeline.fragment.module = null;
|
|
31
|
+
program.pipelineCache.set(pipelineKey, pipeline);
|
|
32
|
+
}
|
|
33
|
+
return pipeline;
|
|
34
|
+
}
|
|
@@ -1,21 +1,18 @@
|
|
|
1
|
+
import { scenePass } from '../globals/scenePass.js';
|
|
2
|
+
import { sceneByLayer } from '../globals/sceneByLayer.js';
|
|
3
|
+
|
|
4
|
+
|
|
1
5
|
import { drawGeometry } from './drawGeometry.js';
|
|
2
6
|
|
|
3
7
|
export function drawSceneMeshes(backend, encoder, meshes) {
|
|
4
|
-
const renderer = backend.renderer;
|
|
5
|
-
const pass = encoder.beginRenderPass(
|
|
6
|
-
colorAttachments
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
depthStencilAttachment: {
|
|
13
|
-
view: renderer.depthTexture.createView(),
|
|
14
|
-
depthClearValue: 1,
|
|
15
|
-
depthLoadOp: 'clear',
|
|
16
|
-
depthStoreOp: 'store',
|
|
17
|
-
},
|
|
18
|
-
});
|
|
8
|
+
const renderer = sceneByLayer.get(backend).renderer;
|
|
9
|
+
const pass = encoder.beginRenderPass((
|
|
10
|
+
scenePass.colorAttachments[0].view = renderer.context.getCurrentTexture().createView(),
|
|
11
|
+
scenePass.depthStencilAttachment.view = renderer.depthTexture.createView(),
|
|
12
|
+
scenePass
|
|
13
|
+
));
|
|
14
|
+
scenePass.colorAttachments[0].view = null;
|
|
15
|
+
scenePass.depthStencilAttachment.view = null;
|
|
19
16
|
pass.setViewport(0, 0, renderer.canvas.width, renderer.canvas.height, 0, 1);
|
|
20
17
|
pass.setBindGroup(1, renderer.sunlight.bindGroup);
|
|
21
18
|
let mesh, world, uniforms, determinant, frontFace, program;
|
|
@@ -26,14 +23,14 @@ export function drawSceneMeshes(backend, encoder, meshes) {
|
|
|
26
23
|
mesh.program.uniforms.opacity.value = mesh.opacity;
|
|
27
24
|
}
|
|
28
25
|
uniforms = mesh.program.uniforms;
|
|
29
|
-
if (uniforms.roofTexture) uniforms.roofTexture.value = backend._roofRaster?.texture || renderer.roofFallbackTexture;
|
|
26
|
+
if (uniforms.roofTexture) uniforms.roofTexture.value = sceneByLayer.get(backend)._roofRaster?.texture || renderer.roofFallbackTexture;
|
|
30
27
|
if (!mesh._frontFace || mesh._frontFaceWorldVersion !== mesh._worldMatrixVersion ||
|
|
31
28
|
mesh._worldMatrixVersion === undefined) {
|
|
32
29
|
determinant = world[0] * (world[5] * world[10] - world[6] * world[9]) -
|
|
33
30
|
world[4] * (world[1] * world[10] - world[2] * world[9]) +
|
|
34
31
|
world[8] * (world[1] * world[6] - world[2] * world[5]);
|
|
35
32
|
if (!Number.isFinite(determinant) || determinant === 0) {
|
|
36
|
-
throw new Error('Singular 3D transform');
|
|
33
|
+
throw /* alloc */ new Error('Singular 3D transform');
|
|
37
34
|
}
|
|
38
35
|
mesh._frontFace = determinant < 0 ? 'cw' : 'ccw';
|
|
39
36
|
mesh._frontFaceWorldVersion = mesh._worldMatrixVersion;
|