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

Formating

Browse source
This commit is contained in:
Menithal 2017-06-13 20:31:41 +03:00
parent 395cc55fb2
commit c2c1e607c0
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/system/edit.js
View file

@ -198,7 +198,7 @@ function hideMarketplace() {
// } // }
function adjustPositionPerBoundingBox(position, direction, registration, dimensions, orientation) { function adjustPositionPerBoundingBox(position, direction, registration, dimensions, orientation) {
// Adjust the position such that the bounding box (registration, dimenions, and orientation) lies behind the original // Adjust the position such that the bounding box (registration, dimenions, and orientation) lies behind the original
// position in the given direction. // position in the given direction.
var CORNERS = [ var CORNERS = [
{ x: 0, y: 0, z: 0 }, { x: 0, y: 0, z: 0 },
@ -1352,7 +1352,7 @@ function parentSelectedEntities() {
} }
}); });
if(parentCheck) { if (parentCheck) {
Window.notify("Entities parented"); Window.notify("Entities parented");
}else { }else {
Window.notify("Entities are already parented to last"); Window.notify("Entities are already parented to last");
@ -1554,7 +1554,7 @@ function importSVO(importURL) {
var properties = Entities.getEntityProperties(pastedEntityIDs[0], ["position", "dimensions", var properties = Entities.getEntityProperties(pastedEntityIDs[0], ["position", "dimensions",
"registrationPoint"]); "registrationPoint"]);
var position = Vec3.sum(deltaPosition, properties.position); var position = Vec3.sum(deltaPosition, properties.position);
position = grid.snapToSurface(grid.snapToGrid(position, false, properties.dimensions, position = grid.snapToSurface(grid.snapToGrid(position, false, properties.dimensions,
properties.registrationPoint), properties.dimensions, properties.registrationPoint); properties.registrationPoint), properties.dimensions, properties.registrationPoint);
deltaPosition = Vec3.subtract(position, properties.position); deltaPosition = Vec3.subtract(position, properties.position);
} }
@ -1886,11 +1886,11 @@ var PropertiesTool = function (opts) {
} }
pushCommandForSelections(); pushCommandForSelections();
selectionManager._update(); selectionManager._update();
} else if(data.type === 'parent') { } else if (data.type === 'parent') {
parentSelectedEntities(); parentSelectedEntities();
} else if(data.type === 'unparent') { } else if (data.type === 'unparent') {
unparentSelectedEntities(); unparentSelectedEntities();
} else if(data.type === 'saveUserData'){ } else if (data.type === 'saveUserData'){
//the event bridge and json parsing handle our avatar id string differently. //the event bridge and json parsing handle our avatar id string differently.
var actualID = data.id.split('"')[1]; var actualID = data.id.split('"')[1];
Entities.editEntity(actualID, data.properties); Entities.editEntity(actualID, data.properties);
@ -2183,7 +2183,7 @@ var selectedParticleEntityID = null;
function selectParticleEntity(entityID) { function selectParticleEntity(entityID) {
var properties = Entities.getEntityProperties(entityID); var properties = Entities.getEntityProperties(entityID);
if(properties.emitOrientation) { if (properties.emitOrientation) {
properties.emitOrientation = Quat.safeEulerAngles(properties.emitOrientation); properties.emitOrientation = Quat.safeEulerAngles(properties.emitOrientation);
} }
var particleData = { var particleData = {
@ -2213,7 +2213,7 @@ entityListTool.webView.webEventReceived.connect(function (data) {
if (data.type === 'parent') { if (data.type === 'parent') {
parentSelectedEntities(); parentSelectedEntities();
} else if(data.type === 'unparent') { } else if (data.type === 'unparent') {
unparentSelectedEntities(); unparentSelectedEntities();
} else if (data.type === "selectionUpdate") { } else if (data.type === "selectionUpdate") {
var ids = data.entityIds; var ids = data.entityIds;