Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tabs

Browse source
This commit is contained in:
David Back 2018-06-15 17:33:49 -07:00
parent b10cf364c4
commit d16b777977
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2027,13 +2027,13 @@ SelectionDisplay = (function() {
if (scaleHandle != null) {
Overlays.editOverlay(scaleHandle, { color: COLOR_SCALE_CUBE_SELECTED });
}
var myAvatarIndex = properties.collidesWith.indexOf("myAvatar");
if (myAvatarIndex > -1) {
var newCollidesWith = properties.collidesWith.replace("myAvatar", "");
Entities.editEntity(SelectionManager.selections[0], {collidesWith: newCollidesWith});
that.replaceCollisionsAfterStretch = true;
}
var myAvatarIndex = properties.collidesWith.indexOf("myAvatar");
if (myAvatarIndex > -1) {
var newCollidesWith = properties.collidesWith.replace("myAvatar", "");
Entities.editEntity(SelectionManager.selections[0], {collidesWith: newCollidesWith});
that.replaceCollisionsAfterStretch = true;
}
};
var onEnd = function(event, reason) {
@ -2043,13 +2043,13 @@ SelectionDisplay = (function() {
if (scaleHandle != null) {
Overlays.editOverlay(scaleHandle, { color: COLOR_SCALE_CUBE });
}
if (that.replaceCollisionsAfterStretch) {
var newCollidesWith = SelectionManager.savedProperties[SelectionManager.selections[0]].collidesWith;
Entities.editEntity(SelectionManager.selections[0], {collidesWith: newCollidesWith});
that.replaceCollisionsAfterStretch = false;
}
if (that.replaceCollisionsAfterStretch) {
var newCollidesWith = SelectionManager.savedProperties[SelectionManager.selections[0]].collidesWith;
Entities.editEntity(SelectionManager.selections[0], {collidesWith: newCollidesWith});
that.replaceCollisionsAfterStretch = false;
}
pushCommandForSelections();
};
@ -2135,7 +2135,7 @@ SelectionDisplay = (function() {
}
var newPosition = Vec3.sum(initialPosition, changeInPosition);
Entities.editEntity(SelectionManager.selections[0], {
Entities.editEntity(SelectionManager.selections[0], {
position: newPosition,
dimensions: newDimensions
});