@eturnity/eturnity_3d 1.0.32 → 1.0.34
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/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eturnity/eturnity_3d",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.34",
|
|
5
5
|
"main": "dist/main.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
"@eturnity/eturnity_maths": "^1.0.2",
|
|
12
12
|
"axios": "^1.3.2",
|
|
13
13
|
"cors": "^2.8.5",
|
|
14
|
+
"core-js": "^2.6.12",
|
|
14
15
|
"earcut": "^2.2.4",
|
|
15
16
|
"express": "^4.18.2",
|
|
16
17
|
"geo-three": "^0.1.11",
|
package/src/helper/materials.js
CHANGED
|
@@ -39,12 +39,12 @@ material.flatRoof = new THREE.MeshPhongMaterial({
|
|
|
39
39
|
|
|
40
40
|
material.moduleField = new THREE.MeshPhongMaterial({
|
|
41
41
|
color: 0x2582be,
|
|
42
|
-
specular:
|
|
42
|
+
specular: 0x000000,
|
|
43
43
|
shininess: 0,
|
|
44
44
|
flatShading: true,
|
|
45
45
|
side:THREE.DoubleSide,
|
|
46
46
|
transparent:true,
|
|
47
|
-
opacity:0.
|
|
47
|
+
opacity:0.8
|
|
48
48
|
})
|
|
49
49
|
material.curvedRoof = new THREE.MeshPhongMaterial({
|
|
50
50
|
color: 0xffff00,
|
|
@@ -324,7 +324,10 @@ export default {
|
|
|
324
324
|
//roofs
|
|
325
325
|
let mesh=this.meshes.roofMeshes[roof.id]
|
|
326
326
|
mesh.material=this.material.roof
|
|
327
|
-
this.material.roof
|
|
327
|
+
console.log(this.material.roof)
|
|
328
|
+
if(this.material.roof.project){
|
|
329
|
+
this.material.roof.project(mesh)
|
|
330
|
+
}
|
|
328
331
|
//obstacle on roof
|
|
329
332
|
roof.holes.filter(p=>p.layer=="obstacle").forEach(obstacle=>{
|
|
330
333
|
let meshObstacle=this.meshes.obstacleMeshes[obstacle.id + '-' + roof.id + '_top']
|