@eturnity/eturnity_3d 1.0.40 → 1.0.42
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
|
@@ -104,7 +104,7 @@ export default {
|
|
|
104
104
|
hydrateData: 'hydrateData'
|
|
105
105
|
}),
|
|
106
106
|
...mapMutations({
|
|
107
|
-
|
|
107
|
+
set_module_texture_version_id: 'mutate_module_texture_version_id'
|
|
108
108
|
}),
|
|
109
109
|
setCamera(polygon, view_mode) {
|
|
110
110
|
let margin=0.2
|
|
@@ -159,7 +159,6 @@ export default {
|
|
|
159
159
|
//const target=[targetVector.x/1000,targetVector.y/1000,targetVector.z/1000]
|
|
160
160
|
let cameraMoveVector = { x: 0, y: 0, z: 0 }
|
|
161
161
|
console.log('normalVector:', polygonRef.normalVector)
|
|
162
|
-
let flatRoof=polygonRef.normalVector.x==0 && polygonRef.normalVector.y==0
|
|
163
162
|
if (view_mode == 'ortho') {
|
|
164
163
|
cameraMoveVector = multiplyVector(
|
|
165
164
|
distance * 1000,
|
|
@@ -190,12 +189,12 @@ export default {
|
|
|
190
189
|
if (horizontalVector.x == 0 && horizontalVector.y == 0) {
|
|
191
190
|
//if flat roof=> go south
|
|
192
191
|
horizontalVector.y = 1
|
|
192
|
+
|
|
193
193
|
}
|
|
194
194
|
cameraMoveVector = multiplyVector(distance * 2000, horizontalVector)
|
|
195
195
|
}
|
|
196
196
|
|
|
197
197
|
const positionVector = addVector(polygonRef.meanPoint, cameraMoveVector)
|
|
198
|
-
if(flatRoof) positionVector.z+=2000
|
|
199
198
|
const position = [
|
|
200
199
|
positionVector.x / 1000,
|
|
201
200
|
positionVector.y / 1000 - 1,
|
|
@@ -79,7 +79,7 @@ export default {
|
|
|
79
79
|
|
|
80
80
|
computed: {
|
|
81
81
|
...mapState({
|
|
82
|
-
|
|
82
|
+
module_texture_version_id: (state) => state.threeDModule.module_texture_version_id,
|
|
83
83
|
selectedMapLayer: (state) => state.threeDModule.selectedMapLayer,
|
|
84
84
|
pvDataMemo: (state) => state.threeDModule.pvDataMemo
|
|
85
85
|
}),
|
|
@@ -777,7 +777,7 @@ export default {
|
|
|
777
777
|
this.panels.forEach((panelPolygon) => {
|
|
778
778
|
//definition of the material
|
|
779
779
|
if(panelPolygon.moduleField.data.number_of_panels_override) return
|
|
780
|
-
let material = this.material.panel['default_'+this.
|
|
780
|
+
let material = this.material.panel['default_'+this.module_texture_version_id]
|
|
781
781
|
if (panelPolygon.moduleField.pvData) {
|
|
782
782
|
let pvId = panelPolygon.moduleField.pvData.id
|
|
783
783
|
if (this.material.panel[pvId]) {
|
package/src/store/hydrateData.js
CHANGED
|
@@ -38,7 +38,7 @@ export async function hydrateData({ state, commit }, data) {
|
|
|
38
38
|
const layoutSetting = layoutSettingResponse
|
|
39
39
|
|
|
40
40
|
commit('mutate_layoutSettings', layoutSetting)
|
|
41
|
-
commit('
|
|
41
|
+
commit('mutate_module_texture_version_id', layoutSetting.module_texture_version_id)
|
|
42
42
|
let layers=getLayers()
|
|
43
43
|
let selectedLayer=layers.find(layer=>layer.key==layoutSetting.background_map_settings.layerKey)
|
|
44
44
|
commit('mutate_selectedMapLayer', selectedLayer)
|
|
@@ -30,7 +30,7 @@ const init_state = {
|
|
|
30
30
|
//useless state for viewer
|
|
31
31
|
pvDataMemo:[],
|
|
32
32
|
mountingDataMemo:[],
|
|
33
|
-
|
|
33
|
+
module_texture_version_id:0,
|
|
34
34
|
selectedMapLayer:null,
|
|
35
35
|
globalProjectProperties: [],
|
|
36
36
|
}
|
|
@@ -129,8 +129,11 @@ const mutations = {
|
|
|
129
129
|
mutate_buildingLocation(state, value) {
|
|
130
130
|
state.buildingLocation = value
|
|
131
131
|
},
|
|
132
|
-
|
|
133
|
-
state.
|
|
132
|
+
mutate_module_texture_version_id(state,value){
|
|
133
|
+
state.module_texture_version_id=value
|
|
134
|
+
},
|
|
135
|
+
mutate_module_texture_version_id(state,value){
|
|
136
|
+
state.module_texture_version_id=value
|
|
134
137
|
},
|
|
135
138
|
mutate_selectedMapLayer(state,value){
|
|
136
139
|
state.selectedMapLayer=value
|