Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-13 21:27:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add copy/paste functionality to edit.js

Browse source
This commit is contained in:
Ryan Huffman 2018-10-18 12:35:39 -07:00
parent e40a021339
commit 9cc2add4a0
2 changed files with 232 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/controllers/keyboardMouse.json
View file

@ -133,7 +133,7 @@
{ "from": "Keyboard.W", "when": "!Keyboard.Control", "to": "Actions.LONGITUDINAL_FORWARD" },
{ "from": "Keyboard.S", "when": "!Keyboard.Control", "to": "Actions.LONGITUDINAL_BACKWARD" },
{ "from": "Keyboard.Shift", "when": ["!Keyboard.Left", "!Keyboard.Right"], "to": "Actions.SPRINT" },
{ "from": "Keyboard.C", "to": "Actions.VERTICAL_DOWN" },
{ "from": "Keyboard.C", "when": "!Keyboard.Control", "to": "Actions.VERTICAL_DOWN" },
{ "from": "Keyboard.Left", "when": "Keyboard.Shift", "to": "Actions.LATERAL_LEFT" },
{ "from": "Keyboard.Right", "when": "Keyboard.Shift", "to": "Actions.LATERAL_RIGHT" },
{ "from": "Keyboard.Up", "when": "Application.CameraFirstPerson", "to": "Actions.LONGITUDINAL_FORWARD" },

239
scripts/system/edit.js
View file

