spoint 0.1.0 → 0.1.10

package/client/editor/js/commands/AddObjectCommand.js

@@ -0,0 +1,68 @@
+import { Command } from '../Command.js';
+import { ObjectLoader } from 'three';
+
+/**
+ * @param editor Editor
+ * @param object THREE.Object3D
+ * @constructor
+ */
+class AddObjectCommand extends Command {
+
+	constructor( editor, object = null ) {
+
+		super( editor );
+
+		this.type = 'AddObjectCommand';
+
+		this.object = object;
+
+		if ( object !== null ) {
+
+			this.name = editor.strings.getKey( 'command/AddObject' ) + ': ' + object.name;
+
+		}
+
+	}
+
+	execute() {
+
+		this.editor.addObject( this.object );
+		this.editor.select( this.object );
+
+	}
+
+	undo() {
+
+		this.editor.removeObject( this.object );
+		this.editor.deselect();
+
+	}
+
+	toJSON() {
+
+		const output = super.toJSON( this );
+
+		output.object = this.object.toJSON();
+
+		return output;
+
+	}
+
+	fromJSON( json ) {
+
+		super.fromJSON( json );
+
+		this.object = this.editor.objectByUuid( json.object.object.uuid );
+
+		if ( this.object === undefined ) {
+
+			const loader = new ObjectLoader();
+			this.object = loader.parse( json.object );
+
+		}
+
+	}
+
+}
+
+export { AddObjectCommand };

package/client/editor/js/commands/AddScriptCommand.js

@@ -0,0 +1,75 @@
+import { Command } from '../Command.js';
+
+/**
+ * @param editor Editor
+ * @param object THREE.Object3D
+ * @param script javascript object
+ * @constructor
+ */
+class AddScriptCommand extends Command {
+
+	constructor( editor, object = null, script = '' ) {
+
+		super( editor );
+
+		this.type = 'AddScriptCommand';
+		this.name = editor.strings.getKey( 'command/AddScript' );
+
+		this.object = object;
+		this.script = script;
+
+	}
+
+	execute() {
+
+		if ( this.editor.scripts[ this.object.uuid ] === undefined ) {
+
+			this.editor.scripts[ this.object.uuid ] = [];
+
+		}
+
+		this.editor.scripts[ this.object.uuid ].push( this.script );
+
+		this.editor.signals.scriptAdded.dispatch( this.script );
+
+	}
+
+	undo() {
+
+		if ( this.editor.scripts[ this.object.uuid ] === undefined ) return;
+
+		const index = this.editor.scripts[ this.object.uuid ].indexOf( this.script );
+
+		if ( index !== - 1 ) {
+
+			this.editor.scripts[ this.object.uuid ].splice( index, 1 );
+
+		}
+
+		this.editor.signals.scriptRemoved.dispatch( this.script );
+
+	}
+
+	toJSON() {
+
+		const output = super.toJSON( this );
+
+		output.objectUuid = this.object.uuid;
+		output.script = this.script;
+
+		return output;
+
+	}
+
+	fromJSON( json ) {
+
+		super.fromJSON( json );
+
+		this.script = json.script;
+		this.object = this.editor.objectByUuid( json.objectUuid );
+
+	}
+
+}
+
+export { AddScriptCommand };

package/client/editor/js/commands/Commands.js

@@ -0,0 +1,23 @@
+export { AddObjectCommand } from './AddObjectCommand.js';
+export { AddScriptCommand } from './AddScriptCommand.js';
+export { MoveObjectCommand } from './MoveObjectCommand.js';
+export { MultiCmdsCommand } from './MultiCmdsCommand.js';
+export { RemoveObjectCommand } from './RemoveObjectCommand.js';
+export { RemoveScriptCommand } from './RemoveScriptCommand.js';
+export { SetColorCommand } from './SetColorCommand.js';
+export { SetGeometryCommand } from './SetGeometryCommand.js';
+export { SetGeometryValueCommand } from './SetGeometryValueCommand.js';
+export { SetMaterialColorCommand } from './SetMaterialColorCommand.js';
+export { SetMaterialCommand } from './SetMaterialCommand.js';
+export { SetMaterialMapCommand } from './SetMaterialMapCommand.js';
+export { SetMaterialRangeCommand } from './SetMaterialRangeCommand.js';
+export { SetMaterialValueCommand } from './SetMaterialValueCommand.js';
+export { SetMaterialVectorCommand } from './SetMaterialVectorCommand.js';
+export { SetPositionCommand } from './SetPositionCommand.js';
+export { SetRotationCommand } from './SetRotationCommand.js';
+export { SetScaleCommand } from './SetScaleCommand.js';
+export { SetSceneCommand } from './SetSceneCommand.js';
+export { SetScriptValueCommand } from './SetScriptValueCommand.js';
+export { SetShadowValueCommand } from './SetShadowValueCommand.js';
+export { SetUuidCommand } from './SetUuidCommand.js';
+export { SetValueCommand } from './SetValueCommand.js';

