@eturnity/eturnity_3d 7.24.2 → 7.30.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "7.24.2",
+  "version": "7.30.0",
   "files": [
     "dist",
     "src"
@@ -15,7 +15,7 @@
     "prettier": "prettier --write \"**/*.{js,vue}\""
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "7.24.1",
+    "@eturnity/eturnity_maths": "7.30.0",
     "@originjs/vite-plugin-commonjs": "1.0.3",
     "core-js": "2.6.12",
     "cors": "2.8.5",
@@ -27,7 +27,6 @@
     "lodash": "4.17.21",
     "svd-js": "1.1.1",
     "three": "0.149.0",
-    "three-projected-material": "2.2.1",
     "tween": "0.9.0",
     "uuid": "9.0.0",
     "vite-plugin-require": "1.1.14",

package/src/Overlay/ImageOverlay.js

@@ -53,15 +53,16 @@ export default class ImageOverlay extends Overlay {
   }
   async initialiseImage(url) {
     const img = new Image()
+    img.crossOrigin = 'Anonymous'
     const _this = this
     const promise = new Promise((resolve, reject) => {
       img.onload = function () {
         _this.width = this.width
         _this.height = this.height
+        _this.img = this
         resolve(true)
       }
       img.onerror = reject
-      this.img = img
     })
     img.src = url
     return promise
@@ -166,10 +167,12 @@ export default class ImageOverlay extends Overlay {
     handles.visible = isRotationHandleVisible
   }
   loadImageOverlay(url, corners) {
-    let rasterImageOverlay = new Paper.Raster({
-      source: url,
-      crossOrigin: 'Anonymous'
-    })
+    let rasterImageOverlay = this.img
+      ? new Paper.Raster(this.img)
+      : new Paper.Raster({
+          source: url,
+          crossOrigin: 'Anonymous'
+        })
     rasterImageOverlay.onLoad = () => {
       this.applyRasterToCorners(rasterImageOverlay, corners)
     }

package/src/Overlay/Overlay.js

@@ -13,7 +13,7 @@ import {
   getBufferRoofGeometry
 } from '../helper/render/geometryHandler'
 import * as THREE from 'three'
-import ProjectedMaterial from 'three-projected-material'
+import ProjectedMaterial from '../helper/projectedMaterial'
 export default class Overlay extends Item {
   constructor(overlay, emit) {
     super(emit)
@@ -148,8 +148,9 @@ export default class Overlay extends Item {
         resolve(this.imageOverlayProjectionMaterial)
         return
       }
-      const loader = new THREE.TextureLoader()
-      loader.load(url, (texture) => {
+
+      const callback = (texture) => {
+        texture.needsUpdate = true
         this.setImageOverlayCameraPosition()
         let imageOverlayProjectionMaterial = new ProjectedMaterial({
           camera: this.overlayProjectionCamera,
@@ -166,7 +167,14 @@ export default class Overlay extends Item {
         imageOverlayProjectionMaterial.opacity = this.opacity
         this.imageOverlayProjectionMaterial = imageOverlayProjectionMaterial
         resolve(imageOverlayProjectionMaterial)
-      })
+      }
+
+      if (this.img) {
+        callback(new THREE.Texture(this.img))
+      } else {
+        const loader = new THREE.TextureLoader()
+        loader.load(url, callback)
+      }
     })
   }
   getBackgroundGeometry() {
@@ -216,17 +224,19 @@ export default class Overlay extends Item {
       cameraChanged = true
     }
     this.overlayProjectionCamera.rotation.set(0, 0, (zAngle * Math.PI) / 180)
+    const CAMERA_HEIGHT_OFFSET = 50
     if (
       this.overlayProjectionCamera.position.x != boxCenter.x / 1000 ||
       this.overlayProjectionCamera.position.y != boxCenter.y / 1000 ||
-      this.overlayProjectionCamera.position.z != boxCenter.z / 1000 + 50
+      this.overlayProjectionCamera.position.z !=
+        boxCenter.z / 1000 + CAMERA_HEIGHT_OFFSET
     ) {
       cameraChanged = true
     }
     this.overlayProjectionCamera.position.set(
       boxCenter.x / 1000,
       boxCenter.y / 1000,
-      boxCenter.z / 1000 + 50
+      boxCenter.z / 1000 + CAMERA_HEIGHT_OFFSET
     )
     this.overlayProjectionCamera.updateProjectionMatrix()
     return cameraChanged

package/src/helper/projectedMaterial.js

@@ -577,8 +577,8 @@ function _saveCameraMatrices2() {
   this.uniforms.viewMatrixCamera.value.copy(viewMatrixCamera)
   this.uniforms.projectionMatrixCamera.value.copy(projectionMatrixCamera)
   this.uniforms.projPosition.value.setFromMatrixPosition(modelMatrixCamera)
-  this.uniforms.projDirection.value.set(0, 0, 1).applyMatrix4(modelMatrixCamera) // tell the shader we've projected
-
+  this.uniforms.projDirection.value.set(0, 0, 1).transformDirection(modelMatrixCamera) 
+  // tell the shader we've projected
   this.uniforms.isTextureProjected.value = true
 }
 

package/src/helper/render/loader.js

@@ -1,5 +1,4 @@
 import * as THREE from 'three'
-import ProjectedMaterial from 'three-projected-material'
 
 export default {
   methods: {

package/src/helper/render/tileProjection.js

@@ -42,7 +42,7 @@ export default {
         '_' +
         mapLayer
       tileProjectionMaterial.userData.mapLayer = mapLayer
-      tileProjectionMaterial.userData.priority = 10
+      tileProjectionMaterial.priority = 10
       this.material.projectionTiles.push(tileProjectionMaterial)
       this.material.roof = this.material.roof.filter(
         (m) => m.userData.type != 'tileProjectionMaterial'