spoint 0.1.0 → 0.1.10

package/client/editor/js/commands/SetGeometryValueCommand.js

@@ -0,0 +1,70 @@
+import { Command } from '../Command.js';
+
+/**
+ * @param editor Editor
+ * @param object THREE.Object3D
+ * @param attributeName string
+ * @param newValue number, string, boolean or object
+ * @constructor
+ */
+class SetGeometryValueCommand extends Command {
+
+	constructor( editor, object = null, attributeName = '', newValue = null ) {
+
+		super( editor );
+
+		this.type = 'SetGeometryValueCommand';
+		this.name = editor.strings.getKey( 'command/SetGeometryValue' ) + ': ' + attributeName;
+
+		this.object = object;
+		this.attributeName = attributeName;
+		this.oldValue = ( object !== null ) ? object.geometry[ attributeName ] : null;
+		this.newValue = newValue;
+
+	}
+
+	execute() {
+
+		this.object.geometry[ this.attributeName ] = this.newValue;
+		this.editor.signals.objectChanged.dispatch( this.object );
+		this.editor.signals.geometryChanged.dispatch();
+		this.editor.signals.sceneGraphChanged.dispatch();
+
+	}
+
+	undo() {
+
+		this.object.geometry[ this.attributeName ] = this.oldValue;
+		this.editor.signals.objectChanged.dispatch( this.object );
+		this.editor.signals.geometryChanged.dispatch();
+		this.editor.signals.sceneGraphChanged.dispatch();
+
+	}
+
+	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 { SetGeometryValueCommand };

package/client/editor/js/commands/SetMaterialColorCommand.js

@@ -0,0 +1,86 @@
+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 SetMaterialColorCommand extends Command {
+
+	constructor( editor, object = null, attributeName = '', newValue = null, materialSlot = - 1 ) {
+
+		super( editor );
+
+		this.type = 'SetMaterialColorCommand';
+		this.name = editor.strings.getKey( 'command/SetMaterialColor' ) + ': ' + attributeName;
+		this.updatable = true;
+
+		this.object = object;
+		this.materialSlot = materialSlot;
+
+		const material = ( object !== null ) ? editor.getObjectMaterial( object, materialSlot ) : null;
+
+		this.oldValue = ( material !== null ) ? material[ attributeName ].getHex() : null;
+		this.newValue = newValue;
+
+		this.attributeName = attributeName;
+
+	}
+
+	execute() {
+
+		const material = this.editor.getObjectMaterial( this.object, this.materialSlot );
+
+		material[ this.attributeName ].setHex( this.newValue );
+
+		this.editor.signals.materialChanged.dispatch( this.object, this.materialSlot );
+
+	}
+
+	undo() {
+
+		const material = this.editor.getObjectMaterial( this.object, this.materialSlot );
+
+		material[ this.attributeName ].setHex( this.oldValue );
+
+		this.editor.signals.materialChanged.dispatch( this.object, this.materialSlot );
+
+	}
+
+	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;
+		output.materialSlot = this.materialSlot;
+
+		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;
+		this.materialSlot = json.materialSlot;
+
+	}
+
+}
+
+export { SetMaterialColorCommand };

package/client/editor/js/commands/SetMaterialCommand.js

