Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 22:58:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

comply with copy/paste update

Browse source
This commit is contained in:
Thijs Wenker 2018-10-22 22:39:40 +02:00
parent 3fa4ee0e1d
commit 4e9f9b3edf
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/system/libraries/entityList.js
View file

@ -272,11 +272,11 @@ EntityListTool = function(shouldUseEditTabletApp) {
} else if (data.type === "radius") { } else if (data.type === "radius") {
searchRadius = data.radius; searchRadius = data.radius;
} else if (data.type === "cut") { } else if (data.type === "cut") {
cutSelectedEntities(); SelectionManager.cutSelectedEntities();
} else if (data.type === "copy") { } else if (data.type === "copy") {
copySelectedEntities(); SelectionManager.copySelectedEntities();
} else if (data.type === "paste") { } else if (data.type === "paste") {
pasteEntities(); SelectionManager.pasteEntities();
} else if (data.type === "duplicate") { } else if (data.type === "duplicate") {
SelectionManager.duplicateSelection(); SelectionManager.duplicateSelection();
that.sendUpdate(); that.sendUpdate();

12
scripts/system/libraries/entitySelectionTool.js
View file

@ -353,12 +353,12 @@ SelectionManager = (function() {
} }
return createdEntityIDs; return createdEntityIDs;
} };
that.cutSelectedEntities = function() { that.cutSelectedEntities = function() {
copySelectedEntities(); that.copySelectedEntities();
deleteSelectedEntities(); deleteSelectedEntities();
} };
that.copySelectedEntities = function() { that.copySelectedEntities = function() {
var entityProperties = Entities.getMultipleEntityProperties(that.selections); var entityProperties = Entities.getMultipleEntityProperties(that.selections);
@ -434,7 +434,7 @@ SelectionManager = (function() {
z: brn.z + entityClipboard.dimensions.z / 2 z: brn.z + entityClipboard.dimensions.z / 2
}; };
} }
} };
that.pasteEntities = function() { that.pasteEntities = function() {
var dimensions = entityClipboard.dimensions; var dimensions = entityClipboard.dimensions;
@ -442,7 +442,7 @@ SelectionManager = (function() {
var pastePosition = getPositionToCreateEntity(maxDimension); var pastePosition = getPositionToCreateEntity(maxDimension);
var deltaPosition = Vec3.subtract(pastePosition, entityClipboard.position); var deltaPosition = Vec3.subtract(pastePosition, entityClipboard.position);
var copiedProperties = [] var copiedProperties = [];
var ids = []; var ids = [];
entityClipboard.entities.forEach(function(originalProperties) { entityClipboard.entities.forEach(function(originalProperties) {
var properties = deepCopy(originalProperties); var properties = deepCopy(originalProperties);
@ -475,7 +475,7 @@ SelectionManager = (function() {
redo(copiedProperties); redo(copiedProperties);
undoHistory.pushCommand(undo, copiedProperties, redo, copiedProperties); undoHistory.pushCommand(undo, copiedProperties, redo, copiedProperties);
} };
that._update = function(selectionUpdated) { that._update = function(selectionUpdated) {
var properties = null; var properties = null;