Added command property 'name'

- allows us to give every command a unique description
- especially useful for CmdMultiCmds

editor/js/Cmd.js

@@ -8,6 +8,7 @@ Cmd = function () {
 	this.serialized = false;
 	this.updatable = false;
 	this.type = '';
+	this.name = '';
 
 };
 
@@ -16,6 +17,7 @@ Cmd.prototype.toJSON = function () {
 	var output = {};
 	output.type = this.type;
 	output.id = this.id;
+	output.name = this.name;
 	return output;
 
 };
@@ -24,5 +26,6 @@ Cmd.prototype.fromJSON = function ( json ) {
 
 	this.type = json.type;
 	this.id = json.id;
+	this.name = json.name;
 
 };

editor/js/CmdAddObject.js

@@ -7,6 +7,7 @@ CmdAddObject = function ( object ) {
 	Cmd.call( this );
 
 	this.type = 'CmdAddObject';
+	this.name = 'Add object';
 
 	this.object = object;
 	if ( object !== undefined ) {

editor/js/CmdAddScript.js

@@ -7,6 +7,7 @@ CmdAddScript = function ( object, script ) {
 	Cmd.call( this );
 
 	this.type = 'CmdAddScript';
+	this.name = 'Add script';
 
 	this.object = object;
 	this.objectUuid = object !== undefined ? object.uuid : undefined;

editor/js/CmdMoveObject.js

@@ -7,6 +7,7 @@ CmdMoveObject = function ( object, newParent, newBefore ) {
 	Cmd.call( this );
 
 	this.type = 'CmdMoveObject';
+	this.name = 'Move object';
 
 	this.object = object;
 	this.objectUuid = object !== undefined ? object.uuid : undefined;

editor/js/CmdMultiCmds.js

@@ -7,6 +7,7 @@ CmdMultiCmds = function ( cmdArray ) {
 	Cmd.call( this );
 
 	this.type = 'CmdMultiCmds';
+	this.name = 'Multiple Changes';
 
 	this.cmdArray = cmdArray !== undefined ? cmdArray : [];
 

editor/js/CmdRemoveObject.js

@@ -7,6 +7,7 @@ CmdRemoveObject = function ( object ) {
 	Cmd.call( this );
 
 	this.type = 'CmdRemoveObject';
+	this.name = 'Remove object';
 
 	this.object = object;
 	this.parent = object !== undefined ? object.parent : undefined;

editor/js/CmdRemoveScript.js

@@ -7,6 +7,7 @@ CmdRemoveScript = function ( object, script ) {
 	Cmd.call( this );
 
 	this.type = 'CmdRemoveScript';
+	this.name = 'Remove script';
 
 	this.object = object;
 	this.objectUuid = object !== undefined ? object.uuid : undefined;

editor/js/CmdSetColor.js

@@ -7,6 +7,7 @@ CmdSetColor = function ( object, attributeName, newValue ) {
 	Cmd.call( this );
 
 	this.type = 'CmdSetColor';
+	this.name = 'Set ' + attributeName;
 	this.updatable = true;
 
 	this.object = object;

editor/js/CmdSetGeometry.js

@@ -7,6 +7,7 @@ CmdSetGeometry = function ( object, newGeometry ) {
 	Cmd.call( this );
 
 	this.type = 'CmdSetGeometry';
+	this.name = 'Set geometry';
 	this.updatable = true;
 
 	this.object = object;

editor/js/CmdSetGeometryValue.js

@@ -7,6 +7,7 @@ CmdSetGeometryValue = function ( object, attributeName, newValue ) {
 	Cmd.call( this );
 
 	this.type = 'CmdSetGeometryValue';
+	this.name = 'Set geometry.' + attributeName;
 
 	this.object = object;
 	this.attributeName = attributeName;

editor/js/CmdSetMaterial.js

@@ -7,6 +7,7 @@ CmdSetMaterial = function ( object, newMaterial ) {
 	Cmd.call( this );
 
 	this.type = 'CmdSetMaterial';
+	this.name = 'Set material';
 
 	this.object = object;
 	this.objectUuid = object !== undefined ? object.uuid : undefined;

editor/js/CmdSetMaterialColor.js

@@ -7,6 +7,7 @@ CmdSetMaterialColor = function ( object, attributeName, newValue ) {
 	Cmd.call( this );
 
 	this.type = 'CmdSetMaterialColor';
+	this.name = 'Set material.' + attributeName;
 	this.updatable = true;
 
 	this.object = object;

editor/js/CmdSetMaterialMap.js

@@ -7,6 +7,7 @@ CmdSetMaterialMap = function ( object, mapName, newMap ) {
 	Cmd.call( this );
 
 	this.type = 'CmdSetMaterialMap';
+	this.name = 'Set material.' + mapName;
 
 	this.object = object;
 	this.mapName = mapName;

editor/js/CmdSetMaterialValue.js

@@ -7,6 +7,7 @@ CmdSetMaterialValue = function ( object, attributeName, newValue ) {
 	Cmd.call( this );
 
 	this.type = 'CmdSetMaterialValue';
+	this.name = 'Set material.' + attributeName;
 	this.updatable = true;
 
 	this.object = object;

editor/js/CmdSetPosition.js

@@ -7,6 +7,7 @@ CmdSetPosition = function ( object, newPositionVector, oldPositionVector ) {
 	Cmd.call( this );
 
 	this.type = 'CmdSetPosition';
+	this.name = 'Set position';
 	this.updatable = true;
 
 	this.object = object;

editor/js/CmdSetRotation.js

@@ -7,6 +7,7 @@ CmdSetRotation = function ( object, newRotationEuler, oldRotationEuler ) {
 	Cmd.call( this );
 
 	this.type = 'CmdSetRotation';
+	this.name = 'Set rotation';
 	this.updatable = true;
 
 	this.object = object;

editor/js/CmdSetScale.js

@@ -7,6 +7,7 @@ CmdSetScale = function ( object, newScaleVector, oldScaleVector ) {
 	Cmd.call( this );
 
 	this.type = 'CmdSetScale';
+	this.name = 'Set scale';
 	this.updatable = true;
 
 	this.object = object;

editor/js/CmdSetScene.js

@@ -7,6 +7,7 @@ CmdSetScene = function ( oldScene, newScene ) {
 	Cmd.call( this );
 
 	this.type = 'CmdSetScene';
+	this.name = 'Set scene';
 
 	this.cmdArray = [];
 

editor/js/CmdSetScriptValue.js

@@ -7,6 +7,7 @@ CmdSetScriptValue = function ( object, script, attributeName, newValue, cursorPo
 	Cmd.call( this );
 
 	this.type = 'CmdSetScriptValue';
+	this.name = 'Set script.' + attributeName;
 	this.updatable = true;
 
 	this.object = object;

editor/js/CmdSetUuid.js

@@ -7,6 +7,8 @@ CmdSetUuid = function ( object, newUuid ) {
 	Cmd.call( this );
 
 	this.type = 'CmdSetUuid';
+	this.name = 'Update uuid';
+
 	this.object = object;
 
 	this.oldUuid = object !== undefined ? object.uuid : undefined;

editor/js/CmdSetValue.js

@@ -7,6 +7,7 @@ CmdSetValue = function ( object, attributeName, newValue ) {
 	Cmd.call( this );
 
 	this.type = 'CmdSetValue';
+	this.name = 'Set ' + attributeName;
 	this.updatable = true;
 
 	this.object = object;

editor/js/Menubar.Edit.js

@@ -188,7 +188,9 @@ Menubar.Edit = function ( editor ) {
 			}
 
 		} );
-		editor.execute( new CmdMultiCmds( cmds ) );
+		var minifyCmd = new CmdMultiCmds( cmds );
+		minifyCmd.name = 'Minify Shaders';
+		editor.execute( minifyCmd );
 
 
 		window.alert( nMaterialsChanged +

editor/js/Sidebar.Geometry.js

@@ -79,7 +79,9 @@ Sidebar.Geometry = function ( editor ) {
 					new CmdSetRotation( object, new THREE.Euler( 0, 0, 0 ) ),
 					new CmdSetScale( object, new THREE.Vector3( 1, 1, 1 ) ) ];
 
-				editor.execute( new CmdMultiCmds( cmds ) );
+				var flattenCmd = new CmdMultiCmds( cmds );
+				flattenCmd.name = 'Flatten Geometry';
+				editor.execute( flattenCmd );
 
 				editor.signals.geometryChanged.dispatch( object );
 				editor.signals.objectChanged.dispatch( object );

editor/js/Sidebar.History.js

@@ -51,7 +51,7 @@ Sidebar.History = function ( editor ) {
 
 				var object = objects[ i ];
 
-				var html = pad + "<span style='color: #0000cc '>" + enumerator++ + ". Undo: " + object.type.substring( 3, object.type.length ).replace(/([a-z])([A-Z])/g, '$1 $2') + "</span>";
+				var html = pad + "<span style='color: #0000cc '>" + enumerator++ + ". Undo: " + object.name + "</span>";
 
 				options.push( { value: object.id, html: html } );
 
@@ -66,7 +66,7 @@ Sidebar.History = function ( editor ) {
 
 				var object = objects[ i ];
 
-				var html = pad + "<span style='color: #71544e'>" + enumerator++ + ". Redo: " +  object.type.substring( 3, object.type.length ).replace(/([a-z])([A-Z])/g, '$1 $2') + "</span>";
+				var html = pad + "<span style='color: #71544e'>" + enumerator++ + ". Redo: " +  object.name + "</span>";
 
 				options.push( { value: object.id, html: html } );