@@ -0,0 +1,79 @@
+import { Command } from '../Command.js';
+import { ObjectLoader } from 'three';
+
+/**
+ * @param editor Editor
+ * @param object THREE.Object3D
+ * @param newMaterial THREE.Material
+ * @constructor
+ */
+class SetMaterialCommand extends Command {
+
+	constructor( editor, object = null, newMaterial = null, materialSlot = - 1 ) {
+
+		super( editor );
+
+		this.type = 'SetMaterialCommand';
+		this.name = editor.strings.getKey( 'command/SetMaterial' );
+
+		this.object = object;
+		this.materialSlot = materialSlot;
+
+		this.oldMaterial = ( object !== null ) ? editor.getObjectMaterial( object, materialSlot ) : null;
+		this.newMaterial = newMaterial;
+
+	}
+
+	execute() {
+
+		this.editor.setObjectMaterial( this.object, this.materialSlot, this.newMaterial );
+
+		this.editor.signals.materialChanged.dispatch( this.object, this.materialSlot );
+
+	}
+
+	undo() {
+
+		this.editor.setObjectMaterial( this.object, this.materialSlot, this.oldMaterial );
+
+		this.editor.signals.materialChanged.dispatch( this.object, this.materialSlot );
+
+	}
+
+	toJSON() {
+
+		const output = super.toJSON( this );
+
+		output.objectUuid = this.object.uuid;
+		output.oldMaterial = this.oldMaterial.toJSON();
+		output.newMaterial = this.newMaterial.toJSON();
+		output.materialSlot = this.materialSlot;
+
+		return output;
+
+	}
+
+	fromJSON( json ) {
+
+		super.fromJSON( json );
+
+		this.object = this.editor.objectByUuid( json.objectUuid );
+		this.oldMaterial = parseMaterial( json.oldMaterial );
+		this.newMaterial = parseMaterial( json.newMaterial );
+		this.materialSlot = json.materialSlot;
+
+		function parseMaterial( json ) {
+
+			const loader = new ObjectLoader();
+			const images = loader.parseImages( json.images );
+			const textures = loader.parseTextures( json.textures, images );
+			const materials = loader.parseMaterials( [ json ], textures );
+			return materials[ json.uuid ];
+
+		}
+
+	}
+
+}
+
+export { SetMaterialCommand };

package/client/editor/js/commands/SetMaterialMapCommand.js

@@ -0,0 +1,143 @@
+import { Command } from '../Command.js';
+import { ObjectLoader } from 'three';
+
+/**
+ * @param editor Editor
+ * @param object THREE.Object3D
+ * @param mapName string
+ * @param newMap THREE.Texture
+ * @constructor
+ */
+class SetMaterialMapCommand extends Command {
+
+	constructor( editor, object = null, mapName = '', newMap = null, materialSlot = - 1 ) {
+
+		super( editor );
+
+		this.type = 'SetMaterialMapCommand';
+		this.name = editor.strings.getKey( 'command/SetMaterialMap' ) + ': ' + mapName;
+
+		this.object = object;
+		this.materialSlot = materialSlot;
+
+		const material = ( object !== null ) ? editor.getObjectMaterial( object, materialSlot ) : null;
+
+		this.oldMap = ( object !== null ) ? material[ mapName ] : undefined;
+		this.newMap = newMap;
+
+		this.mapName = mapName;
+
+	}
+
+	execute() {
+
+		if ( this.oldMap !== null && this.oldMap !== undefined ) this.oldMap.dispose();
+
+		const material = this.editor.getObjectMaterial( this.object, this.materialSlot );
+
+		material[ this.mapName ] = this.newMap;
+		material.needsUpdate = true;
+
+		this.editor.signals.materialChanged.dispatch( this.object, this.materialSlot );
+
+	}
+
+	undo() {
+
+		const material = this.editor.getObjectMaterial( this.object, this.materialSlot );
+
+		material[ this.mapName ] = this.oldMap;
+		material.needsUpdate = true;
+
+		this.editor.signals.materialChanged.dispatch( this.object, this.materialSlot );
+
+	}
+
+	toJSON() {
+
+		const output = super.toJSON( this );
+
+		output.objectUuid = this.object.uuid;
+		output.mapName = this.mapName;
+		output.newMap = serializeMap( this.newMap );
+		output.oldMap = serializeMap( this.oldMap );
+		output.materialSlot = this.materialSlot;
+
+		return output;
+
+		// serializes a map (THREE.Texture)
+
+		function serializeMap( map ) {
+
+			if ( map === null || map === undefined ) return null;
+
+			const meta = {
+				geometries: {},
+				materials: {},
+				textures: {},
+				images: {}
+			};
+
+			const json = map.toJSON( meta );
+			const images = extractFromCache( meta.images );
+			if ( images.length > 0 ) json.images = images;
+			json.sourceFile = map.sourceFile;
+
+			return json;
+
+		}
+
+		// Note: The function 'extractFromCache' is copied from Object3D.toJSON()
+
+		// extract data from the cache hash
+		// remove metadata on each item
+		// and return as array
+		function extractFromCache( cache ) {
+
+			const values = [];
+			for ( const key in cache ) {
+
+				const data = cache[ key ];
+				delete data.metadata;
+				values.push( data );
+
+			}
+
+			return values;
+
+		}
+
+	}
+
+	fromJSON( json ) {
+
+		super.fromJSON( json );
+
+		this.object = this.editor.objectByUuid( json.objectUuid );
+		this.mapName = json.mapName;
+		this.oldMap = parseTexture( json.oldMap );
+		this.newMap = parseTexture( json.newMap );
+		this.materialSlot = json.materialSlot;
+
+		function parseTexture( json ) {
+
+			let map = null;
+			if ( json !== null ) {
+
+				const loader = new ObjectLoader();
+				const images = loader.parseImages( json.images );
+				const textures = loader.parseTextures( [ json ], images );
+				map = textures[ json.uuid ];
+				map.sourceFile = json.sourceFile;
+
+			}
+
+			return map;
+
+		}
+
+	}
+
+}
+
+export { SetMaterialMapCommand };

