@eturnity/eturnity_3d 7.35.0-EPDM-11386.0 → 7.35.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "7.35.0-EPDM-11386.0",
+  "version": "7.35.0",
   "files": [
     "dist",
     "src"
@@ -15,7 +15,7 @@
     "prettier": "prettier --write \"**/*.{js,vue}\""
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "7.35.0-EPDM-11386.0",
+    "@eturnity/eturnity_maths": "7.35.0",
     "@originjs/vite-plugin-commonjs": "1.0.3",
     "core-js": "2.6.12",
     "cors": "2.8.5",
@@ -26,7 +26,7 @@
     "leaflet.gridlayer.googlemutant": "0.14.0",
     "lodash": "4.17.21",
     "svd-js": "1.1.1",
-    "three": "0.167.0",
+    "three": "0.142.0",
     "tween": "0.9.0",
     "uuid": "9.0.0",
     "vite-plugin-require": "1.2.14",

package/src/Overlay/Overlay.js

@@ -157,7 +157,6 @@ export default class Overlay extends Item {
           texture,
           transparent: true,
           side: THREE.DoubleSide,
-          shadowSide: THREE.DoubleSide
         })
 
         imageOverlayProjectionMaterial.userData = {}

package/src/helper/cameraMixin.js

@@ -17,7 +17,7 @@ export default {
   },
   created() {
     this.perspectiveCamera = new THREE.PerspectiveCamera(
-      80,
+      50,
       300 / 300,
       1,
       50000

package/src/helper/initializeThree.js

@@ -8,28 +8,7 @@ export default {
       preserveDrawingBuffer: true,
       powerPreference: 'high-performance',
     })
-    this.renderer.shadowMap.enabled = true
-    this.renderer.shadowMap.type = THREE.BasicShadowMap;
     this.raycaster = new THREE.Raycaster()
     this.loader = new THREE.TextureLoader()
-
-
-
-    const sphereGeometry = new THREE.SphereGeometry( 5, 32, 32 );
-    const sphereMaterial = new THREE.MeshStandardMaterial( { color: 0xff0000 } );
-    const sphere = new THREE.Mesh( sphereGeometry, sphereMaterial );
-    sphere.castShadow = true
-    sphere.receiveShadow = false
-    sphere.position.set(0,7,4)
-    this.scene.add( sphere );
-
-
-
-    const planeGeometry = new THREE.PlaneGeometry( 70, 70, 32, 32 );
-    const planeMaterial = new THREE.MeshStandardMaterial( { color: 0x00ff00 } )
-    const plane = new THREE.Mesh( planeGeometry, planeMaterial );
-    plane.position.set(0,0,1)
-    plane.receiveShadow = true;
-    this.scene.add( plane );
   },
 }

package/src/helper/materialMixin.js

@@ -22,13 +22,11 @@ export default {
       side: THREE.DoubleSide,
     })
 
-    this.material.wall = new THREE.MeshPhongMaterial({
+    this.material.wall = new THREE.MeshLambertMaterial({
       color: wallColor,
       side: THREE.DoubleSide,
       transparent: true,
       opacity: this.wallColor == '#ffffff00' ? 0.2 : 1,
-      shadowSide: THREE.DoubleSide,
-      flatShading: true
     })
 
     this.material.obstacle = new THREE.MeshPhongMaterial({

package/src/helper/render/base.js

@@ -39,8 +39,6 @@ export default {
           mesh.userData.polygonId = roofPolygon.id
           mesh.matrixAutoUpdate = false
           mesh.frustumCulled = false
-          mesh.receiveShadow = true
-          mesh.castShadow = true
           this.meshes.baseMeshes[roofPolygon.id] = mesh
         }
         baseGeometries.push(this.meshes.baseMeshes[roofPolygon.id].geometry)
@@ -52,8 +50,6 @@ export default {
         this.material.wall
       )
       this.mergedBaseMesh.renderOrder = 10
-      this.mergedBaseMesh.receiveShadow = true
-      this.mergedBaseMesh.castShadow = true
     },
   },
 }

package/src/helper/render/obstacle.js

@@ -82,11 +82,6 @@ export default {
         this.material.wall
       )
       this.mergedObstacleSideMesh.renderOrder = 10
-      //shadow
-      this.mergedObstacleSideMesh.receiveShadow = true
-      this.mergedObstacleSideMesh.castShadow = true
-      this.mergedObstacleMesh.receiveShadow = true
-      this.mergedObstacleMesh.castShadow = true
       this.applyTextureOnObstacles(this.material.roof)
     },
   },

package/src/helper/render/roof.js

