|
@@ -97,7 +97,7 @@
|
|
|
|
|
|
//// PLANES
|
|
|
|
|
|
- var planeGeometry = new THREE.PlaneGeometry( 50, 50, 2, 2 );
|
|
|
+ var planeGeometry = new THREE.PlaneBufferGeometry( 50, 50, 2, 2 );
|
|
|
var planeMaterial = new THREE.MeshBasicMaterial( { wireframe: true } );
|
|
|
planeMaterial.side = THREE.DoubleSide;
|
|
|
|
|
@@ -154,10 +154,10 @@
|
|
|
if (child instanceof THREE.Mesh) {
|
|
|
child.updateMatrix();
|
|
|
|
|
|
- var tempGeometry = new THREE.Geometry();
|
|
|
- tempGeometry.merge( child.geometry, child.matrix );
|
|
|
-
|
|
|
+ var tempGeometry = child.geometry.clone();
|
|
|
+ tempGeometry.applyMatrix( child.matrix );
|
|
|
child.geometry = tempGeometry;
|
|
|
+
|
|
|
child.position.set( 0, 0, 0 );
|
|
|
child.rotation.set( 0, 0, 0 );
|
|
|
child.scale.set( 1, 1, 1 );
|
|
@@ -251,13 +251,13 @@
|
|
|
[ new THREE.Mesh( new THREE.OctahedronGeometry( 0.1, 0 ), new GizmoMaterial( { color: 0xffffff, opacity: 0.25 } ) ), [ 0, 0, 0 ], [ 0, 0, 0 ] ]
|
|
|
],
|
|
|
XY: [
|
|
|
- [ new THREE.Mesh( new THREE.PlaneGeometry( 0.29, 0.29 ), new GizmoMaterial( { color: 0xffff00, opacity: 0.25 } ) ), [ 0.15, 0.15, 0 ] ]
|
|
|
+ [ new THREE.Mesh( new THREE.PlaneBufferGeometry( 0.29, 0.29 ), new GizmoMaterial( { color: 0xffff00, opacity: 0.25 } ) ), [ 0.15, 0.15, 0 ] ]
|
|
|
],
|
|
|
YZ: [
|
|
|
- [ new THREE.Mesh( new THREE.PlaneGeometry( 0.29, 0.29 ), new GizmoMaterial( { color: 0x00ffff, opacity: 0.25 } ) ), [ 0, 0.15, 0.15 ], [ 0, Math.PI/2, 0 ] ]
|
|
|
+ [ new THREE.Mesh( new THREE.PlaneBufferGeometry( 0.29, 0.29 ), new GizmoMaterial( { color: 0x00ffff, opacity: 0.25 } ) ), [ 0, 0.15, 0.15 ], [ 0, Math.PI/2, 0 ] ]
|
|
|
],
|
|
|
XZ: [
|
|
|
- [ new THREE.Mesh( new THREE.PlaneGeometry( 0.29, 0.29 ), new GizmoMaterial( { color: 0xff00ff, opacity: 0.25 } ) ), [ 0.15, 0, 0.15 ], [ -Math.PI/2, 0, 0 ] ]
|
|
|
+ [ new THREE.Mesh( new THREE.PlaneBufferGeometry( 0.29, 0.29 ), new GizmoMaterial( { color: 0xff00ff, opacity: 0.25 } ) ), [ 0.15, 0, 0.15 ], [ -Math.PI/2, 0, 0 ] ]
|
|
|
]
|
|
|
};
|
|
|
|
|
@@ -275,13 +275,13 @@
|
|
|
[ new THREE.Mesh( new THREE.OctahedronGeometry( 0.2, 0 ), new GizmoMaterial( { color: 0xffffff, opacity: 0.25 } ) ) ]
|
|
|
],
|
|
|
XY: [
|
|
|
- [ new THREE.Mesh( new THREE.PlaneGeometry( 0.4, 0.4 ), new GizmoMaterial( { color: 0xffff00, opacity: 0.25 } ) ), [ 0.2, 0.2, 0 ] ]
|
|
|
+ [ new THREE.Mesh( new THREE.PlaneBufferGeometry( 0.4, 0.4 ), new GizmoMaterial( { color: 0xffff00, opacity: 0.25 } ) ), [ 0.2, 0.2, 0 ] ]
|
|
|
],
|
|
|
YZ: [
|
|
|
- [ new THREE.Mesh( new THREE.PlaneGeometry( 0.4, 0.4 ), new GizmoMaterial( { color: 0x00ffff, opacity: 0.25 } ) ), [ 0, 0.2, 0.2 ], [ 0, Math.PI/2, 0 ] ]
|
|
|
+ [ new THREE.Mesh( new THREE.PlaneBufferGeometry( 0.4, 0.4 ), new GizmoMaterial( { color: 0x00ffff, opacity: 0.25 } ) ), [ 0, 0.2, 0.2 ], [ 0, Math.PI/2, 0 ] ]
|
|
|
],
|
|
|
XZ: [
|
|
|
- [ new THREE.Mesh( new THREE.PlaneGeometry( 0.4, 0.4 ), new GizmoMaterial( { color: 0xff00ff, opacity: 0.25 } ) ), [ 0.2, 0, 0.2 ], [ -Math.PI/2, 0, 0 ] ]
|
|
|
+ [ new THREE.Mesh( new THREE.PlaneBufferGeometry( 0.4, 0.4 ), new GizmoMaterial( { color: 0xff00ff, opacity: 0.25 } ) ), [ 0.2, 0, 0.2 ], [ -Math.PI/2, 0, 0 ] ]
|
|
|
]
|
|
|
};
|
|
|
|