package/client/editor/js/commands/SetMaterialRangeCommand.js

@@ -0,0 +1,91 @@
+import { Command } from '../Command.js';
+
+/**
+ * @param editor Editor
+ * @param object THREE.Object3D
+ * @param attributeName string
+ * @param newMinValue number
+ * @param newMaxValue number
+ * @constructor
+ */
+class SetMaterialRangeCommand extends Command {
+
+	constructor( editor, object = null, attributeName = '', newMinValue = - Infinity, newMaxValue = Infinity, materialSlot = - 1 ) {
+
+		super( editor );
+
+		this.type = 'SetMaterialRangeCommand';
+		this.name = editor.strings.getKey( 'command/SetMaterialRange' ) + ': ' + attributeName;
+		this.updatable = true;
+
+		this.object = object;
+		this.materialSlot = materialSlot;
+
+		const material = ( object !== null ) ? editor.getObjectMaterial( object, materialSlot ) : null;
+
+		this.oldRange = ( material !== null && material[ attributeName ] !== undefined ) ? [ ...this.material[ attributeName ] ] : null;
+		this.newRange = [ newMinValue, newMaxValue ];
+
+		this.attributeName = attributeName;
+
+	}
+
+	execute() {
+
+		const material = this.editor.getObjectMaterial( this.object, this.materialSlot );
+
+		material[ this.attributeName ] = [ ...this.newRange ];
+		material.needsUpdate = true;
+
+		this.editor.signals.objectChanged.dispatch( this.object );
+		this.editor.signals.materialChanged.dispatch( this.object, this.materialSlot );
+
+	}
+
+	undo() {
+
+		const material = this.editor.getObjectMaterial( this.object, this.materialSlot );
+
+		material[ this.attributeName ] = [ ...this.oldRange ];
+		material.needsUpdate = true;
+
+		this.editor.signals.objectChanged.dispatch( this.object );
+		this.editor.signals.materialChanged.dispatch( this.object, this.materialSlot );
+
+	}
+
+	update( cmd ) {
+
+		this.newRange = [ ...cmd.newRange ];
+
+	}
+
+	toJSON() {
+
+		const output = super.toJSON( this );
+
+		output.objectUuid = this.object.uuid;
+		output.attributeName = this.attributeName;
+		output.oldRange = [ ...this.oldRange ];
+		output.newRange = [ ...this.newRange ];
+		output.materialSlot = this.materialSlot;
+
+		return output;
+
+	}
+
+	fromJSON( json ) {
+
+		super.fromJSON( json );
+
+		this.attributeName = json.attributeName;
+		this.oldRange = [ ...json.oldRange ];
+		this.newRange = [ ...json.newRange ];
+		this.object = this.editor.objectByUuid( json.objectUuid );
+		this.materialSlot = json.materialSlot;
+
+	}
+
+}
+
+export { SetMaterialRangeCommand };