package/client/editor/js/commands/MoveObjectCommand.js

@@ -0,0 +1,111 @@
+import { Command } from '../Command.js';
+
+/**
+ * @param editor Editor
+ * @param object THREE.Object3D
+ * @param newParent THREE.Object3D
+ * @param newBefore THREE.Object3D
+ * @constructor
+ */
+class MoveObjectCommand extends Command {
+
+	constructor( editor, object = null, newParent = null, newBefore = null ) {
+
+		super( editor );
+
+		this.type = 'MoveObjectCommand';
+		this.name = editor.strings.getKey( 'command/MoveObject' );
+
+		this.object = object;
+		this.oldParent = ( object !== null ) ? object.parent : null;
+		this.oldIndex = ( this.oldParent !== null ) ? this.oldParent.children.indexOf( this.object ) : null;
+		this.newParent = newParent;
+
+		if ( newBefore !== null ) {
+
+			this.newIndex = ( newParent !== null ) ? newParent.children.indexOf( newBefore ) : null;
+
+		} else {
+
+			this.newIndex = ( newParent !== null ) ? newParent.children.length : null;
+
+		}
+
+		if ( this.oldParent === this.newParent && this.newIndex > this.oldIndex ) {
+
+			this.newIndex --;
+
+		}
+
+		this.newBefore = newBefore;
+
+	}
+
+	execute() {
+
+		this.oldParent.remove( this.object );
+
+		const children = this.newParent.children;
+		children.splice( this.newIndex, 0, this.object );
+		this.object.parent = this.newParent;
+
+		this.object.dispatchEvent( { type: 'added' } );
+		this.editor.signals.sceneGraphChanged.dispatch();
+
+	}
+
+	undo() {
+
+		this.newParent.remove( this.object );
+
+		const children = this.oldParent.children;
+		children.splice( this.oldIndex, 0, this.object );
+		this.object.parent = this.oldParent;
+
+		this.object.dispatchEvent( { type: 'added' } );
+		this.editor.signals.sceneGraphChanged.dispatch();
+
+	}
+
+	toJSON() {
+
+		const output = super.toJSON( this );
+
+		output.objectUuid = this.object.uuid;
+		output.newParentUuid = this.newParent.uuid;
+		output.oldParentUuid = this.oldParent.uuid;
+		output.newIndex = this.newIndex;
+		output.oldIndex = this.oldIndex;
+
+		return output;
+
+	}
+
+	fromJSON( json ) {
+
+		super.fromJSON( json );
+
+		this.object = this.editor.objectByUuid( json.objectUuid );
+		this.oldParent = this.editor.objectByUuid( json.oldParentUuid );
+		if ( this.oldParent === undefined ) {
+
+			this.oldParent = this.editor.scene;
+
+		}
+
+		this.newParent = this.editor.objectByUuid( json.newParentUuid );
+
+		if ( this.newParent === undefined ) {
+
+			this.newParent = this.editor.scene;
+
+		}
+
+		this.newIndex = json.newIndex;
+		this.oldIndex = json.oldIndex;
+
+	}
+
+}
+
+export { MoveObjectCommand };

package/client/editor/js/commands/MultiCmdsCommand.js

@@ -0,0 +1,85 @@
+import { Command } from '../Command.js';
+
+/**
+ * @param editor Editor
+ * @param cmdArray array containing command objects
+ * @constructor
+ */
+class MultiCmdsCommand extends Command {
+
+	constructor( editor, cmdArray = [] ) {
+
+		super( editor );
+
+		this.type = 'MultiCmdsCommand';
+		this.name = editor.strings.getKey( 'command/MultiCmds' );
+
+		this.cmdArray = cmdArray;
+
+	}
+
+	execute() {
+
+		this.editor.signals.sceneGraphChanged.active = false;
+
+		for ( let i = 0; i < this.cmdArray.length; i ++ ) {
+
+			this.cmdArray[ i ].execute();
+
+		}
+
+		this.editor.signals.sceneGraphChanged.active = true;
+		this.editor.signals.sceneGraphChanged.dispatch();
+
+	}
+
+	undo() {
+
+		this.editor.signals.sceneGraphChanged.active = false;
+
+		for ( let i = this.cmdArray.length - 1; i >= 0; i -- ) {
+
+			this.cmdArray[ i ].undo();
+
+		}
+
+		this.editor.signals.sceneGraphChanged.active = true;
+		this.editor.signals.sceneGraphChanged.dispatch();
+
+	}
+
+	toJSON() {
+
+		const output = super.toJSON( this );
+
+		const cmds = [];
+		for ( let i = 0; i < this.cmdArray.length; i ++ ) {
+
+			cmds.push( this.cmdArray[ i ].toJSON() );
+
+		}
+
+		output.cmds = cmds;
+
+		return output;
+
+	}
+
+	fromJSON( json ) {
+
+		super.fromJSON( json );
+
+		const cmds = json.cmds;
+		for ( let i = 0; i < cmds.length; i ++ ) {
+
+			const cmd = new window[ cmds[ i ].type ]();	// creates a new object of type "json.type"
+			cmd.fromJSON( cmds[ i ] );
+			this.cmdArray.push( cmd );
+
+		}
+
+	}
+
+}
+
+export { MultiCmdsCommand };