@ -1933,14 +1933,6 @@ function gridKey(value) {
}
}
}
var mapping = Controller.newMapping(CONTROLLER_MAPPING_NAME);
mapping.from([Controller.Hardware.Keyboard.Delete]).when([!Controller.Hardware.Application.PlatformMac]).to(deleteKey);
mapping.from([Controller.Hardware.Keyboard.Backspace]).when([Controller.Hardware.Application.PlatformMac]).to(deleteKey);
mapping.from([Controller.Hardware.Keyboard.D]).when([Controller.Hardware.Keyboard.Control]).to(deselectKey);
mapping.from([Controller.Hardware.Keyboard.T]).to(toggleKey);
mapping.from([Controller.Hardware.Keyboard.F]).to(focusKey);
mapping.from([Controller.Hardware.Keyboard.G]).to(gridKey);
function recursiveAdd(newParentID, parentData) {
if (parentData.children !== undefined) {
var children = parentData.children;
@ -2398,6 +2390,213 @@ var PropertiesTool = function (opts) {
return that;
};
function addChildrenEntities(parentEntityID, entityList) {
var children = Entities.getChildrenIDs(parentEntityID);
for (var i = 0; i < children.length; i++) {
var childID = children[i];
if (entityList.indexOf(childID) < 0) {
entityList.push(childID);
}
addChildrenEntities(childID, entityList);
}
}
// Return true if the given entity with `properties` is being grabbed by an avatar.
// This is mostly a heuristic - there is no perfect way to know if an entity is being
// grabbed.
function nonDynamicEntityIsBeingGrabbedByAvatar(properties) {
if (properties.dynamic || Uuid.isNull(properties.parentID)) {
return false;
}
var avatar = AvatarList.getAvatar(properties.parentID);
if (Uuid.isNull(avatar.sessionUUID)) {
return false;
}
var grabJointNames = [
'RightHand', 'LeftHand',
'_CONTROLLER_RIGHTHAND', '_CONTROLLER_LEFTHAND',
'_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND', '_CAMERA_RELATIVE_CONTROLLER_LEFTHAND'];
for (var i = 0; i < grabJointNames.length; ++i) {
if (avatar.getJointIndex(grabJointNames[i]) === properties.parentJointIndex) {
return true;
}
}
return false;
}
// entityProperites - array of entity property objects
function createEntities(entityProperties) {
var entitiesToCreate = [];
var createdEntityIDs = [];
var createdChildrenWithOldParents = [];
var originalEntityToNewEntityID = [];
SelectionManager.saveProperties();
for (var i = 0, len = entityProperties.length; i < len; ++i) {
var properties = entityProperties[i];
if (properties.parentID in originalEntityToNewEntityID) {
properties.parentID = originalEntityToNewEntityID[properties.parentID];
} else {
delete properties.parentID;
}
delete properties.actionData;
var newEntityID = Entities.addEntity(properties);
if (newEntityID) {
createdEntityIDs.push({
entityID: newEntityID,
properties: properties
});
if (properties.parentID !== Uuid.NULL) {
createdChildrenWithOldParents[newEntityID] = properties.parentID;
}
originalEntityToNewEntityID[properties.id] = newEntityID;
properties.id = newEntityID;
}
}
return createdEntityIDs;
}
function copySelectedEntities() {
copyEntities(selectionManager.selections);
}
var entityClipboard = {
entities: {}, // Map of id -> properties for copied entities
position: { x: 0, y: 0, z: 0 },
dimensions: { x: 0, y: 0, z: 0 },
};
function copyEntities(entityIDs) {
var entityProperties = Entities.getMultipleEntityProperties(entityIDs);
var entities = {};
entityProperties.forEach(function(props) {
entities[props.id] = props;
});
function appendChildren(entityID, entities) {
var childrenIDs = Entities.getChildrenIDs(entityID);
for (var i = 0; i < childrenIDs.length; ++i) {
var id = childrenIDs[i];
if (!(id in entities)) {
entities[id] = Entities.getEntityProperties(id);
appendChildren(id, entities);
}
}
}
var len = entityProperties.length;
for (var i = 0; i < len; ++i) {
appendChildren(entityProperties[i].id, entities);
}
for (var id in entities) {
var parentID = entities[id].parentID;
entities[id].root = !(parentID in entities);
}
entityClipboard.entities = [];
var ids = Object.keys(entities);
while (ids.length > 0) {
// Go through all remaining entities.
// If an entity does not have a parent left, move it into the list
for (var i = 0; i < ids.length; ++i) {
var id = ids[i];
var parentID = entities[id].parentID;
if (parentID in entities) {
continue;
}
entityClipboard.entities.push(entities[id]);
delete entities[id];
}
ids = Object.keys(entities);
}
// Calculate size
if (entityClipboard.entities.length === 0) {
entityClipboard.dimensions = { x: 0, y: 0, z: 0 };
entityClipboard.position = { x: 0, y: 0, z: 0 };
} else {
var properties = entityClipboard.entities;
var brn = properties[0].boundingBox.brn;
var tfl = properties[0].boundingBox.tfl;
for (var i = 1; i < properties.length; i++) {
var bb = properties[i].boundingBox;
brn.x = Math.min(bb.brn.x, brn.x);
brn.y = Math.min(bb.brn.y, brn.y);
brn.z = Math.min(bb.brn.z, brn.z);
tfl.x = Math.max(bb.tfl.x, tfl.x);
tfl.y = Math.max(bb.tfl.y, tfl.y);
tfl.z = Math.max(bb.tfl.z, tfl.z);
}
entityClipboard.dimensions = {
x: tfl.x - brn.x,
y: tfl.y - brn.y,
z: tfl.z - brn.z
};
entityClipboard.position = {
x: brn.x + entityClipboard.dimensions.x / 2,
y: brn.y + entityClipboard.dimensions.y / 2,
z: brn.z + entityClipboard.dimensions.z / 2
};
}
}
function deepCopy(v) {
return JSON.parse(JSON.stringify(v));
}
function pasteEntities() {
var dims = entityClipboard.dimensions;
var maxDim = Math.max(dims.x, dims.y, dims.z);
var pastePosition = getPositionToCreateEntity(maxDim);
var deltaPosition = Vec3.subtract(pastePosition, entityClipboard.position);
var copiedProperties = []
var ids = [];
entityClipboard.entities.forEach(function(origproperties) {
var properties = deepCopy(origproperties);
if (properties.root) {
properties.position = Vec3.sum(properties.position, deltaPosition);
delete properties.localPosition;
} else {
delete properties.position;
}
//entityProperties[properties.id] = properties;
copiedProperties.push(properties);
});
var currentSelections = deepCopy(SelectionManager.selections);
function redo(copiedProperties) {
var created = createEntities(copiedProperties);
var ids = [];
for (var i = 0; i < created.length; ++i) {
ids.push(created[i].entityID);
}
SelectionManager.setSelections(ids);
}
function undo(copiedProperties) {
for (var i = 0; i < copiedProperties.length; ++i) {
Entities.deleteEntity(copiedProperties[i].id);
}
SelectionManager.setSelections(currentSelections);
}
redo(copiedProperties);
undoHistory.pushCommand(undo, copiedProperties, redo, copiedProperties);
}
var PopupMenu = function () {
var self = this;
@ -2567,6 +2766,30 @@ var PopupMenu = function () {
return this;
};
var mapping = Controller.newMapping(CONTROLLER_MAPPING_NAME);
mapping.from([Controller.Hardware.Keyboard.Delete]).when([!Controller.Hardware.Application.PlatformMac]).to(deleteKey);
mapping.from([Controller.Hardware.Keyboard.Backspace]).when([Controller.Hardware.Application.PlatformMac]).to(deleteKey);
mapping.from([Controller.Hardware.Keyboard.D]).when([Controller.Hardware.Keyboard.Control]).to(deselectKey);
mapping.from([Controller.Hardware.Keyboard.T]).to(toggleKey);
mapping.from([Controller.Hardware.Keyboard.F]).to(focusKey);
mapping.from([Controller.Hardware.Keyboard.G]).to(gridKey);
mapping.from([Controller.Hardware.Keyboard.C]).when([Controller.Hardware.Keyboard.Control]).to(copyKey);
mapping.from([Controller.Hardware.Keyboard.V]).when([Controller.Hardware.Keyboard.Control]).to(pasteKey);
function copyKey(value) {
console.log("Copy", value);
if (value > 0) {
copySelectedEntities();
}
}
function pasteKey(value) {
if (value > 0) {
pasteEntities();
}
}
var propertyMenu = new PopupMenu();