package/client/editor/js/commands/SetMaterialValueCommand.js

@@ -0,0 +1,90 @@
+import { Command } from '../Command.js';
+
+/**
+ * @param editor Editor
+ * @param object THREE.Object3D
+ * @param attributeName string
+ * @param newValue number, string, boolean or object
+ * @constructor
+ */
+class SetMaterialValueCommand extends Command {
+
+	constructor( editor, object = null, attributeName = '', newValue = null, materialSlot = - 1 ) {
+
+		super( editor );
+
+		this.type = 'SetMaterialValueCommand';
+		this.name = editor.strings.getKey( 'command/SetMaterialValue' ) + ': ' + attributeName;
+		this.updatable = true;
+
+		this.object = object;
+		this.materialSlot = materialSlot;
+
+		const material = ( object !== null ) ? editor.getObjectMaterial( object, materialSlot ) : null;
+
+		this.oldValue = ( material !== null ) ? material[ attributeName ] : null;
+		this.newValue = newValue;
+
+		this.attributeName = attributeName;
+
+	}
+
+	execute() {
+
+		const material = this.editor.getObjectMaterial( this.object, this.materialSlot );
+
+		material[ this.attributeName ] = this.newValue;
+		material.needsUpdate = true;
+
+		this.editor.signals.objectChanged.dispatch( this.object );
+		this.editor.signals.materialChanged.dispatch( this.object, this.materialSlot );
+
+	}
+
+	undo() {
+
+		const material = this.editor.getObjectMaterial( this.object, this.materialSlot );
+
+		material[ this.attributeName ] = this.oldValue;
+		material.needsUpdate = true;
+
+		this.editor.signals.objectChanged.dispatch( this.object );
+		this.editor.signals.materialChanged.dispatch( this.object, this.materialSlot );
+
+	}
+
+	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;
+		output.materialSlot = this.materialSlot;
+
+		return output;
+
+	}
+
+	fromJSON( json ) {
+
+		super.fromJSON( json );
+
+		this.attributeName = json.attributeName;
+		this.oldValue = json.oldValue;
+		this.newValue = json.newValue;
+		this.object = this.editor.objectByUuid( json.objectUuid );
+		this.materialSlot = json.materialSlot;
+
+	}
+
+}
+
+export { SetMaterialValueCommand };

package/client/editor/js/commands/SetMaterialVectorCommand.js

@@ -0,0 +1,79 @@
+import { Command } from '../Command.js';
+
+class SetMaterialVectorCommand extends Command {
+
+	constructor( editor, object = null, attributeName = '', newValue = null, materialSlot = - 1 ) {
+
+		super( editor );
+
+		this.type = 'SetMaterialVectorCommand';
+		this.name = editor.strings.getKey( 'command/SetMaterialVector' ) + ': ' + attributeName;
+		this.updatable = true;
+
+		this.object = object;
+		this.materialSlot = materialSlot;
+
+		const material = ( object !== null ) ? editor.getObjectMaterial( object, materialSlot ) : null;
+
+		this.oldValue = ( material !== null ) ? material[ attributeName ].toArray() : null;
+		this.newValue = newValue;
+
+		this.attributeName = attributeName;
+
+	}
+
+	execute() {
+
+		const material = this.editor.getObjectMaterial( this.object, this.materialSlot );
+
+		material[ this.attributeName ].fromArray( this.newValue );
+
+		this.editor.signals.materialChanged.dispatch( this.object, this.materialSlot );
+
+	}
+
+	undo() {
+
+		const material = this.editor.getObjectMaterial( this.object, this.materialSlot );
+
+		material[ this.attributeName ].fromArray( this.oldValue );
+
+		this.editor.signals.materialChanged.dispatch( this.object, this.materialSlot );
+
+	}
+
+	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;
+		output.materialSlot = this.materialSlot;
+
+		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;
+		this.materialSlot = json.materialSlot;
+
+	}
+
+}
+
+export { SetMaterialVectorCommand };