spoint 0.1.0 → 0.1.10

package/client/editor/js/Script.js

@@ -0,0 +1,503 @@
+import { UIElement, UIPanel, UIText } from './libs/ui.js';
+
+import { SetScriptValueCommand } from './commands/SetScriptValueCommand.js';
+import { SetMaterialValueCommand } from './commands/SetMaterialValueCommand.js';
+
+function Script( editor ) {
+
+	const signals = editor.signals;
+	const strings = editor.strings;
+
+	const container = new UIPanel();
+	container.setId( 'script' );
+	container.setPosition( 'absolute' );
+	container.setBackgroundColor( '#272822' );
+	container.setDisplay( 'none' );
+
+	const header = new UIPanel();
+	header.setPadding( '10px' );
+	container.add( header );
+
+	const title = new UIText().setColor( '#fff' );
+	header.add( title );
+
+	const buttonSVG = ( function () {
+
+		const svg = document.createElementNS( 'http://www.w3.org/2000/svg', 'svg' );
+		svg.setAttribute( 'width', 32 );
+		svg.setAttribute( 'height', 32 );
+		const path = document.createElementNS( 'http://www.w3.org/2000/svg', 'path' );
+		path.setAttribute( 'd', 'M 12,12 L 22,22 M 22,12 12,22' );
+		path.setAttribute( 'stroke', '#fff' );
+		svg.appendChild( path );
+		return svg;
+
+	} )();
+
+	const close = new UIElement( buttonSVG );
+	close.setPosition( 'absolute' );
+	close.setTop( '3px' );
+	close.setRight( '1px' );
+	close.setCursor( 'pointer' );
+	close.onClick( function () {
+
+		container.setDisplay( 'none' );
+
+	} );
+	header.add( close );
+
+
+	let renderer;
+
+	signals.rendererCreated.add( function ( newRenderer ) {
+
+		renderer = newRenderer;
+
+	} );
+
+
+	let delay;
+	let currentMode;
+	let currentScript;
+	let currentObject;
+
+	const codemirror = CodeMirror( container.dom, {
+		value: '',
+		lineNumbers: true,
+		matchBrackets: true,
+		indentWithTabs: true,
+		tabSize: 4,
+		indentUnit: 4,
+		hintOptions: {
+			completeSingle: false
+		}
+	} );
+	codemirror.setOption( 'theme', 'monokai' );
+	codemirror.on( 'change', function () {
+
+		if ( codemirror.state.focused === false ) return;
+
+		clearTimeout( delay );
+		delay = setTimeout( function () {
+
+			const value = codemirror.getValue();
+
+			if ( ! validate( value ) ) return;
+
+			if ( typeof ( currentScript ) === 'object' ) {
+
+				if ( value !== currentScript.source ) {
+
+					editor.execute( new SetScriptValueCommand( editor, currentObject, currentScript, 'source', value ) );
+
+				}
+
+				return;
+
+			}
+
+			if ( currentScript !== 'programInfo' ) return;
+
+			const json = JSON.parse( value );
+
+			if ( JSON.stringify( currentObject.material.defines ) !== JSON.stringify( json.defines ) ) {
+
+				const cmd = new SetMaterialValueCommand( editor, currentObject, 'defines', json.defines );
+				cmd.updatable = false;
+				editor.execute( cmd );
+
+			}
+
+			if ( JSON.stringify( currentObject.material.uniforms ) !== JSON.stringify( json.uniforms ) ) {
+
+				const cmd = new SetMaterialValueCommand( editor, currentObject, 'uniforms', json.uniforms );
+				cmd.updatable = false;
+				editor.execute( cmd );
+
+			}
+
+			if ( JSON.stringify( currentObject.material.attributes ) !== JSON.stringify( json.attributes ) ) {
+
+				const cmd = new SetMaterialValueCommand( editor, currentObject, 'attributes', json.attributes );
+				cmd.updatable = false;
+				editor.execute( cmd );
+
+			}
+
+		}, 300 );
+
+	} );
+
+	// prevent backspace from deleting objects
+	const wrapper = codemirror.getWrapperElement();
+	wrapper.addEventListener( 'keydown', function ( event ) {
+
+		event.stopPropagation();
+
+	} );
+
+	// validate
+
+	const errorLines = [];
+	const widgets = [];
+
+	const validate = function ( string ) {
+
+		let valid;
+		let errors = [];
+
+		return codemirror.operation( function () {
+
+			while ( errorLines.length > 0 ) {
+
+				codemirror.removeLineClass( errorLines.shift(), 'background', 'errorLine' );
+
+			}
+
+			while ( widgets.length > 0 ) {
+
+				codemirror.removeLineWidget( widgets.shift() );
+
+			}
+
+			//
+
+			switch ( currentMode ) {
+
+				case 'javascript':
+
+					try {
+
+						const syntax = esprima.parse( string, { tolerant: true } );
+						errors = syntax.errors;
+
+					} catch ( error ) {
+
+						errors.push( {
+
+							lineNumber: error.lineNumber - 1,
+							message: error.message
+
+						} );
+
+					}
+
+					for ( let i = 0; i < errors.length; i ++ ) {
+
+						const error = errors[ i ];
+						error.message = error.message.replace( /Line [0-9]+: /, '' );
+
+					}
+
+					break;
+
+				case 'json':
+
+					errors = [];
+
+					jsonlint.parseError = function ( message, info ) {
+
+						message = message.split( '\n' )[ 3 ];
+
+						errors.push( {
+
+							lineNumber: info.loc.first_line - 1,
+							message: message
+
+						} );
+
+					};
+
+					try {
+
+						jsonlint.parse( string );
+
+					} catch ( error ) {
+
+						// ignore failed error recovery
+
+					}
+
+					break;
+
+				case 'glsl':
+
+					currentObject.material[ currentScript ] = string;
+					currentObject.material.needsUpdate = true;
+					signals.materialChanged.dispatch( currentObject, 0 ); // TODO: Add multi-material support
+
+					const programs = renderer.info.programs;
+
+					valid = true;
+					const parseMessage = /^(?:ERROR|WARNING): \d+:(\d+): (.*)/g;
+
+					for ( let i = 0, n = programs.length; i !== n; ++ i ) {
+
+						const diagnostics = programs[ i ].diagnostics;
+
+						if ( diagnostics === undefined ||
+								diagnostics.material !== currentObject.material ) continue;
+
+						if ( ! diagnostics.runnable ) valid = false;
+
+						const shaderInfo = diagnostics[ currentScript ];
+						const lineOffset = shaderInfo.prefix.split( /\r\n|\r|\n/ ).length;
+
+						while ( true ) {
+
+							const parseResult = parseMessage.exec( shaderInfo.log );
+							if ( parseResult === null ) break;
+
+							errors.push( {
+
+								lineNumber: parseResult[ 1 ] - lineOffset,
+								message: parseResult[ 2 ]
+
+							} );
+
+						} // messages
+
+						break;
+
+					} // programs
+
+			} // mode switch
+
+			for ( let i = 0; i < errors.length; i ++ ) {
+
+				const error = errors[ i ];
+
+				const message = document.createElement( 'div' );
+				message.className = 'esprima-error';
+				message.textContent = error.message;
+
+				const lineNumber = Math.max( error.lineNumber, 0 );
+				errorLines.push( lineNumber );
+
+				codemirror.addLineClass( lineNumber, 'background', 'errorLine' );
+
+				const widget = codemirror.addLineWidget( lineNumber, message );
+
+				widgets.push( widget );
+
+			}
+
+			return valid !== undefined ? valid : errors.length === 0;
+
+		} );
+
+	};
+
+	// tern js autocomplete
+
+	const server = new CodeMirror.TernServer( {
+		caseInsensitive: true,
+		plugins: { threejs: null }
+	} );
+
+	codemirror.setOption( 'extraKeys', {
+		'Ctrl-Space': function ( cm ) {
+
+			server.complete( cm );
+
+		},
+		'Ctrl-I': function ( cm ) {
+
+			server.showType( cm );
+
+		},
+		'Ctrl-O': function ( cm ) {
+
+			server.showDocs( cm );
+
+		},
+		'Alt-.': function ( cm ) {
+
+			server.jumpToDef( cm );
+
+		},
+		'Alt-,': function ( cm ) {
+
+			server.jumpBack( cm );
+
+		},
+		'Ctrl-Q': function ( cm ) {
+
+			server.rename( cm );
+
+		},
+		'Ctrl-.': function ( cm ) {
+
+			server.selectName( cm );
+
+		}
+	} );
+
+	codemirror.on( 'cursorActivity', function ( cm ) {
+
+		if ( currentMode !== 'javascript' ) return;
+		server.updateArgHints( cm );
+
+	} );
+
+	codemirror.on( 'keypress', function ( cm, kb ) {
+
+		if ( currentMode !== 'javascript' ) return;
+		if ( /[\w\.]/.exec( kb.key ) ) {
+
+			server.complete( cm );
+
+		}
+
+	} );
+
+
+	//
+
+	signals.editorCleared.add( function () {
+
+		container.setDisplay( 'none' );
+
+	} );
+
+	function setTitle( object, script ) {
+
+		if ( typeof script === 'object' ) {
+
+			title.setValue( object.name + ' / ' + script.name );
+
+		} else {
+
+			switch ( script ) {
+
+				case 'vertexShader':
+
+					title.setValue( object.material.name + ' / ' + strings.getKey( 'script/title/vertexShader' ) );
+					break;
+
+				case 'fragmentShader':
+
+					title.setValue( object.material.name + ' / ' + strings.getKey( 'script/title/fragmentShader' ) );
+					break;
+
+				case 'programInfo':
+
+					title.setValue( object.material.name + ' / ' + strings.getKey( 'script/title/programInfo' ) );
+					break;
+
+				default:
+
+					throw new Error( 'setTitle: Unknown script' );
+
+			}
+
+		}
+
+	}
+
+	signals.editScript.add( function ( object, script ) {
+
+		let mode, source;
+
+		if ( typeof ( script ) === 'object' ) {
+
+			mode = 'javascript';
+			source = script.source;
+
+		} else {
+
+			switch ( script ) {
+
+				case 'vertexShader':
+
+					mode = 'glsl';
+					source = object.material.vertexShader || '';
+
+					break;
+
+				case 'fragmentShader':
+
+					mode = 'glsl';
+					source = object.material.fragmentShader || '';
+
+					break;
+
+				case 'programInfo':
+
+					mode = 'json';
+					const json = {
+						defines: object.material.defines,
+						uniforms: object.material.uniforms,
+						attributes: object.material.attributes
+					};
+					source = JSON.stringify( json, null, '\t' );
+
+					break;
+
+				default:
+
+					throw new Error( 'editScript: Unknown script' );
+
+			}
+
+		}
+
+		setTitle( object, script );
+
+		currentMode = mode;
+		currentScript = script;
+		currentObject = object;
+
+		container.setDisplay( '' );
+		codemirror.setValue( source );
+		codemirror.clearHistory();
+		if ( mode === 'json' ) mode = { name: 'javascript', json: true };
+		codemirror.setOption( 'mode', mode );
+
+	} );
+
+	signals.scriptRemoved.add( function ( script ) {
+
+		if ( currentScript === script ) {
+
+			container.setDisplay( 'none' );
+
+		}
+
+	} );
+
+	signals.objectChanged.add( function ( object ) {
+
+		if ( object !== currentObject ) return;
+
+		if ( [ 'programInfo', 'vertexShader', 'fragmentShader' ].includes( currentScript ) ) return;
+
+		setTitle( currentObject, currentScript );
+
+	} );
+
+	signals.scriptChanged.add( function ( script ) {
+
+		if ( script === currentScript ) {
+
+			setTitle( currentObject, currentScript );
+
+		}
+
+	} );
+
+	signals.materialChanged.add( function ( object, slot ) {
+
+		if ( object !== currentObject ) return;
+
+		// TODO: Adds multi-material support
+
+		setTitle( currentObject, currentScript );
+
+	} );
+
+	return container;
+
+}
+
+export { Script };

