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

Merge pull request #4934 from sethalves/fix-edit-js

Browse source 
fix edit.js -- selectionManager.selections holds ids, not properties
This commit is contained in:
Brad Hefta-Gaub 2015-05-21 18:32:05 -07:00
commit 9b469226f3
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
examples/edit.js
View file

@ -762,7 +762,7 @@ function mouseClickEvent(event) {
selectionManager.addEntity(foundEntity, true); selectionManager.addEntity(foundEntity, true);
} }
print("Model selected: " + foundEntity.id); print("Model selected: " + foundEntity);
selectionDisplay.select(selectedEntityID, event); selectionDisplay.select(selectedEntityID, event);
if (Menu.isOptionChecked(MENU_AUTO_FOCUS_ON_SELECT)) { if (Menu.isOptionChecked(MENU_AUTO_FOCUS_ON_SELECT)) {
@ -1201,7 +1201,7 @@ PropertiesTool = function(opts) {
var selections = []; var selections = [];
for (var i = 0; i < selectionManager.selections.length; i++) { for (var i = 0; i < selectionManager.selections.length; i++) {
var entity = {}; var entity = {};
entity.id = selectionManager.selections[i].id; entity.id = selectionManager.selections[i];
entity.properties = Entities.getEntityProperties(selectionManager.selections[i]); entity.properties = Entities.getEntityProperties(selectionManager.selections[i]);
entity.properties.rotation = Quat.safeEulerAngles(entity.properties.rotation); entity.properties.rotation = Quat.safeEulerAngles(entity.properties.rotation);
selections.push(entity); selections.push(entity);
@ -1251,7 +1251,7 @@ PropertiesTool = function(opts) {
var dY = grid.getOrigin().y - (selectionManager.worldPosition.y - selectionManager.worldDimensions.y / 2), var dY = grid.getOrigin().y - (selectionManager.worldPosition.y - selectionManager.worldDimensions.y / 2),
var diff = { x: 0, y: dY, z: 0 }; var diff = { x: 0, y: dY, z: 0 };
for (var i = 0; i < selectionManager.selections.length; i++) { for (var i = 0; i < selectionManager.selections.length; i++) {
var properties = selectionManager.savedProperties[selectionManager.selections[i].id]; var properties = selectionManager.savedProperties[selectionManager.selections[i]];
var newPosition = Vec3.sum(properties.position, diff); var newPosition = Vec3.sum(properties.position, diff);
Entities.editEntity(selectionManager.selections[i], { Entities.editEntity(selectionManager.selections[i], {
position: newPosition, position: newPosition,
@ -1264,7 +1264,7 @@ PropertiesTool = function(opts) {
if (selectionManager.hasSelection()) { if (selectionManager.hasSelection()) {
selectionManager.saveProperties(); selectionManager.saveProperties();
for (var i = 0; i < selectionManager.selections.length; i++) { for (var i = 0; i < selectionManager.selections.length; i++) {
var properties = selectionManager.savedProperties[selectionManager.selections[i].id]; var properties = selectionManager.savedProperties[selectionManager.selections[i]];
var bottomY = properties.boundingBox.center.y - properties.boundingBox.dimensions.y / 2; var bottomY = properties.boundingBox.center.y - properties.boundingBox.dimensions.y / 2;
var dY = grid.getOrigin().y - bottomY; var dY = grid.getOrigin().y - bottomY;
var diff = { x: 0, y: dY, z: 0 }; var diff = { x: 0, y: dY, z: 0 };
@ -1280,7 +1280,7 @@ PropertiesTool = function(opts) {
if (selectionManager.hasSelection()) { if (selectionManager.hasSelection()) {
selectionManager.saveProperties(); selectionManager.saveProperties();
for (var i = 0; i < selectionManager.selections.length; i++) { for (var i = 0; i < selectionManager.selections.length; i++) {
var properties = selectionManager.savedProperties[selectionManager.selections[i].id]; var properties = selectionManager.savedProperties[selectionManager.selections[i]];
var naturalDimensions = properties.naturalDimensions; var naturalDimensions = properties.naturalDimensions;
// If any of the natural dimensions are not 0, resize // If any of the natural dimensions are not 0, resize
@ -1302,7 +1302,7 @@ PropertiesTool = function(opts) {
if (selectionManager.hasSelection()) { if (selectionManager.hasSelection()) {
selectionManager.saveProperties(); selectionManager.saveProperties();
for (var i = 0; i < selectionManager.selections.length; i++) { for (var i = 0; i < selectionManager.selections.length; i++) {
var properties = selectionManager.savedProperties[selectionManager.selections[i].id]; var properties = selectionManager.savedProperties[selectionManager.selections[i]];
Entities.editEntity(selectionManager.selections[i], { Entities.editEntity(selectionManager.selections[i], {
dimensions: Vec3.multiply(multiplier, properties.dimensions), dimensions: Vec3.multiply(multiplier, properties.dimensions),
}); });
@ -1314,7 +1314,7 @@ PropertiesTool = function(opts) {
if (selectionManager.hasSelection()) { if (selectionManager.hasSelection()) {
selectionManager.saveProperties(); selectionManager.saveProperties();
for (var i = 0; i < selectionManager.selections.length; i++) { for (var i = 0; i < selectionManager.selections.length; i++) {
var properties = selectionManager.savedProperties[selectionManager.selections[i].id]; var properties = selectionManager.savedProperties[selectionManager.selections[i]];
if (properties.type == "Zone") { if (properties.type == "Zone") {
var centerOfZone = properties.boundingBox.center; var centerOfZone = properties.boundingBox.center;
var atmosphereCenter = { x: centerOfZone.x, var atmosphereCenter = { x: centerOfZone.x,