@@ -114,8 +114,6 @@ export default {
             mesh.userData.meshId = roofPolygon.id
             mesh.userData.polygonId = roofPolygon.id
             mesh.frustumCulled = false
-            mesh.receiveShadow = true
-            mesh.castShadow = true
             this.meshes.roofMeshes[roofPolygon.id] = mesh
             this.scene.add(mesh)
           }

package/src/helper/render/tile.js

@@ -280,15 +280,13 @@ export default {
               mesh.userData.meshId = meshId
               mesh.frustumCulled = false
               mesh.needsUpdate = true
-              mesh.receiveShadow = true
               mesh.updateMatrix()
             } else {
-              material = new THREE.MeshPhongMaterial({
+              material = new THREE.MeshBasicMaterial({
                 map: texture,
                 color: 0xffffff,
                 side: THREE.FrontSide,
                 transparent: false,
-                shininess: 0
                 // opacity:isTileOnRoofBound?0.8:1,
                 // color:isTileOnRoofBound?'red':'white'
               })
@@ -301,7 +299,7 @@ export default {
                 mesh.userData.meshId = meshId
                 mesh.userData.mapLayer = this.provider.mapLayer
                 mesh.name = meshId
-                mesh.receiveShadow = true
+
                 if (!this.scene.getObjectByName(meshId)) {
                   this.meshes.tileMeshes[meshId] = mesh
                   this.scene.add(this.meshes.tileMeshes[meshId])
@@ -434,7 +432,7 @@ export default {
               googleMapType
             )
           }
-          planeMaterial[indexGoogleBackground] = new THREE.MeshPhongMaterial({
+          planeMaterial[indexGoogleBackground] = new THREE.MeshBasicMaterial({
             map: texture[indexGoogleBackground],
             side: THREE.DoubleSide,
           })
@@ -450,8 +448,6 @@ export default {
             -indexGoogleBackground / 2
           backgroundPlane[indexGoogleBackground].visible = true
           backgroundPlane[indexGoogleBackground].needsUpdate = true
-
-          backgroundPlane[indexGoogleBackground].receiveShadow = true
           backgroundPlane[indexGoogleBackground].userData.index =
             indexGoogleBackground
           const meshToRemove = this.googleBackgroundMap.children.find(
@@ -466,7 +462,6 @@ export default {
           if (this.numberOfTilesRendered == this.numberOfTilesToRender) {
             this.googleBackgroundMap.needsUpdate = true
             this.googleBackgroundMap.visible = true
-            this.googleBackgroundMap.receiveShadow = true
             this.render()
           }
         })

package/src/helper/render/tileProjection.js

@@ -27,7 +27,6 @@ export default {
         texture: texture,
         transparent: true,
         side: THREE.DoubleSide,
-        shadowSide: THREE.DoubleSide
       })
       tileProjectionMaterial.camera = cameraProjection
       tileProjectionMaterial.userData = {}

package/src/helper/threeMixin.js

@@ -105,31 +105,16 @@ export default {
       })
     },
     initialiseLights() {
-      const ambientLight = new THREE.AmbientLight(0xffffff, 0.5)
-      // let directionalLight = new THREE.DirectionalLight(0xffffff, 0.5)
-      // directionalLight.position.set(0, 1000, -500)
-      var light = new THREE.DirectionalLight(0xffffff, 1)
-      light.name = 'sunLight'
-      light.position.set(0, 100, 10)
-      light.castShadow = true
-
-      // Shadow settings
-      light.shadow.mapSize.width = 2048 // High quality shadow map
-      light.shadow.mapSize.height = 2048
-      light.shadow.camera.near = 0.5
-      light.shadow.camera.far = 500
-      light.shadow.camera.left = -50
-      light.shadow.camera.right = 50
-      light.shadow.camera.top = 50
-      light.shadow.camera.bottom = -50
-      light.shadow.bias = -0.001
-
-      // Add the light to the scene
-      this.scene.add(light)
-      this.scene.add(ambientLight)
-
-      const helper = new THREE.CameraHelper(light.shadow.camera)
-      this.scene.add(helper)
+      // const ambientLight = new THREE.AmbientLight(0xffffff, 0.5)
+      var hemiLight = new THREE.HemisphereLight(0xffffff, 0x444444)
+      hemiLight.position.set(0, 0, 300)
+      this.scene.add(hemiLight)
+      let directionalLight = new THREE.DirectionalLight(0xffffff, 0.5)
+      directionalLight.position.set(0, 1000, 500)
+      let directionalLight2 = new THREE.DirectionalLight(0xffffff, 0.5)
+      directionalLight2.position.set(0, -1000, 500)
+      this.scene.add(directionalLight)
+      this.scene.add(directionalLight2)
     },
     initialiseSky() {
       // Add Sky