package/client/editor/js/commands/RemoveObjectCommand.js

@@ -0,0 +1,88 @@
+import { Command } from '../Command.js';
+
+import { ObjectLoader } from 'three';
+
+/**
+ * @param editor Editor
+ * @param object THREE.Object3D
+ * @constructor
+ */
+class RemoveObjectCommand extends Command {
+
+	constructor( editor, object = null ) {
+
+		super( editor );
+
+		this.type = 'RemoveObjectCommand';
+
+		this.object = object;
+		this.parent = ( object !== null ) ? object.parent : null;
+
+		if ( this.parent !== null ) {
+
+			this.index = this.parent.children.indexOf( this.object );
+
+		}
+
+		if ( object !== null ) {
+
+			this.name = editor.strings.getKey( 'command/RemoveObject' ) + ': ' + object.name;
+
+
+		}
+
+	}
+
+	execute() {
+
+		this.editor.removeObject( this.object );
+		this.editor.deselect();
+
+	}
+
+	undo() {
+
+		this.editor.addObject( this.object, this.parent, this.index );
+		this.editor.select( this.object );
+
+	}
+
+	toJSON() {
+
+		const output = super.toJSON( this );
+
+		output.object = this.object.toJSON();
+		output.index = this.index;
+		output.parentUuid = this.parent.uuid;
+
+		return output;
+
+	}
+
+	fromJSON( json ) {
+
+		super.fromJSON( json );
+
+		this.parent = this.editor.objectByUuid( json.parentUuid );
+		if ( this.parent === undefined ) {
+
+			this.parent = this.editor.scene;
+
+		}
+
+		this.index = json.index;
+
+		this.object = this.editor.objectByUuid( json.object.object.uuid );
+
+		if ( this.object === undefined ) {
+
+			const loader = new ObjectLoader();
+			this.object = loader.parse( json.object );
+
+		}
+
+	}
+
+}
+
+export { RemoveObjectCommand };

package/client/editor/js/commands/RemoveScriptCommand.js

@@ -0,0 +1,81 @@
+import { Command } from '../Command.js';
+
+/**
+ * @param editor Editor
+ * @param object THREE.Object3D
+ * @param script javascript object
+ * @constructor
+ */
+class RemoveScriptCommand extends Command {
+
+	constructor( editor, object = null, script = '' ) {
+
+		super( editor );
+
+		this.type = 'RemoveScriptCommand';
+		this.name = editor.strings.getKey( 'command/RemoveScript' );
+
+		this.object = object;
+		this.script = script;
+
+		if ( this.object !== null && this.script !== '' ) {
+
+			this.index = this.editor.scripts[ this.object.uuid ].indexOf( this.script );
+
+		}
+
+	}
+
+	execute() {
+
+		if ( this.editor.scripts[ this.object.uuid ] === undefined ) return;
+
+		if ( this.index !== - 1 ) {
+
+			this.editor.scripts[ this.object.uuid ].splice( this.index, 1 );
+
+		}
+
+		this.editor.signals.scriptRemoved.dispatch( this.script );
+
+	}
+
+	undo() {
+
+		if ( this.editor.scripts[ this.object.uuid ] === undefined ) {
+
+			this.editor.scripts[ this.object.uuid ] = [];
+
+		}
+
+		this.editor.scripts[ this.object.uuid ].splice( this.index, 0, this.script );
+
+		this.editor.signals.scriptAdded.dispatch( this.script );
+
+	}
+
+	toJSON() {
+
+		const output = super.toJSON( this );
+
+		output.objectUuid = this.object.uuid;
+		output.script = this.script;
+		output.index = this.index;
+
+		return output;
+
+	}
+
+	fromJSON( json ) {
+
+		super.fromJSON( json );
+
+		this.script = json.script;
+		this.index = json.index;
+		this.object = this.editor.objectByUuid( json.objectUuid );
+
+	}
+
+}
+
+export { RemoveScriptCommand };

