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

temp disable myAvatar collisions when stretching

Browse source
This commit is contained in:
David Back 2018-06-15 17:32:03 -07:00
parent cb9c255acd
commit 6ef8206f3a
1 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -366,7 +366,7 @@ SelectionDisplay = (function() {
var ctrlPressed = false; var ctrlPressed = false;
var handleStretchCollisionOverride = false; var replaceCollisionsAfterStretch = false;
var handlePropertiesTranslateArrowCones = { var handlePropertiesTranslateArrowCones = {
shape: "Cone", shape: "Cone",
@ -642,11 +642,6 @@ SelectionDisplay = (function() {
var activeTool = null; var activeTool = null;
var handleTools = {}; var handleTools = {};
that.shutdown = function() {
that.restoreAvatarCollisionsFromStretch();
}
Script.scriptEnding.connect(that.shutdown);
// We get mouseMoveEvents from the handControllers, via handControllerPointer. // We get mouseMoveEvents from the handControllers, via handControllerPointer.
// But we dont' get mousePressEvents. // But we dont' get mousePressEvents.
that.triggerMapping = Controller.newMapping(Script.resolvePath('') + '-click'); that.triggerMapping = Controller.newMapping(Script.resolvePath('') + '-click');
@ -1830,13 +1825,6 @@ SelectionDisplay = (function() {
}; };
}; };
that.restoreAvatarCollisionsFromStretch = function() {
if (handleStretchCollisionOverride) {
MyAvatar.setCollisionsEnabled(true);
handleStretchCollisionOverride = false;
}
}
// TOOL DEFINITION: HANDLE STRETCH TOOL // TOOL DEFINITION: HANDLE STRETCH TOOL
function makeStretchTool(stretchMode, directionEnum, directionVec, pivot, offset, stretchPanel, scaleHandle) { function makeStretchTool(stretchMode, directionEnum, directionVec, pivot, offset, stretchPanel, scaleHandle) {
var directionFor3DStretch = directionVec; var directionFor3DStretch = directionVec;
@ -2039,10 +2027,13 @@ SelectionDisplay = (function() {
if (scaleHandle != null) { if (scaleHandle != null) {
Overlays.editOverlay(scaleHandle, { color: COLOR_SCALE_CUBE_SELECTED }); Overlays.editOverlay(scaleHandle, { color: COLOR_SCALE_CUBE_SELECTED });
} }
if (MyAvatar.getCollisionsEnabled()) {
MyAvatar.setCollisionsEnabled(false); var myAvatarIndex = properties.collidesWith.indexOf("myAvatar");
handleStretchCollisionOverride = true; if (myAvatarIndex > -1) {
} var newCollidesWith = properties.collidesWith.replace("myAvatar", "");
Entities.editEntity(SelectionManager.selections[0], {collidesWith: newCollidesWith});
that.replaceCollisionsAfterStretch = true;
}
}; };
var onEnd = function(event, reason) { var onEnd = function(event, reason) {
@ -2052,7 +2043,13 @@ SelectionDisplay = (function() {
if (scaleHandle != null) { if (scaleHandle != null) {
Overlays.editOverlay(scaleHandle, { color: COLOR_SCALE_CUBE }); Overlays.editOverlay(scaleHandle, { color: COLOR_SCALE_CUBE });
} }
that.restoreAvatarCollisionsFromStretch();
if (that.replaceCollisionsAfterStretch) {
var newCollidesWith = SelectionManager.savedProperties[SelectionManager.selections[0]].collidesWith;
Entities.editEntity(SelectionManager.selections[0], {collidesWith: newCollidesWith});
that.replaceCollisionsAfterStretch = false;
}
pushCommandForSelections(); pushCommandForSelections();
}; };
@ -2138,12 +2135,10 @@ SelectionDisplay = (function() {
} }
var newPosition = Vec3.sum(initialPosition, changeInPosition); var newPosition = Vec3.sum(initialPosition, changeInPosition);
for (var i = 0; i < SelectionManager.selections.length; i++) { Entities.editEntity(SelectionManager.selections[0], {
Entities.editEntity(SelectionManager.selections[i], { position: newPosition,
position: newPosition, dimensions: newDimensions
dimensions: newDimensions });
});
}
var wantDebug = false; var wantDebug = false;
if (wantDebug) { if (wantDebug) {