diff options
| -rw-r--r-- | init.js | 19 | ||||
| -rw-r--r-- | public/marker-model.svg | 12 | ||||
| -rw-r--r-- | public/markers/pilgerbrunnen/icon.png | bin | 1491390 -> 1542633 bytes |
3 files changed, 19 insertions, 12 deletions
@@ -197,7 +197,7 @@ const markers = [ new SVGLoader().load("marker-model.svg", (data) => { const markerObj = new THREE.Group(); const material = new THREE.MeshBasicMaterial({ - color: new THREE.Color(0), + color: new THREE.Color(), side: THREE.DoubleSide, depthWrite: true, transparent: false, @@ -215,7 +215,7 @@ new SVGLoader().load("marker-model.svg", (data) => { .entries()) { const geometry = new THREE.ShapeGeometry(shape); setUV(geometry); - const mesh = new THREE.Mesh(geometry, material); + const mesh = new THREE.Mesh(geometry); mesh.scale.setScalar(1 / 1792); mesh.position.set(-0.5, (1536 - 118.237) / 1792, i * 0.01); mesh.rotateX(Math.PI); @@ -227,16 +227,19 @@ new SVGLoader().load("marker-model.svg", (data) => { for (const marker of markers) { marker.obj = markerObj.clone(); marker.obj.marker = marker; - for (const child of marker.obj.children) - child.material = child.material.clone(); const texture = textures.load("markers/" + marker.name + "/icon.png"); texture.flipY = false; texture.colorSpace = THREE.SRGBColorSpace; - const material = marker.obj.children[1].material; - material.map = texture; - material.color = new THREE.Color(); + const ch = marker.obj.children; + + ch[0].material = material.clone(); + ch[1].material = material; + + const mat = ch[2].material = material.clone(); + mat.map = texture; + mat.transparent = true; scene.add(marker.obj); } @@ -245,8 +248,6 @@ new SVGLoader().load("marker-model.svg", (data) => { const clamp = (min, max, x) => Math.min(max, Math.max(min, x)); const rlerp = (min, max, x) => clamp(0, 1, (x - min) / (max - min)); -const gradient = new Color("yellow").range(new Color("blue")); - const mapToMerc = maplibregl.MercatorCoordinate.fromLngLat; const mercToThree = ({ x, y, z }) => diff --git a/public/marker-model.svg b/public/marker-model.svg index 68a1c76..918d4ee 100644 --- a/public/marker-model.svg +++ b/public/marker-model.svg @@ -6,7 +6,7 @@ inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" width="100%" height="100%" - sodipodi:docname="marker.svg" + sodipodi:docname="marker-model.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -41,8 +41,8 @@ id="namedview3031" showgrid="false" inkscape:zoom="0.36528543" - inkscape:cx="1121.0411" - inkscape:cy="728.19766" + inkscape:cx="495.50293" + inkscape:cy="730.93526" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -61,6 +61,12 @@ </g> <circle style="fill:#ff0000;fill-opacity:1;stroke:#ffff00;stroke-width:0;stroke-linecap:square;stroke-dasharray:none" + id="circle910" + cx="877.33734" + cy="368.5365" + r="468.83044" /> + <circle + style="fill:#ff0000;fill-opacity:1;stroke:#ffff00;stroke-width:0;stroke-linecap:square;stroke-dasharray:none" id="path505" cx="877.33734" cy="368.5365" diff --git a/public/markers/pilgerbrunnen/icon.png b/public/markers/pilgerbrunnen/icon.png Binary files differindex 9c08895..7c59165 100644 --- a/public/markers/pilgerbrunnen/icon.png +++ b/public/markers/pilgerbrunnen/icon.png |
