mirror of
https://github.com/JulianGro/overte.git
synced 2025-08-05 18:34:42 +02:00
bad avatar collision merge
This commit is contained in:
parent
f65bc9b5ed
commit
05438f3b85
1 changed files with 0 additions and 12 deletions
|
@ -657,11 +657,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');
|
||||||
|
@ -1882,13 +1877,6 @@ SelectionDisplay = (function() {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
that.restoreAvatarCollisionsFromStretch = function() {
|
|
||||||
if (handleStretchCollisionOverride) {
|
|
||||||
Menu.setIsOptionChecked(AVATAR_COLLISIONS_OPTION, 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;
|
||||||
|
|
Loading…
Reference in a new issue