diff --git a/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/index.html b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/index.html index 84da2e0..396290b 100644 --- a/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/index.html +++ b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/index.html @@ -21,8 +21,7 @@ let options ={ _dimX : X, _dimY: Y, - //_fileName: "ProjectSlice.3dm", - _fileName: "TestFiera.3dm", + _fileName: "ProjectSlice.3dm", _showGrid: true, _showInfiniteGrid: false, _isOrtographic: true, diff --git a/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/draw/webgl_drawVue.js b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/draw/webgl_drawVue.js index 94677ee..9b0f165 100644 --- a/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/draw/webgl_drawVue.js +++ b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/draw/webgl_drawVue.js @@ -398,7 +398,6 @@ function init3dm(){ } // READING ARROW'S MESH else if ( child.type == 'Mesh') { - try { var nLayer = parseInt( child.userData.attributes.layerIndex) - nStartLayer ; if ( nLayer < 0) @@ -409,9 +408,9 @@ function init3dm(){ child.material.color = new THREE.Color( child.userData.attributes.objectColor.r/255.0, child.userData.attributes.objectColor.g/255.0, child.userData.attributes.objectColor.b/255.0) ; + child.material.flatShading = true; + child.material.needsUpdate = true; layer_list.push( child) ; - //console.log( child) ; - } catch( e) { console.log( 'Not a valid Arrow direction') ; return false ; @@ -478,25 +477,33 @@ function AdaptSeceneToContest() { scene.background = new THREE.Color( 0xa0a0a0) ; // Global Box ---------- - if(fileType == "3DM"){ - + if (fileType == "3DM") { for ( var i = 0 ; i < layer_list.length ; ++ i) { const Objbox = new THREE.Box3().setFromObject( layer_list[i]); GLBox3D.union( Objbox) ; layer_list[i].material.side = THREE.DoubleSide ; layer_list[i].castShadow = true - if ( ! layer_list[i].isArrow || m_bShowPrintDir) + if ( ! layer_list[i].isArrow || m_bShowPrintDir) { + if ( typeof layer_list[i].nLayer !== "undefined") { + if ( parseInt( layer_list[i].nLayer) % 2 == 0) { + const mat = layer_list[i].material.clone() ; + mat.color.lerp( new THREE.Color( 0x000000), 0.25) ; + layer_list[i].material = mat ; + } + } + layer_list[i].isArrow = ( layer_list[i].name == 'Arrow') scene.add( layer_list[i]) ; + } } } - else if(fileType == "3MF"){ + else if ( fileType == "3MF"){ for ( var i = 0 ; i < layer_list.length ; ++ i) { if ( layer_list[i].children[0].type == 'Mesh') { const Objbox = new THREE.Box3().setFromObject( layer_list[i]); GLBox3D.union( Objbox) ; layer_list[i].children[0].material.side = THREE.DoubleSide ; if ( typeof layer_list[i].children[0].nLayer !== "undefined") { - if ( parseInt( layer_list[i].children[0].nLayer)%2 == 0) + if ( parseInt( layer_list[i].children[0].nLayer) % 2 == 0) layer_list[i].children[0].material.color.lerp( new THREE.Color( 0x000000 ), 0.25) ; layer_list[i].children[0].isArrow = ( layer_list[i].children[0].name == 'Arrow') scene.add( layer_list[i]) ; @@ -527,9 +534,9 @@ function AdaptSeceneToContest() { scene.add( activeCamera) ; // Hemisphere light -------- - const hemiLight = new THREE.HemisphereLight( 0xffffff, 0x8d8d8d ); - hemiLight.position.set( vtCenter.x, vtCenter.y + 2 * vtBoxDim.y, vtCenter.z); - scene.add( hemiLight ); + const hemiLight = new THREE.HemisphereLight( 0xffffff, 0x444444, 1.8) ; + hemiLight.position.set( vtCenter.x, vtCenter.y + 2 * vtBoxDim.y, vtCenter.z) ; + scene.add( hemiLight) ; // direction light -------- const dirLight = new THREE.DirectionalLight( 0xffffff ); @@ -542,7 +549,7 @@ function AdaptSeceneToContest() { dirLight.shadow.camera.near = 0.1; dirLight.shadow.camera.far = 200; dirLight.shadow.mapSize.set( 1024, 1024 ); - scene.add( dirLight ); + scene.add( dirLight) ; // render settings --------- renderer = new THREE.WebGLRenderer( { antialias: true }); diff --git a/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice.3dm b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice.3dm index ef4979d..af85838 100644 Binary files a/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice.3dm and b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice.3dm differ diff --git a/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice1.3dm b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice1.3dm new file mode 100644 index 0000000..af85838 Binary files /dev/null and b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice1.3dm differ diff --git a/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice2.3dm b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice2.3dm new file mode 100644 index 0000000..89f4ce6 Binary files /dev/null and b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice2.3dm differ diff --git a/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice3.3dm b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice3.3dm new file mode 100644 index 0000000..5a61554 Binary files /dev/null and b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice3.3dm differ diff --git a/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice4.3dm b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice4.3dm new file mode 100644 index 0000000..63ac9d7 Binary files /dev/null and b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice4.3dm differ diff --git a/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice5.3dm b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice5.3dm new file mode 100644 index 0000000..b1fa355 Binary files /dev/null and b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/ProjectSlice5.3dm differ diff --git a/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/TestFiera2.3dm b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/TestFiera2.3dm new file mode 100644 index 0000000..e685a29 Binary files /dev/null and b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/TestFiera2.3dm differ diff --git a/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/TestFiera3.3dm b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/TestFiera3.3dm new file mode 100644 index 0000000..de10b6a Binary files /dev/null and b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/TestFiera3.3dm differ diff --git a/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/TestFiera4.3dm b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/TestFiera4.3dm new file mode 100644 index 0000000..2b35523 Binary files /dev/null and b/IcarusView/3MF_test/Web3D-Vue/Web3D_viewer_live/src/source/models/TestFiera4.3dm differ