@eturnity/eturnity_3d 7.4.0 → 7.6.0

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.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/src/helper/materialMixin.js +1 -4
  3. package/src/helper/render/moduleField.js +14 -10
  4. package/src/store/hydrateData.js +1 -0
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@eturnity/eturnity_3d",
3
3
  "private": false,
4
- "version": "7.4.0",
4
+ "version": "7.6.0",
5
5
  "main": "dist/main.js",
6
6
  "scripts": {
7
7
  "dev": "vue-cli-service serve --skip-plugins @vue/cli-plugin-eslint",
package/src/helper/materialMixin.js CHANGED
@@ -124,11 +124,8 @@ export default {
124
124
  transparent: true,
125
125
  opacity: 0.3
126
126
  })
127
- this.material.moduleFieldWithPanelOveride = new THREE.MeshPhongMaterial({
127
+ this.material.moduleFieldWithPanelOveride = new THREE.MeshBasicMaterial({
128
128
  color: 0xfc9d03,
129
- specular: 0x000000,
130
- shininess: 0,
131
- flatShading: true,
132
129
  side: THREE.DoubleSide,
133
130
  transparent: true,
134
131
  opacity: 0.8
package/src/helper/render/moduleField.js CHANGED
@@ -3,23 +3,27 @@ import { getBufferModuleFieldGeometry } from './geometryHandler'
3
3
  export default {
4
4
  methods: {
5
5
  renderModuleFields() {
6
+ console.log('renderModuleField', this.areModuleFieldsVisible)
6
7
  this.clearByType('moduleFieldsMeshes')
7
- if (!this.areModuleFieldsVisible) {
8
- return
9
- }
10
8
  const moduleFieldPolygons = this.polygons.filter((p) =>
11
9
  ['moduleField', 'tmpModuleField'].includes(p.layer)
12
10
  )
13
11
  moduleFieldPolygons.forEach((moduleFieldPolygon) => {
12
+ let material
13
+ if (moduleFieldPolygon.data.number_of_panels_override) {
14
+ material = this.material.moduleFieldWithPanelOveride
15
+ } else if (this.areModuleFieldsVisible) {
16
+ material = this.material.moduleField
17
+ } else {
18
+ return
19
+ }
14
20
  const geometry = getBufferModuleFieldGeometry(moduleFieldPolygon)
15
21
  if (geometry) {
16
- let material
17
- if (moduleFieldPolygon.data.number_of_panels_override) {
18
- material = this.material.moduleFieldWithPanelOveride
19
- } else {
20
- material = this.material.moduleField
21
- }
22
- const mesh = new THREE.Mesh(geometry, this.material.moduleField)
22
+ console.log(
23
+ 'override',
24
+ moduleFieldPolygon.data.number_of_panels_override
25
+ )
26
+ const mesh = new THREE.Mesh(geometry, material)
23
27
  mesh.matrixAutoUpdate = false
24
28
  mesh.userData.version = moduleFieldPolygon.version
25
29
  mesh.userData.type = 'moduleFieldsMeshes'
package/src/store/hydrateData.js CHANGED
@@ -120,6 +120,7 @@ export async function hydratePolygons({
120
120
  moduleField.pvData.module_texture_version_id =
121
121
  moduleFieldResp.module_texture_version_id
122
122
  moduleField.data = {}
123
+ moduleField.data.texture_img_url = moduleFieldResp.texture_img_url
123
124
  moduleField.data.col_spacing_mm = moduleFieldResp.col_spacing_mm
124
125
  moduleField.data.row_spacing_mm = moduleFieldResp.row_spacing_mm
125
126
  moduleField.data.row_spacing_hill_mm = moduleFieldResp.row_spacing_hill_mm