package/client/editor/js/Selector.js

@@ -0,0 +1,102 @@
+import * as THREE from 'three';
+
+const mouse = new THREE.Vector2();
+const raycaster = new THREE.Raycaster();
+
+class Selector {
+
+	constructor( editor ) {
+
+		const signals = editor.signals;
+
+		this.editor = editor;
+		this.signals = signals;
+
+		// signals
+
+		signals.intersectionsDetected.add( ( intersects ) => {
+
+			if ( intersects.length > 0 ) {
+
+				const object = intersects[ 0 ].object;
+
+				if ( object.userData.object !== undefined ) {
+
+					// helper
+
+					this.select( object.userData.object );
+
+				} else {
+
+					this.select( object );
+
+				}
+
+			} else {
+
+				this.select( null );
+
+			}
+
+		} );
+
+	}
+
+	getIntersects( raycaster ) {
+
+		const objects = [];
+
+		this.editor.scene.traverseVisible( function ( child ) {
+
+			objects.push( child );
+
+		} );
+
+		this.editor.sceneHelpers.traverseVisible( function ( child ) {
+
+			if ( child.name === 'picker' ) objects.push( child );
+
+		} );
+
+		return raycaster.intersectObjects( objects, false );
+
+	}
+
+	getPointerIntersects( point, camera ) {
+
+		mouse.set( ( point.x * 2 ) - 1, - ( point.y * 2 ) + 1 );
+
+		raycaster.setFromCamera( mouse, camera );
+
+		return this.getIntersects( raycaster );
+
+	}
+
+	select( object ) {
+
+		if ( this.editor.selected === object ) return;
+
+		let uuid = null;
+
+		if ( object !== null ) {
+
+			uuid = object.uuid;
+
+		}
+
+		this.editor.selected = object;
+		this.editor.config.setKey( 'selected', uuid );
+
+		this.signals.objectSelected.dispatch( object );
+
+	}
+
+	deselect() {
+
+		this.select( null );
+
+	}
+
+}
+
+export { Selector };

