vmario/Doodle3D-Core
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Core.git synced 2024-12-22 11:03:48 +01:00
Code Issues Projects Releases Wiki Activity

update three js version

Browse Source
This commit is contained in:
casperlamboo 2017-12-06 12:04:44 +01:00
parent 5647c75d67
commit cb86716a25
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package-lock.json generated
View File

@ -42,6 +42,13 @@
"requires": { "requires": {
"jszip": "3.1.5", "jszip": "3.1.5",
"three": "0.83.0" "three": "0.83.0"
},
"dependencies": {
"three": {
"version": "0.83.0",
"resolved": "https://registry.npmjs.org/three/-/three-0.83.0.tgz",
"integrity": "sha1-O3+UeQrz4CHawfRKJhdWnKIDKws="
}
} }
}, },
"@doodle3d/threejs-export-stl": { "@doodle3d/threejs-export-stl": {
@ -51,6 +58,13 @@
"requires": { "requires": {
"babel-preset-env": "1.6.1", "babel-preset-env": "1.6.1",
"three": "0.83.0" "three": "0.83.0"
},
"dependencies": {
"three": {
"version": "0.83.0",
"resolved": "https://registry.npmjs.org/three/-/three-0.83.0.tgz",
"integrity": "sha1-O3+UeQrz4CHawfRKJhdWnKIDKws="
}
} }
}, },
"@doodle3d/touch-events": { "@doodle3d/touch-events": {
@ -8898,9 +8912,9 @@
} }
}, },
"three": { "three": {
"version": "0.83.0", "version": "0.88.0",
"resolved": "https://registry.npmjs.org/three/-/three-0.83.0.tgz", "resolved": "https://registry.npmjs.org/three/-/three-0.88.0.tgz",
"integrity": "sha1-O3+UeQrz4CHawfRKJhdWnKIDKws=" "integrity": "sha1-QlbC/Djk+yOg0j66K2zOTfjkZtU="
}, },
"three-js-csg": { "three-js-csg": {
"version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045" "version": "github:Doodle3D/three-js-csg#a36f23da6e9be2405a9094de5709cb0ae8f58045"

2
package.json
View File

@ -42,7 +42,7 @@
"reselect": "^3.0.1", "reselect": "^3.0.1",
"semver": "^5.4.1", "semver": "^5.4.1",
"shortid": "^2.2.8", "shortid": "^2.2.8",
"three": "^0.83.0", "three": "^0.88.0",
"three-js-csg": "github:Doodle3D/three-js-csg", "three-js-csg": "github:Doodle3D/three-js-csg",
"valid-url": "^1.0.9" "valid-url": "^1.0.9"
}, },

10
src/d3/SelectionBox.js vendored
View File

@ -9,11 +9,6 @@ export default class SelectionBox extends THREE.Object3D {
constructor() { constructor() {
super(); super();
this._box = new THREE.BoxHelper();
this._box.material.color.setHex(0x72bcd4);
this._box.name = 'bounding-box';
const material = new THREE.MeshBasicMaterial(); const material = new THREE.MeshBasicMaterial();
const geometry = new THREE.BoxGeometry(1, 1, 1); const geometry = new THREE.BoxGeometry(1, 1, 1);
@ -23,7 +18,8 @@ export default class SelectionBox extends THREE.Object3D {
const mesh = new THREE.Mesh(geometry, material); const mesh = new THREE.Mesh(geometry, material);
this._box.update(mesh); this._box = new THREE.BoxHelper(mesh, 0x72bcd4);
this._box.name = 'bounding-box';
this.add(this._box); this.add(this._box);
} }
@ -62,5 +58,7 @@ export default class SelectionBox extends THREE.Object3D {
this._box.scale.y = this._boundingBox.max.y - this._boundingBox.min.y; this._box.scale.y = this._boundingBox.max.y - this._boundingBox.min.y;
this._box.position.y = this._boundingBox.min.y; this._box.position.y = this._boundingBox.min.y;
this._box.updateMatrix();
} }
} }