Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tidying

Browse source
This commit is contained in:
David Rowe 2017-05-30 14:38:59 +12:00
parent b176dbe544
commit e02021bddf
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/system/edit.js
View file

@ -256,8 +256,6 @@ var toolBar = (function () {
tablet = null; tablet = null;
function createNewEntity(properties) { function createNewEntity(properties) {
var dimensions = properties.dimensions ? properties.dimensions : DEFAULT_DIMENSIONS; var dimensions = properties.dimensions ? properties.dimensions : DEFAULT_DIMENSIONS;
var position = getPositionToCreateEntity(); var position = getPositionToCreateEntity();
var entityID = null; var entityID = null;
@ -307,7 +305,7 @@ var toolBar = (function () {
var dimensionsCheckCount = 0; var dimensionsCheckCount = 0;
var dimensionsCheckFunction = function () { var dimensionsCheckFunction = function () {
dimensionsCheckCount++; dimensionsCheckCount++;
var properties = Entities.getEntityProperties(entityID, ["dimensions", "registrationPoint", "orientation", "rotation"]); var properties = Entities.getEntityProperties(entityID, ["dimensions", "registrationPoint", "rotation"]);
if (!Vec3.equal(properties.dimensions, initialDimensions)) { if (!Vec3.equal(properties.dimensions, initialDimensions)) {
position = adjustPositionPerBoundingBox(position, direction, properties.registrationPoint, position = adjustPositionPerBoundingBox(position, direction, properties.registrationPoint,
properties.dimensions, properties.rotation); properties.dimensions, properties.rotation);
@ -1551,12 +1549,13 @@ function importSVO(importURL) {
for (var i = 0, length = pastedEntityIDs.length; i < length; i++) { for (var i = 0, length = pastedEntityIDs.length; i < length; i++) {
var properties = Entities.getEntityProperties(pastedEntityIDs[i], ["position", "dimensions", var properties = Entities.getEntityProperties(pastedEntityIDs[i], ["position", "dimensions",
"registrationPoint", "rotation"]); "registrationPoint", "rotation"]);
var adjustedPosition = adjustPositionPerBoundingBox(targetPosition, targetDirection, properties.registrationPoint, var adjustedPosition = adjustPositionPerBoundingBox(targetPosition, targetDirection,
properties.dimensions, properties.rotation); properties.registrationPoint, properties.dimensions, properties.rotation);
var delta = Vec3.subtract(adjustedPosition, properties.position); var delta = Vec3.subtract(adjustedPosition, properties.position);
var distance = Vec3.dot(delta, targetDirection); var distance = Vec3.dot(delta, targetDirection);
deltaParallel = Math.min(distance, deltaParallel); deltaParallel = Math.min(distance, deltaParallel);
deltaPerpendicular = Vec3.sum(Vec3.subtract(delta, Vec3.multiply(distance, targetDirection)), deltaPerpendicular); deltaPerpendicular = Vec3.sum(Vec3.subtract(delta, Vec3.multiply(distance, targetDirection)),
deltaPerpendicular);
entityPositions[i] = properties.position; entityPositions[i] = properties.position;
} }
deltaPerpendicular = Vec3.multiply(1 / pastedEntityIDs.length, deltaPerpendicular); deltaPerpendicular = Vec3.multiply(1 / pastedEntityIDs.length, deltaPerpendicular);