|
@@ -726,74 +726,61 @@
|
|
|
const gizmoMaterial = new THREE.MeshBasicMaterial( {
|
|
|
depthTest: false,
|
|
|
depthWrite: false,
|
|
|
- transparent: true,
|
|
|
- side: THREE.DoubleSide,
|
|
|
fog: false,
|
|
|
- toneMapped: false
|
|
|
+ toneMapped: false,
|
|
|
+ transparent: true
|
|
|
} );
|
|
|
const gizmoLineMaterial = new THREE.LineBasicMaterial( {
|
|
|
depthTest: false,
|
|
|
depthWrite: false,
|
|
|
- transparent: true,
|
|
|
- linewidth: 1,
|
|
|
fog: false,
|
|
|
- toneMapped: false
|
|
|
+ toneMapped: false,
|
|
|
+ transparent: true
|
|
|
} ); // Make unique material for each axis/color
|
|
|
|
|
|
const matInvisible = gizmoMaterial.clone();
|
|
|
matInvisible.opacity = 0.15;
|
|
|
- const matHelper = gizmoMaterial.clone();
|
|
|
- matHelper.opacity = 0.33;
|
|
|
+ const matHelper = gizmoLineMaterial.clone();
|
|
|
+ matHelper.opacity = 0.5;
|
|
|
const matRed = gizmoMaterial.clone();
|
|
|
matRed.color.setHex( 0xff0000 );
|
|
|
const matGreen = gizmoMaterial.clone();
|
|
|
matGreen.color.setHex( 0x00ff00 );
|
|
|
const matBlue = gizmoMaterial.clone();
|
|
|
matBlue.color.setHex( 0x0000ff );
|
|
|
+ const matRedTransparent = gizmoMaterial.clone();
|
|
|
+ matRedTransparent.color.setHex( 0xff0000 );
|
|
|
+ matRedTransparent.opacity = 0.5;
|
|
|
+ const matGreenTransparent = gizmoMaterial.clone();
|
|
|
+ matGreenTransparent.color.setHex( 0x00ff00 );
|
|
|
+ matGreenTransparent.opacity = 0.5;
|
|
|
+ const matBlueTransparent = gizmoMaterial.clone();
|
|
|
+ matBlueTransparent.color.setHex( 0x0000ff );
|
|
|
+ matBlueTransparent.opacity = 0.5;
|
|
|
const matWhiteTransparent = gizmoMaterial.clone();
|
|
|
matWhiteTransparent.opacity = 0.25;
|
|
|
- const matYellowTransparent = matWhiteTransparent.clone();
|
|
|
+ const matYellowTransparent = gizmoMaterial.clone();
|
|
|
matYellowTransparent.color.setHex( 0xffff00 );
|
|
|
- const matCyanTransparent = matWhiteTransparent.clone();
|
|
|
- matCyanTransparent.color.setHex( 0x00ffff );
|
|
|
- const matMagentaTransparent = matWhiteTransparent.clone();
|
|
|
- matMagentaTransparent.color.setHex( 0xff00ff );
|
|
|
+ matYellowTransparent.opacity = 0.25;
|
|
|
const matYellow = gizmoMaterial.clone();
|
|
|
matYellow.color.setHex( 0xffff00 );
|
|
|
- const matLineRed = gizmoLineMaterial.clone();
|
|
|
- matLineRed.color.setHex( 0xff0000 );
|
|
|
- const matLineGreen = gizmoLineMaterial.clone();
|
|
|
- matLineGreen.color.setHex( 0x00ff00 );
|
|
|
- const matLineBlue = gizmoLineMaterial.clone();
|
|
|
- matLineBlue.color.setHex( 0x0000ff );
|
|
|
- const matLineCyan = gizmoLineMaterial.clone();
|
|
|
- matLineCyan.color.setHex( 0x00ffff );
|
|
|
- const matLineMagenta = gizmoLineMaterial.clone();
|
|
|
- matLineMagenta.color.setHex( 0xff00ff );
|
|
|
- const matLineYellow = gizmoLineMaterial.clone();
|
|
|
- matLineYellow.color.setHex( 0xffff00 );
|
|
|
- const matLineGray = gizmoLineMaterial.clone();
|
|
|
- matLineGray.color.setHex( 0x787878 );
|
|
|
- const matLineYellowTransparent = matLineYellow.clone();
|
|
|
- matLineYellowTransparent.opacity = 0.25; // reusable geometry
|
|
|
-
|
|
|
- const arrowGeometry = new THREE.CylinderGeometry( 0, 0.05, 0.2, 12, 1, false );
|
|
|
- const scaleHandleGeometry = new THREE.BoxGeometry( 0.125, 0.125, 0.125 );
|
|
|
+ const matGray = gizmoMaterial.clone();
|
|
|
+ matGray.color.setHex( 0x787878 ); // reusable geometry
|
|
|
+
|
|
|
+ const arrowGeometry = new THREE.CylinderGeometry( 0, 0.04, 0.1, 12 );
|
|
|
+ arrowGeometry.translate( 0, 0.05, 0 );
|
|
|
+ const scaleHandleGeometry = new THREE.BoxGeometry( 0.08, 0.08, 0.08 );
|
|
|
+ scaleHandleGeometry.translate( 0, 0.04, 0 );
|
|
|
const lineGeometry = new THREE.BufferGeometry();
|
|
|
lineGeometry.setAttribute( 'position', new THREE.Float32BufferAttribute( [ 0, 0, 0, 1, 0, 0 ], 3 ) );
|
|
|
+ const lineGeometry2 = new THREE.CylinderGeometry( 0.0075, 0.0075, 0.5, 3 );
|
|
|
+ lineGeometry2.translate( 0, 0.25, 0 );
|
|
|
|
|
|
function CircleGeometry( radius, arc ) {
|
|
|
|
|
|
- const geometry = new THREE.BufferGeometry();
|
|
|
- const vertices = [];
|
|
|
-
|
|
|
- for ( let i = 0; i <= 64 * arc; ++ i ) {
|
|
|
-
|
|
|
- vertices.push( 0, Math.cos( i / 32 * Math.PI ) * radius, Math.sin( i / 32 * Math.PI ) * radius );
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- geometry.setAttribute( 'position', new THREE.Float32BufferAttribute( vertices, 3 ) );
|
|
|
+ const geometry = new THREE.TorusGeometry( radius, 0.0075, 3, 64, arc * Math.PI * 2 );
|
|
|
+ geometry.rotateY( Math.PI / 2 );
|
|
|
+ geometry.rotateX( Math.PI / 2 );
|
|
|
return geometry;
|
|
|
|
|
|
} // Special geometry for transform helper. If scaled with position vector it spans from [0,0,0] to position
|
|
@@ -809,22 +796,22 @@
|
|
|
|
|
|
|
|
|
const gizmoTranslate = {
|
|
|
- X: [[ new THREE.Mesh( arrowGeometry, matRed ), [ 1, 0, 0 ], [ 0, 0, - Math.PI / 2 ], null, 'fwd' ], [ new THREE.Mesh( arrowGeometry, matRed ), [ 1, 0, 0 ], [ 0, 0, Math.PI / 2 ], null, 'bwd' ], [ new THREE.Line( lineGeometry, matLineRed ) ]],
|
|
|
- Y: [[ new THREE.Mesh( arrowGeometry, matGreen ), [ 0, 1, 0 ], null, null, 'fwd' ], [ new THREE.Mesh( arrowGeometry, matGreen ), [ 0, 1, 0 ], [ Math.PI, 0, 0 ], null, 'bwd' ], [ new THREE.Line( lineGeometry, matLineGreen ), null, [ 0, 0, Math.PI / 2 ]]],
|
|
|
- Z: [[ new THREE.Mesh( arrowGeometry, matBlue ), [ 0, 0, 1 ], [ Math.PI / 2, 0, 0 ], null, 'fwd' ], [ new THREE.Mesh( arrowGeometry, matBlue ), [ 0, 0, 1 ], [ - Math.PI / 2, 0, 0 ], null, 'bwd' ], [ new THREE.Line( lineGeometry, matLineBlue ), null, [ 0, - Math.PI / 2, 0 ]]],
|
|
|
- XYZ: [[ new THREE.Mesh( new THREE.OctahedronGeometry( 0.1, 0 ), matWhiteTransparent.clone() ), [ 0, 0, 0 ], [ 0, 0, 0 ]]],
|
|
|
- XY: [[ new THREE.Mesh( new THREE.PlaneGeometry( 0.295, 0.295 ), matYellowTransparent.clone() ), [ 0.15, 0.15, 0 ]], [ new THREE.Line( lineGeometry, matLineYellow ), [ 0.18, 0.3, 0 ], null, [ 0.125, 1, 1 ]], [ new THREE.Line( lineGeometry, matLineYellow ), [ 0.3, 0.18, 0 ], [ 0, 0, Math.PI / 2 ], [ 0.125, 1, 1 ]]],
|
|
|
- YZ: [[ new THREE.Mesh( new THREE.PlaneGeometry( 0.295, 0.295 ), matCyanTransparent.clone() ), [ 0, 0.15, 0.15 ], [ 0, Math.PI / 2, 0 ]], [ new THREE.Line( lineGeometry, matLineCyan ), [ 0, 0.18, 0.3 ], [ 0, 0, Math.PI / 2 ], [ 0.125, 1, 1 ]], [ new THREE.Line( lineGeometry, matLineCyan ), [ 0, 0.3, 0.18 ], [ 0, - Math.PI / 2, 0 ], [ 0.125, 1, 1 ]]],
|
|
|
- XZ: [[ new THREE.Mesh( new THREE.PlaneGeometry( 0.295, 0.295 ), matMagentaTransparent.clone() ), [ 0.15, 0, 0.15 ], [ - Math.PI / 2, 0, 0 ]], [ new THREE.Line( lineGeometry, matLineMagenta ), [ 0.18, 0, 0.3 ], null, [ 0.125, 1, 1 ]], [ new THREE.Line( lineGeometry, matLineMagenta ), [ 0.3, 0, 0.18 ], [ 0, - Math.PI / 2, 0 ], [ 0.125, 1, 1 ]]]
|
|
|
+ X: [[ new THREE.Mesh( arrowGeometry, matRed ), [ 0.5, 0, 0 ], [ 0, 0, - Math.PI / 2 ]], [ new THREE.Mesh( arrowGeometry, matRed ), [ - 0.5, 0, 0 ], [ 0, 0, Math.PI / 2 ]], [ new THREE.Mesh( lineGeometry2, matRed ), [ 0, 0, 0 ], [ 0, 0, - Math.PI / 2 ]]],
|
|
|
+ Y: [[ new THREE.Mesh( arrowGeometry, matGreen ), [ 0, 0.5, 0 ]], [ new THREE.Mesh( arrowGeometry, matGreen ), [ 0, - 0.5, 0 ], [ Math.PI, 0, 0 ]], [ new THREE.Mesh( lineGeometry2, matGreen ) ]],
|
|
|
+ Z: [[ new THREE.Mesh( arrowGeometry, matBlue ), [ 0, 0, 0.5 ], [ Math.PI / 2, 0, 0 ]], [ new THREE.Mesh( arrowGeometry, matBlue ), [ 0, 0, - 0.5 ], [ - Math.PI / 2, 0, 0 ]], [ new THREE.Mesh( lineGeometry2, matBlue ), null, [ Math.PI / 2, 0, 0 ]]],
|
|
|
+ XYZ: [[ new THREE.Mesh( new THREE.OctahedronGeometry( 0.1, 0 ), matWhiteTransparent.clone() ), [ 0, 0, 0 ]]],
|
|
|
+ XY: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.15, 0.15, 0.01 ), matBlueTransparent.clone() ), [ 0.15, 0.15, 0 ]]],
|
|
|
+ YZ: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.15, 0.15, 0.01 ), matRedTransparent.clone() ), [ 0, 0.15, 0.15 ], [ 0, Math.PI / 2, 0 ]]],
|
|
|
+ XZ: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.15, 0.15, 0.01 ), matGreenTransparent.clone() ), [ 0.15, 0, 0.15 ], [ - Math.PI / 2, 0, 0 ]]]
|
|
|
};
|
|
|
const pickerTranslate = {
|
|
|
- X: [[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0.6, 0, 0 ], [ 0, 0, - Math.PI / 2 ]]],
|
|
|
- Y: [[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0, 0.6, 0 ]]],
|
|
|
- Z: [[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0, 0, 0.6 ], [ Math.PI / 2, 0, 0 ]]],
|
|
|
+ X: [[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.6, 4 ), matInvisible ), [ 0.3, 0, 0 ], [ 0, 0, - Math.PI / 2 ]], [ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.6, 4 ), matInvisible ), [ - 0.3, 0, 0 ], [ 0, 0, Math.PI / 2 ]]],
|
|
|
+ Y: [[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.6, 4 ), matInvisible ), [ 0, 0.3, 0 ]], [ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.6, 4 ), matInvisible ), [ 0, - 0.3, 0 ], [ 0, 0, Math.PI ]]],
|
|
|
+ Z: [[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.6, 4 ), matInvisible ), [ 0, 0, 0.3 ], [ Math.PI / 2, 0, 0 ]], [ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.6, 4 ), matInvisible ), [ 0, 0, - 0.3 ], [ - Math.PI / 2, 0, 0 ]]],
|
|
|
XYZ: [[ new THREE.Mesh( new THREE.OctahedronGeometry( 0.2, 0 ), matInvisible ) ]],
|
|
|
- XY: [[ new THREE.Mesh( new THREE.PlaneGeometry( 0.4, 0.4 ), matInvisible ), [ 0.2, 0.2, 0 ]]],
|
|
|
- YZ: [[ new THREE.Mesh( new THREE.PlaneGeometry( 0.4, 0.4 ), matInvisible ), [ 0, 0.2, 0.2 ], [ 0, Math.PI / 2, 0 ]]],
|
|
|
- XZ: [[ new THREE.Mesh( new THREE.PlaneGeometry( 0.4, 0.4 ), matInvisible ), [ 0.2, 0, 0.2 ], [ - Math.PI / 2, 0, 0 ]]]
|
|
|
+ XY: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.2, 0.2, 0.01 ), matInvisible ), [ 0.15, 0.15, 0 ]]],
|
|
|
+ YZ: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.2, 0.2, 0.01 ), matInvisible ), [ 0, 0.15, 0.15 ], [ 0, Math.PI / 2, 0 ]]],
|
|
|
+ XZ: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.2, 0.2, 0.01 ), matInvisible ), [ 0.15, 0, 0.15 ], [ - Math.PI / 2, 0, 0 ]]]
|
|
|
};
|
|
|
const helperTranslate = {
|
|
|
START: [[ new THREE.Mesh( new THREE.OctahedronGeometry( 0.01, 2 ), matHelper ), null, null, null, 'helper' ]],
|
|
@@ -835,43 +822,39 @@
|
|
|
Z: [[ new THREE.Line( lineGeometry, matHelper.clone() ), [ 0, 0, - 1e3 ], [ 0, - Math.PI / 2, 0 ], [ 1e6, 1, 1 ], 'helper' ]]
|
|
|
};
|
|
|
const gizmoRotate = {
|
|
|
- X: [[ new THREE.Line( CircleGeometry( 1, 0.5 ), matLineRed ) ], [ new THREE.Mesh( new THREE.OctahedronGeometry( 0.04, 0 ), matRed ), [ 0, 0, 0.99 ], null, [ 1, 3, 1 ]]],
|
|
|
- Y: [[ new THREE.Line( CircleGeometry( 1, 0.5 ), matLineGreen ), null, [ 0, 0, - Math.PI / 2 ]], [ new THREE.Mesh( new THREE.OctahedronGeometry( 0.04, 0 ), matGreen ), [ 0, 0, 0.99 ], null, [ 3, 1, 1 ]]],
|
|
|
- Z: [[ new THREE.Line( CircleGeometry( 1, 0.5 ), matLineBlue ), null, [ 0, Math.PI / 2, 0 ]], [ new THREE.Mesh( new THREE.OctahedronGeometry( 0.04, 0 ), matBlue ), [ 0.99, 0, 0 ], null, [ 1, 3, 1 ]]],
|
|
|
- E: [[ new THREE.Line( CircleGeometry( 1.25, 1 ), matLineYellowTransparent ), null, [ 0, Math.PI / 2, 0 ]], [ new THREE.Mesh( new THREE.CylinderGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 1.17, 0, 0 ], [ 0, 0, - Math.PI / 2 ], [ 1, 1, 0.001 ]], [ new THREE.Mesh( new THREE.CylinderGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ - 1.17, 0, 0 ], [ 0, 0, Math.PI / 2 ], [ 1, 1, 0.001 ]], [ new THREE.Mesh( new THREE.CylinderGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 0, - 1.17, 0 ], [ Math.PI, 0, 0 ], [ 1, 1, 0.001 ]], [ new THREE.Mesh( new THREE.CylinderGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 0, 1.17, 0 ], [ 0, 0, 0 ], [ 1, 1, 0.001 ]]],
|
|
|
- XYZE: [[ new THREE.Line( CircleGeometry( 1, 1 ), matLineGray ), null, [ 0, Math.PI / 2, 0 ]]]
|
|
|
+ XYZE: [[ new THREE.Mesh( CircleGeometry( 0.5, 1 ), matGray ), null, [ 0, Math.PI / 2, 0 ]]],
|
|
|
+ X: [[ new THREE.Mesh( CircleGeometry( 0.5, 0.5 ), matRed ) ]],
|
|
|
+ Y: [[ new THREE.Mesh( CircleGeometry( 0.5, 0.5 ), matGreen ), null, [ 0, 0, - Math.PI / 2 ]]],
|
|
|
+ Z: [[ new THREE.Mesh( CircleGeometry( 0.5, 0.5 ), matBlue ), null, [ 0, Math.PI / 2, 0 ]]],
|
|
|
+ E: [[ new THREE.Mesh( CircleGeometry( 0.75, 1 ), matYellowTransparent ), null, [ 0, Math.PI / 2, 0 ]]]
|
|
|
};
|
|
|
const helperRotate = {
|
|
|
AXIS: [[ new THREE.Line( lineGeometry, matHelper.clone() ), [ - 1e3, 0, 0 ], null, [ 1e6, 1, 1 ], 'helper' ]]
|
|
|
};
|
|
|
const pickerRotate = {
|
|
|
- X: [[ new THREE.Mesh( new THREE.TorusGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ 0, - Math.PI / 2, - Math.PI / 2 ]]],
|
|
|
- Y: [[ new THREE.Mesh( new THREE.TorusGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ Math.PI / 2, 0, 0 ]]],
|
|
|
- Z: [[ new THREE.Mesh( new THREE.TorusGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ 0, 0, - Math.PI / 2 ]]],
|
|
|
- E: [[ new THREE.Mesh( new THREE.TorusGeometry( 1.25, 0.1, 2, 24 ), matInvisible ) ]],
|
|
|
- XYZE: [[ new THREE.Mesh( new THREE.SphereGeometry( 0.7, 10, 8 ), matInvisible ) ]]
|
|
|
+ XYZE: [[ new THREE.Mesh( new THREE.SphereGeometry( 0.25, 10, 8 ), matInvisible ) ]],
|
|
|
+ X: [[ new THREE.Mesh( new THREE.TorusGeometry( 0.5, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ 0, - Math.PI / 2, - Math.PI / 2 ]]],
|
|
|
+ Y: [[ new THREE.Mesh( new THREE.TorusGeometry( 0.5, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ Math.PI / 2, 0, 0 ]]],
|
|
|
+ Z: [[ new THREE.Mesh( new THREE.TorusGeometry( 0.5, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ 0, 0, - Math.PI / 2 ]]],
|
|
|
+ E: [[ new THREE.Mesh( new THREE.TorusGeometry( 0.75, 0.1, 2, 24 ), matInvisible ) ]]
|
|
|
};
|
|
|
const gizmoScale = {
|
|
|
- X: [[ new THREE.Mesh( scaleHandleGeometry, matRed ), [ 0.8, 0, 0 ], [ 0, 0, - Math.PI / 2 ]], [ new THREE.Line( lineGeometry, matLineRed ), null, null, [ 0.8, 1, 1 ]]],
|
|
|
- Y: [[ new THREE.Mesh( scaleHandleGeometry, matGreen ), [ 0, 0.8, 0 ]], [ new THREE.Line( lineGeometry, matLineGreen ), null, [ 0, 0, Math.PI / 2 ], [ 0.8, 1, 1 ]]],
|
|
|
- Z: [[ new THREE.Mesh( scaleHandleGeometry, matBlue ), [ 0, 0, 0.8 ], [ Math.PI / 2, 0, 0 ]], [ new THREE.Line( lineGeometry, matLineBlue ), null, [ 0, - Math.PI / 2, 0 ], [ 0.8, 1, 1 ]]],
|
|
|
- XY: [[ new THREE.Mesh( scaleHandleGeometry, matYellowTransparent ), [ 0.85, 0.85, 0 ], null, [ 2, 2, 0.2 ]], [ new THREE.Line( lineGeometry, matLineYellow ), [ 0.855, 0.98, 0 ], null, [ 0.125, 1, 1 ]], [ new THREE.Line( lineGeometry, matLineYellow ), [ 0.98, 0.855, 0 ], [ 0, 0, Math.PI / 2 ], [ 0.125, 1, 1 ]]],
|
|
|
- YZ: [[ new THREE.Mesh( scaleHandleGeometry, matCyanTransparent ), [ 0, 0.85, 0.85 ], null, [ 0.2, 2, 2 ]], [ new THREE.Line( lineGeometry, matLineCyan ), [ 0, 0.855, 0.98 ], [ 0, 0, Math.PI / 2 ], [ 0.125, 1, 1 ]], [ new THREE.Line( lineGeometry, matLineCyan ), [ 0, 0.98, 0.855 ], [ 0, - Math.PI / 2, 0 ], [ 0.125, 1, 1 ]]],
|
|
|
- XZ: [[ new THREE.Mesh( scaleHandleGeometry, matMagentaTransparent ), [ 0.85, 0, 0.85 ], null, [ 2, 0.2, 2 ]], [ new THREE.Line( lineGeometry, matLineMagenta ), [ 0.855, 0, 0.98 ], null, [ 0.125, 1, 1 ]], [ new THREE.Line( lineGeometry, matLineMagenta ), [ 0.98, 0, 0.855 ], [ 0, - Math.PI / 2, 0 ], [ 0.125, 1, 1 ]]],
|
|
|
- XYZX: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 1.1, 0, 0 ]]],
|
|
|
- XYZY: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 0, 1.1, 0 ]]],
|
|
|
- XYZZ: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 0, 0, 1.1 ]]]
|
|
|
+ X: [[ new THREE.Mesh( scaleHandleGeometry, matRed ), [ 0.5, 0, 0 ], [ 0, 0, - Math.PI / 2 ]], [ new THREE.Mesh( lineGeometry2, matRed ), [ 0, 0, 0 ], [ 0, 0, - Math.PI / 2 ]], [ new THREE.Mesh( scaleHandleGeometry, matRed ), [ - 0.5, 0, 0 ], [ 0, 0, Math.PI / 2 ]]],
|
|
|
+ Y: [[ new THREE.Mesh( scaleHandleGeometry, matGreen ), [ 0, 0.5, 0 ]], [ new THREE.Mesh( lineGeometry2, matGreen ) ], [ new THREE.Mesh( scaleHandleGeometry, matGreen ), [ 0, - 0.5, 0 ], [ 0, 0, Math.PI ]]],
|
|
|
+ Z: [[ new THREE.Mesh( scaleHandleGeometry, matBlue ), [ 0, 0, 0.5 ], [ Math.PI / 2, 0, 0 ]], [ new THREE.Mesh( lineGeometry2, matBlue ), [ 0, 0, 0 ], [ Math.PI / 2, 0, 0 ]], [ new THREE.Mesh( scaleHandleGeometry, matBlue ), [ 0, 0, - 0.5 ], [ - Math.PI / 2, 0, 0 ]]],
|
|
|
+ XY: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.15, 0.15, 0.01 ), matBlueTransparent ), [ 0.15, 0.15, 0 ]]],
|
|
|
+ YZ: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.15, 0.15, 0.01 ), matRedTransparent ), [ 0, 0.15, 0.15 ], [ 0, Math.PI / 2, 0 ]]],
|
|
|
+ XZ: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.15, 0.15, 0.01 ), matGreenTransparent ), [ 0.15, 0, 0.15 ], [ - Math.PI / 2, 0, 0 ]]],
|
|
|
+ XYZ: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.1, 0.1, 0.1 ), matWhiteTransparent.clone() ) ]]
|
|
|
};
|
|
|
const pickerScale = {
|
|
|
- X: [[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0.5, 0, 0 ], [ 0, 0, - Math.PI / 2 ]]],
|
|
|
- Y: [[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0, 0.5, 0 ]]],
|
|
|
- Z: [[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0, 0, 0.5 ], [ Math.PI / 2, 0, 0 ]]],
|
|
|
- XY: [[ new THREE.Mesh( scaleHandleGeometry, matInvisible ), [ 0.85, 0.85, 0 ], null, [ 3, 3, 0.2 ]]],
|
|
|
- YZ: [[ new THREE.Mesh( scaleHandleGeometry, matInvisible ), [ 0, 0.85, 0.85 ], null, [ 0.2, 3, 3 ]]],
|
|
|
- XZ: [[ new THREE.Mesh( scaleHandleGeometry, matInvisible ), [ 0.85, 0, 0.85 ], null, [ 3, 0.2, 3 ]]],
|
|
|
- XYZX: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 1.1, 0, 0 ]]],
|
|
|
- XYZY: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 0, 1.1, 0 ]]],
|
|
|
- XYZZ: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 0, 0, 1.1 ]]]
|
|
|
+ X: [[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.6, 4 ), matInvisible ), [ 0.3, 0, 0 ], [ 0, 0, - Math.PI / 2 ]], [ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.6, 4 ), matInvisible ), [ - 0.3, 0, 0 ], [ 0, 0, Math.PI / 2 ]]],
|
|
|
+ Y: [[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.6, 4 ), matInvisible ), [ 0, 0.3, 0 ]], [ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.6, 4 ), matInvisible ), [ 0, - 0.3, 0 ], [ 0, 0, Math.PI ]]],
|
|
|
+ Z: [[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.6, 4 ), matInvisible ), [ 0, 0, 0.3 ], [ Math.PI / 2, 0, 0 ]], [ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.6, 4 ), matInvisible ), [ 0, 0, - 0.3 ], [ - Math.PI / 2, 0, 0 ]]],
|
|
|
+ XY: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.2, 0.2, 0.01 ), matInvisible ), [ 0.15, 0.15, 0 ]]],
|
|
|
+ YZ: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.2, 0.2, 0.01 ), matInvisible ), [ 0, 0.15, 0.15 ], [ 0, Math.PI / 2, 0 ]]],
|
|
|
+ XZ: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.2, 0.2, 0.01 ), matInvisible ), [ 0.15, 0, 0.15 ], [ - Math.PI / 2, 0, 0 ]]],
|
|
|
+ XYZ: [[ new THREE.Mesh( new THREE.BoxGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 0, 0, 0 ]]]
|
|
|
};
|
|
|
const helperScale = {
|
|
|
X: [[ new THREE.Line( lineGeometry, matHelper.clone() ), [ - 1e3, 0, 0 ], null, [ 1e6, 1, 1 ], 'helper' ]],
|
|
@@ -989,7 +972,7 @@
|
|
|
|
|
|
}
|
|
|
|
|
|
- handle.scale.set( 1, 1, 1 ).multiplyScalar( factor * this.size / 7 ); // TODO: simplify helpers and consider decoupling from gizmo
|
|
|
+ handle.scale.set( 1, 1, 1 ).multiplyScalar( factor * this.size / 4 ); // TODO: simplify helpers and consider decoupling from gizmo
|
|
|
|
|
|
if ( handle.tag === 'helper' ) {
|
|
|
|
|
@@ -1117,9 +1100,8 @@
|
|
|
// Hide translate and scale axis facing the camera
|
|
|
const AXIS_HIDE_TRESHOLD = 0.99;
|
|
|
const PLANE_HIDE_TRESHOLD = 0.2;
|
|
|
- const AXIS_FLIP_TRESHOLD = 0.0;
|
|
|
|
|
|
- if ( handle.name === 'X' || handle.name === 'XYZX' ) {
|
|
|
+ if ( handle.name === 'X' ) {
|
|
|
|
|
|
if ( Math.abs( _alignVector.copy( _unitX ).applyQuaternion( quaternion ).dot( this.eye ) ) > AXIS_HIDE_TRESHOLD ) {
|
|
|
|
|
@@ -1130,7 +1112,7 @@
|
|
|
|
|
|
}
|
|
|
|
|
|
- if ( handle.name === 'Y' || handle.name === 'XYZY' ) {
|
|
|
+ if ( handle.name === 'Y' ) {
|
|
|
|
|
|
if ( Math.abs( _alignVector.copy( _unitY ).applyQuaternion( quaternion ).dot( this.eye ) ) > AXIS_HIDE_TRESHOLD ) {
|
|
|
|
|
@@ -1141,7 +1123,7 @@
|
|
|
|
|
|
}
|
|
|
|
|
|
- if ( handle.name === 'Z' || handle.name === 'XYZZ' ) {
|
|
|
+ if ( handle.name === 'Z' ) {
|
|
|
|
|
|
if ( Math.abs( _alignVector.copy( _unitZ ).applyQuaternion( quaternion ).dot( this.eye ) ) > AXIS_HIDE_TRESHOLD ) {
|
|
|
|
|
@@ -1183,73 +1165,6 @@
|
|
|
|
|
|
}
|
|
|
|
|
|
- } // Flip translate and scale axis ocluded behind another axis
|
|
|
-
|
|
|
-
|
|
|
- if ( handle.name.search( 'X' ) !== - 1 ) {
|
|
|
-
|
|
|
- if ( _alignVector.copy( _unitX ).applyQuaternion( quaternion ).dot( this.eye ) < AXIS_FLIP_TRESHOLD ) {
|
|
|
-
|
|
|
- if ( handle.tag === 'fwd' ) {
|
|
|
-
|
|
|
- handle.visible = false;
|
|
|
-
|
|
|
- } else {
|
|
|
-
|
|
|
- handle.scale.x *= - 1;
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- } else if ( handle.tag === 'bwd' ) {
|
|
|
-
|
|
|
- handle.visible = false;
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- if ( handle.name.search( 'Y' ) !== - 1 ) {
|
|
|
-
|
|
|
- if ( _alignVector.copy( _unitY ).applyQuaternion( quaternion ).dot( this.eye ) < AXIS_FLIP_TRESHOLD ) {
|
|
|
-
|
|
|
- if ( handle.tag === 'fwd' ) {
|
|
|
-
|
|
|
- handle.visible = false;
|
|
|
-
|
|
|
- } else {
|
|
|
-
|
|
|
- handle.scale.y *= - 1;
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- } else if ( handle.tag === 'bwd' ) {
|
|
|
-
|
|
|
- handle.visible = false;
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- if ( handle.name.search( 'Z' ) !== - 1 ) {
|
|
|
-
|
|
|
- if ( _alignVector.copy( _unitZ ).applyQuaternion( quaternion ).dot( this.eye ) < AXIS_FLIP_TRESHOLD ) {
|
|
|
-
|
|
|
- if ( handle.tag === 'fwd' ) {
|
|
|
-
|
|
|
- handle.visible = false;
|
|
|
-
|
|
|
- } else {
|
|
|
-
|
|
|
- handle.scale.z *= - 1;
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- } else if ( handle.tag === 'bwd' ) {
|
|
|
-
|
|
|
- handle.visible = false;
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
}
|
|
|
|
|
|
} else if ( this.mode === 'rotate' ) {
|