package/client/editor/js/Sidebar.Geometry.BoxGeometry.js

@@ -0,0 +1,121 @@
+import * as THREE from 'three';
+
+import { UIDiv, UIRow, UIText, UINumber, UIInteger } from './libs/ui.js';
+
+import { SetGeometryCommand } from './commands/SetGeometryCommand.js';
+
+function GeometryParametersPanel( editor, object ) {
+
+	const strings = editor.strings;
+	const signals = editor.signals;
+
+	const container = new UIDiv();
+
+	const geometry = object.geometry;
+	const parameters = geometry.parameters;
+
+	// width
+
+	const widthRow = new UIRow();
+	const width = new UINumber().setPrecision( 3 ).setValue( parameters.width ).onChange( update );
+
+	widthRow.add( new UIText( strings.getKey( 'sidebar/geometry/box_geometry/width' ) ).setClass( 'Label' ) );
+	widthRow.add( width );
+
+	container.add( widthRow );
+
+	// height
+
+	const heightRow = new UIRow();
+	const height = new UINumber().setPrecision( 3 ).setValue( parameters.height ).onChange( update );
+
+	heightRow.add( new UIText( strings.getKey( 'sidebar/geometry/box_geometry/height' ) ).setClass( 'Label' ) );
+	heightRow.add( height );
+
+	container.add( heightRow );
+
+	// depth
+
+	const depthRow = new UIRow();
+	const depth = new UINumber().setPrecision( 3 ).setValue( parameters.depth ).onChange( update );
+
+	depthRow.add( new UIText( strings.getKey( 'sidebar/geometry/box_geometry/depth' ) ).setClass( 'Label' ) );
+	depthRow.add( depth );
+
+	container.add( depthRow );
+
+	// widthSegments
+
+	const widthSegmentsRow = new UIRow();
+	const widthSegments = new UIInteger( parameters.widthSegments ).setRange( 1, Infinity ).onChange( update );
+
+	widthSegmentsRow.add( new UIText( strings.getKey( 'sidebar/geometry/box_geometry/widthseg' ) ).setClass( 'Label' ) );
+	widthSegmentsRow.add( widthSegments );
+
+	container.add( widthSegmentsRow );
+
+	// heightSegments
+
+	const heightSegmentsRow = new UIRow();
+	const heightSegments = new UIInteger( parameters.heightSegments ).setRange( 1, Infinity ).onChange( update );
+
+	heightSegmentsRow.add( new UIText( strings.getKey( 'sidebar/geometry/box_geometry/heightseg' ) ).setClass( 'Label' ) );
+	heightSegmentsRow.add( heightSegments );
+
+	container.add( heightSegmentsRow );
+
+	// depthSegments
+
+	const depthSegmentsRow = new UIRow();
+	const depthSegments = new UIInteger( parameters.depthSegments ).setRange( 1, Infinity ).onChange( update );
+
+	depthSegmentsRow.add( new UIText( strings.getKey( 'sidebar/geometry/box_geometry/depthseg' ) ).setClass( 'Label' ) );
+	depthSegmentsRow.add( depthSegments );
+
+	container.add( depthSegmentsRow );
+
+	//
+
+	function refreshUI() {
+
+		const parameters = object.geometry.parameters;
+
+		width.setValue( parameters.width );
+		height.setValue( parameters.height );
+		depth.setValue( parameters.depth );
+		widthSegments.setValue( parameters.widthSegments );
+		heightSegments.setValue( parameters.heightSegments );
+		depthSegments.setValue( parameters.depthSegments );
+
+	}
+
+	signals.geometryChanged.add( function ( mesh ) {
+
+		if ( mesh === object ) {
+
+			refreshUI();
+
+		}
+
+	} );
+
+	//
+
+	function update() {
+
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.BoxGeometry(
+			width.getValue(),
+			height.getValue(),
+			depth.getValue(),
+			widthSegments.getValue(),
+			heightSegments.getValue(),
+			depthSegments.getValue()
+		) ) );
+
+	}
+
+	return container;
+
+}
+
+export { GeometryParametersPanel };