package/client/editor/js/commands/SetColorCommand.js

@@ -0,0 +1,73 @@
+import { Command } from '../Command.js';
+
+/**
+ * @param editor Editor
+ * @param object THREE.Object3D
+ * @param attributeName string
+ * @param newValue integer representing a hex color value
+ * @constructor
+ */
+class SetColorCommand extends Command {
+
+	constructor( editor, object = null, attributeName = '', newValue = null ) {
+
+		super( editor );
+
+		this.type = 'SetColorCommand';
+		this.name = editor.strings.getKey( 'command/SetColor' ) + ': ' + attributeName;
+		this.updatable = true;
+
+		this.object = object;
+		this.attributeName = attributeName;
+		this.oldValue = ( object !== null ) ? this.object[ this.attributeName ].getHex() : null;
+		this.newValue = newValue;
+
+	}
+
+	execute() {
+
+		this.object[ this.attributeName ].setHex( this.newValue );
+		this.editor.signals.objectChanged.dispatch( this.object );
+
+	}
+
+	undo() {
+
+		this.object[ this.attributeName ].setHex( this.oldValue );
+		this.editor.signals.objectChanged.dispatch( this.object );
+
+	}
+
+	update( cmd ) {
+
+		this.newValue = cmd.newValue;
+
+	}
+
+	toJSON() {
+
+		const output = super.toJSON( this );
+
+		output.objectUuid = this.object.uuid;
+		output.attributeName = this.attributeName;
+		output.oldValue = this.oldValue;
+		output.newValue = this.newValue;
+
+		return output;
+
+	}
+
+	fromJSON( json ) {
+
+		super.fromJSON( json );
+
+		this.object = this.editor.objectByUuid( json.objectUuid );
+		this.attributeName = json.attributeName;
+		this.oldValue = json.oldValue;
+		this.newValue = json.newValue;
+
+	}
+
+}
+
+export { SetColorCommand };

package/client/editor/js/commands/SetGeometryCommand.js

@@ -0,0 +1,87 @@
+import { Command } from '../Command.js';
+import { ObjectLoader } from 'three';
+
+/**
+ * @param editor Editor
+ * @param object THREE.Object3D
+ * @param newGeometry THREE.Geometry
+ * @constructor
+ */
+
+class SetGeometryCommand extends Command {
+
+	constructor( editor, object = null, newGeometry = null ) {
+
+		super( editor );
+
+		this.type = 'SetGeometryCommand';
+		this.name = editor.strings.getKey( 'command/SetGeometry' );
+		this.updatable = true;
+
+		this.object = object;
+		this.oldGeometry = ( object !== null ) ? object.geometry : null;
+		this.newGeometry = newGeometry;
+
+	}
+
+	execute() {
+
+		this.object.geometry.dispose();
+		this.object.geometry = this.newGeometry;
+		this.object.geometry.computeBoundingSphere();
+
+		this.editor.signals.geometryChanged.dispatch( this.object );
+		this.editor.signals.sceneGraphChanged.dispatch();
+
+	}
+
+	undo() {
+
+		this.object.geometry.dispose();
+		this.object.geometry = this.oldGeometry;
+		this.object.geometry.computeBoundingSphere();
+
+		this.editor.signals.geometryChanged.dispatch( this.object );
+		this.editor.signals.sceneGraphChanged.dispatch();
+
+	}
+
+	update( cmd ) {
+
+		this.newGeometry = cmd.newGeometry;
+
+	}
+
+	toJSON() {
+
+		const output = super.toJSON( this );
+
+		output.objectUuid = this.object.uuid;
+		output.oldGeometry = this.oldGeometry.toJSON();
+		output.newGeometry = this.newGeometry.toJSON();
+
+		return output;
+
+	}
+
+	fromJSON( json ) {
+
+		super.fromJSON( json );
+
+		this.object = this.editor.objectByUuid( json.objectUuid );
+
+		this.oldGeometry = parseGeometry( json.oldGeometry );
+		this.newGeometry = parseGeometry( json.newGeometry );
+
+		function parseGeometry( data ) {
+
+			const loader = new ObjectLoader();
+			return loader.parseGeometries( [ data ] )[ data.uuid ];
+
+		}
+
+	}
+
+}
+
+export { SetGeometryCommand };