@eturnity/eturnity_3d 7.2.4-qa-7.6.1 → 7.2.4-qa-7.4.2
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": "7.2.4-qa-7.
|
|
4
|
+
"version": "7.2.4-qa-7.4.2",
|
|
5
5
|
"main": "dist/main.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"prettier": "prettier --write \"**/*.{js,vue}\""
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@eturnity/eturnity_maths": "7.2.3-qa-7.
|
|
13
|
+
"@eturnity/eturnity_maths": "7.2.3-qa-7.4.0",
|
|
14
14
|
"core-js": "^2.6.12",
|
|
15
15
|
"cors": "^2.8.5",
|
|
16
16
|
"earcut": "^2.2.4",
|
|
@@ -89,6 +89,7 @@ export default {
|
|
|
89
89
|
},
|
|
90
90
|
turnOrthogonalCameraToPerspective() {
|
|
91
91
|
this.camera = this.perspectiveCamera
|
|
92
|
+
console.log(this.orthographicCamera)
|
|
92
93
|
let altitude =
|
|
93
94
|
(this.orthographicCamera.right - this.orthographicCamera.left) /
|
|
94
95
|
((this.perspectiveCamera.fov * Math.PI) / 180) /
|
|
@@ -343,6 +344,7 @@ export default {
|
|
|
343
344
|
onCompleteCallback()
|
|
344
345
|
})
|
|
345
346
|
} else {
|
|
347
|
+
console.log('setTween Camera not Vertical')
|
|
346
348
|
this.camera.up = { x: 0, y: 0, z: 1 }
|
|
347
349
|
this.tweenCamera = new TWEEN.Tween(currentTweenVar)
|
|
348
350
|
.to({ t: 1 }, 2000)
|
|
@@ -106,7 +106,6 @@ export default {
|
|
|
106
106
|
const name = geometryEvent.name
|
|
107
107
|
const params = geometryEvent.params
|
|
108
108
|
let methodList = []
|
|
109
|
-
console.log(name)
|
|
110
109
|
switch (name) {
|
|
111
110
|
case 'zoomIn3D':
|
|
112
111
|
methodList.push({
|
|
@@ -212,11 +211,6 @@ export default {
|
|
|
212
211
|
method: this.renderObstacles,
|
|
213
212
|
arg: []
|
|
214
213
|
})
|
|
215
|
-
methodList.push({
|
|
216
|
-
name: 'renderNodes',
|
|
217
|
-
method: this.renderNodes,
|
|
218
|
-
arg: []
|
|
219
|
-
})
|
|
220
214
|
} else if (params.layer == 'obstacle') {
|
|
221
215
|
methodList.push({
|
|
222
216
|
name: 'renderBase',
|
|
@@ -234,6 +228,11 @@ export default {
|
|
|
234
228
|
arg: []
|
|
235
229
|
})
|
|
236
230
|
}
|
|
231
|
+
methodList.push({
|
|
232
|
+
name: 'renderRoofsMargin',
|
|
233
|
+
method: this.renderRoofsMargin,
|
|
234
|
+
arg: []
|
|
235
|
+
})
|
|
237
236
|
break
|
|
238
237
|
case 'removePanels': //params.panels
|
|
239
238
|
case 'removeModuleField': //params:moduleField
|
|
@@ -465,7 +464,6 @@ export default {
|
|
|
465
464
|
},
|
|
466
465
|
geometryEventsToDo(val) {
|
|
467
466
|
if (val.length > 0) {
|
|
468
|
-
console.log(val)
|
|
469
467
|
this.refreshRendering()
|
|
470
468
|
}
|
|
471
469
|
}
|
package/src/helper/threeMixin.js
CHANGED
|
@@ -108,8 +108,8 @@ export default {
|
|
|
108
108
|
)
|
|
109
109
|
this.orbitControl.maxPolarAngle = Math.PI / 2
|
|
110
110
|
this.orbitControl.mouseButtons = {
|
|
111
|
-
LEFT: THREE.MOUSE.ROTATE,
|
|
112
111
|
RIGHT: THREE.MOUSE.PAN,
|
|
112
|
+
LEFT: THREE.MOUSE.ROTATE,
|
|
113
113
|
MIDDLE: THREE.MOUSE.DOLLY
|
|
114
114
|
}
|
|
115
115
|
this.orbitControl.screenSpacePanning = false
|