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

Merge pull request #15040 from SamGondelman/web

Browse source 
Case 21453: Fix web interaction and debug print filling logs
This commit is contained in:
Shannon Romano 2019-02-27 11:19:20 -08:00 committed by GitHub
commit c9edf86558
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/octree/SafeLanding.cpp
View file

@ -72,7 +72,7 @@ void SafeLanding::addTrackedEntity(const EntityItemID& entityID) {
Locker lock(_lock); Locker lock(_lock);
EntityItemPointer entity = _entityTree->findEntityByID(entityID); EntityItemPointer entity = _entityTree->findEntityByID(entityID);
if (entity && entity->getCreated() < _startTime) { if (entity && !entity->isLocalEntity() && entity->getCreated() < _startTime) {
_trackedEntities.emplace(entityID, entity); _trackedEntities.emplace(entityID, entity);
int trackedEntityCount = (int)_trackedEntities.size(); int trackedEntityCount = (int)_trackedEntities.size();
@ -81,7 +81,7 @@ void SafeLanding::addTrackedEntity(const EntityItemID& entityID) {
_maxTrackedEntityCount = trackedEntityCount; _maxTrackedEntityCount = trackedEntityCount;
_trackedEntityStabilityCount = 0; _trackedEntityStabilityCount = 0;
} }
qCDebug(interfaceapp) << "Safe Landing: Tracking entity " << entity->getItemName(); //qCDebug(interfaceapp) << "Safe Landing: Tracking entity " << entity->getItemName();
} }
} }
} }

6
libraries/entities/src/MovingEntitiesOperator.cpp
View file

@ -55,13 +55,11 @@ void MovingEntitiesOperator::addEntityToMoveList(EntityItemPointer entity, const
qCDebug(entities) << " oldContainingElement->bestFitBounds(newCubeClamped):" qCDebug(entities) << " oldContainingElement->bestFitBounds(newCubeClamped):"
<< oldContainingElement->bestFitBounds(newCubeClamped); << oldContainingElement->bestFitBounds(newCubeClamped);
} else { } else {
qCDebug(entities) << " WARNING NO OLD CONTAINING ELEMENT!!!"; qCDebug(entities) << " WARNING NO OLD CONTAINING ELEMENT for entity" << entity->getEntityItemID();
} }
} }
if (!oldContainingElement) { if (!oldContainingElement) {
qCDebug(entities) << "UNEXPECTED!!!! attempting to move entity "<< entity->getEntityItemID()
<< "that has no containing element. ";
return; // bail without adding. return; // bail without adding.
} }

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

@ -708,7 +708,7 @@ SelectionDisplay = (function() {
shape: "Cone", shape: "Cone",
solid: true, solid: true,
visible: false, visible: false,
ignoreRayIntersection: false, ignorePickIntersection: true,
drawInFront: true drawInFront: true
}; };
var handlePropertiesTranslateArrowCylinders = { var handlePropertiesTranslateArrowCylinders = {
@ -716,7 +716,7 @@ SelectionDisplay = (function() {
shape: "Cylinder", shape: "Cylinder",
solid: true, solid: true,
visible: false, visible: false,
ignoreRayIntersection: false, ignorePickIntersection: true,
drawInFront: true drawInFront: true
}; };
var handleTranslateXCone = Overlays.addOverlay("shape", handlePropertiesTranslateArrowCones); var handleTranslateXCone = Overlays.addOverlay("shape", handlePropertiesTranslateArrowCones);
@ -741,7 +741,7 @@ SelectionDisplay = (function() {
majorTickMarksAngle: ROTATE_DEFAULT_TICK_MARKS_ANGLE, majorTickMarksAngle: ROTATE_DEFAULT_TICK_MARKS_ANGLE,
majorTickMarksLength: 0.1, majorTickMarksLength: 0.1,
visible: false, visible: false,
ignoreRayIntersection: false, ignorePickIntersection: true,
drawInFront: true drawInFront: true
}; };
var handleRotatePitchRing = Overlays.addOverlay("circle3d", handlePropertiesRotateRings); var handleRotatePitchRing = Overlays.addOverlay("circle3d", handlePropertiesRotateRings);
@ -766,7 +766,7 @@ SelectionDisplay = (function() {
solid: true, solid: true,
innerRadius: 0.9, innerRadius: 0.9,
visible: false, visible: false,
ignoreRayIntersection: true, ignorePickIntersection: true,
drawInFront: true drawInFront: true
}); });
@ -779,7 +779,7 @@ SelectionDisplay = (function() {
visible: false, visible: false,
isFacingAvatar: true, isFacingAvatar: true,
drawInFront: true, drawInFront: true,
ignoreRayIntersection: true, ignorePickIntersection: true,
dimensions: { x: 0, y: 0 }, dimensions: { x: 0, y: 0 },
lineHeight: 0.0, lineHeight: 0.0,
topMargin: 0, topMargin: 0,
@ -791,7 +791,7 @@ SelectionDisplay = (function() {
var handlePropertiesStretchCubes = { var handlePropertiesStretchCubes = {
solid: true, solid: true,
visible: false, visible: false,
ignoreRayIntersection: false, ignorePickIntersection: true,
drawInFront: true drawInFront: true
}; };
var handleStretchXCube = Overlays.addOverlay("cube", handlePropertiesStretchCubes); var handleStretchXCube = Overlays.addOverlay("cube", handlePropertiesStretchCubes);
@ -802,18 +802,17 @@ SelectionDisplay = (function() {
Overlays.editOverlay(handleStretchZCube, { color: COLOR_BLUE }); Overlays.editOverlay(handleStretchZCube, { color: COLOR_BLUE });
var handlePropertiesStretchPanel = { var handlePropertiesStretchPanel = {
shape: "Quad",
alpha: 0.5, alpha: 0.5,
solid: true, solid: true,
visible: false, visible: false,
ignoreRayIntersection: true, ignorePickIntersection: true,
drawInFront: true drawInFront: true
}; };
var handleStretchXPanel = Overlays.addOverlay("shape", handlePropertiesStretchPanel); var handleStretchXPanel = Overlays.addOverlay("cube", handlePropertiesStretchPanel);
Overlays.editOverlay(handleStretchXPanel, { color: COLOR_RED }); Overlays.editOverlay(handleStretchXPanel, { color: COLOR_RED });
var handleStretchYPanel = Overlays.addOverlay("shape", handlePropertiesStretchPanel); var handleStretchYPanel = Overlays.addOverlay("cube", handlePropertiesStretchPanel);
Overlays.editOverlay(handleStretchYPanel, { color: COLOR_GREEN }); Overlays.editOverlay(handleStretchYPanel, { color: COLOR_GREEN });
var handleStretchZPanel = Overlays.addOverlay("shape", handlePropertiesStretchPanel); var handleStretchZPanel = Overlays.addOverlay("cube", handlePropertiesStretchPanel);
Overlays.editOverlay(handleStretchZPanel, { color: COLOR_BLUE }); Overlays.editOverlay(handleStretchZPanel, { color: COLOR_BLUE });
var handleScaleCube = Overlays.addOverlay("cube", { var handleScaleCube = Overlays.addOverlay("cube", {
@ -821,7 +820,7 @@ SelectionDisplay = (function() {
color: COLOR_SCALE_CUBE, color: COLOR_SCALE_CUBE,
solid: true, solid: true,
visible: false, visible: false,
ignoreRayIntersection: false, ignorePickIntersection: true,
drawInFront: true, drawInFront: true,
borderSize: 1.4 borderSize: 1.4
}); });
@ -841,7 +840,7 @@ SelectionDisplay = (function() {
color: COLOR_GREEN, color: COLOR_GREEN,
solid: true, solid: true,
visible: false, visible: false,
ignoreRayIntersection: false, ignorePickIntersection: true,
drawInFront: true, drawInFront: true,
borderSize: 1.4 borderSize: 1.4
}); });
@ -854,6 +853,7 @@ SelectionDisplay = (function() {
alpha: 0, alpha: 0,
solid: false, solid: false,
visible: false, visible: false,
ignorePickIntersection: true,
dashed: false dashed: false
}); });
@ -865,6 +865,7 @@ SelectionDisplay = (function() {
alpha: 0, alpha: 0,
solid: false, solid: false,
visible: false, visible: false,
ignorePickIntersection: true,
dashed: false dashed: false
}); });
@ -877,7 +878,7 @@ SelectionDisplay = (function() {
green: 0, green: 0,
blue: 0 blue: 0
}, },
ignoreRayIntersection: true // always ignore this ignorePickIntersection: true // always ignore this
}); });
var yRailOverlay = Overlays.addOverlay("line3d", { var yRailOverlay = Overlays.addOverlay("line3d", {
visible: false, visible: false,
@ -888,7 +889,7 @@ SelectionDisplay = (function() {
green: 255, green: 255,
blue: 0 blue: 0
}, },
ignoreRayIntersection: true // always ignore this ignorePickIntersection: true // always ignore this
}); });
var zRailOverlay = Overlays.addOverlay("line3d", { var zRailOverlay = Overlays.addOverlay("line3d", {
visible: false, visible: false,
@ -899,7 +900,7 @@ SelectionDisplay = (function() {
green: 0, green: 0,
blue: 255 blue: 255
}, },
ignoreRayIntersection: true // always ignore this ignorePickIntersection: true // always ignore this
}); });
var allOverlays = [ var allOverlays = [
@ -972,7 +973,7 @@ SelectionDisplay = (function() {
color: COLOR_DEBUG_PICK_PLANE, color: COLOR_DEBUG_PICK_PLANE,
solid: true, solid: true,
visible: false, visible: false,
ignoreRayIntersection: true, ignorePickIntersection: true,
drawInFront: false drawInFront: false
}); });
var debugPickPlaneHits = []; var debugPickPlaneHits = [];
@ -1802,6 +1803,7 @@ SelectionDisplay = (function() {
isActiveTool(handleRotateYawRing) || isActiveTool(handleRotateYawRing) ||
isActiveTool(handleRotateRollRing); isActiveTool(handleRotateRollRing);
selectionBoxGeometry.visible = !inModeRotate && !isCameraInsideBox; selectionBoxGeometry.visible = !inModeRotate && !isCameraInsideBox;
selectionBoxGeometry.ignorePickIntersection = !selectionBoxGeometry.visible;
Overlays.editOverlay(selectionBox, selectionBoxGeometry); Overlays.editOverlay(selectionBox, selectionBoxGeometry);
// UPDATE ICON TRANSLATE HANDLE // UPDATE ICON TRANSLATE HANDLE
@ -1811,9 +1813,13 @@ SelectionDisplay = (function() {
rotation: rotation rotation: rotation
}; };
iconSelectionBoxGeometry.visible = !inModeRotate && isCameraInsideBox; iconSelectionBoxGeometry.visible = !inModeRotate && isCameraInsideBox;
iconSelectionBoxGeometry.ignorePickIntersection = !iconSelectionBoxGeometry.visible;
Overlays.editOverlay(iconSelectionBox, iconSelectionBoxGeometry); Overlays.editOverlay(iconSelectionBox, iconSelectionBoxGeometry);
} else { } else {
Overlays.editOverlay(iconSelectionBox, { visible: false }); Overlays.editOverlay(iconSelectionBox, {
visible: false,
ignorePickIntersection: true
});
} }
// UPDATE DUPLICATOR (CURRENTLY HIDDEN FOR NOW) // UPDATE DUPLICATOR (CURRENTLY HIDDEN FOR NOW)
@ -1882,7 +1888,7 @@ SelectionDisplay = (function() {
// FUNCTION: SET OVERLAYS VISIBLE // FUNCTION: SET OVERLAYS VISIBLE
that.setOverlaysVisible = function(isVisible) { that.setOverlaysVisible = function(isVisible) {
for (var i = 0, length = allOverlays.length; i < length; i++) { for (var i = 0, length = allOverlays.length; i < length; i++) {
Overlays.editOverlay(allOverlays[i], { visible: isVisible }); Overlays.editOverlay(allOverlays[i], { visible: isVisible, ignorePickIntersection: !isVisible });
} }
}; };
@ -1894,18 +1900,18 @@ SelectionDisplay = (function() {
}; };
that.setHandleTranslateXVisible = function(isVisible) { that.setHandleTranslateXVisible = function(isVisible) {
Overlays.editOverlay(handleTranslateXCone, { visible: isVisible }); Overlays.editOverlay(handleTranslateXCone, { visible: isVisible, ignorePickIntersection: !isVisible });
Overlays.editOverlay(handleTranslateXCylinder, { visible: isVisible }); Overlays.editOverlay(handleTranslateXCylinder, { visible: isVisible, ignorePickIntersection: !isVisible });
}; };
that.setHandleTranslateYVisible = function(isVisible) { that.setHandleTranslateYVisible = function(isVisible) {
Overlays.editOverlay(handleTranslateYCone, { visible: isVisible }); Overlays.editOverlay(handleTranslateYCone, { visible: isVisible, ignorePickIntersection: !isVisible });
Overlays.editOverlay(handleTranslateYCylinder, { visible: isVisible }); Overlays.editOverlay(handleTranslateYCylinder, { visible: isVisible, ignorePickIntersection: !isVisible });
}; };
that.setHandleTranslateZVisible = function(isVisible) { that.setHandleTranslateZVisible = function(isVisible) {
Overlays.editOverlay(handleTranslateZCone, { visible: isVisible }); Overlays.editOverlay(handleTranslateZCone, { visible: isVisible, ignorePickIntersection: !isVisible });
Overlays.editOverlay(handleTranslateZCylinder, { visible: isVisible }); Overlays.editOverlay(handleTranslateZCylinder, { visible: isVisible, ignorePickIntersection: !isVisible });
}; };
// FUNCTION: SET HANDLE ROTATE VISIBLE // FUNCTION: SET HANDLE ROTATE VISIBLE
@ -1916,15 +1922,15 @@ SelectionDisplay = (function() {
}; };
that.setHandleRotatePitchVisible = function(isVisible) { that.setHandleRotatePitchVisible = function(isVisible) {
Overlays.editOverlay(handleRotatePitchRing, { visible: isVisible }); Overlays.editOverlay(handleRotatePitchRing, { visible: isVisible, ignorePickIntersection: !isVisible });
}; };
that.setHandleRotateYawVisible = function(isVisible) { that.setHandleRotateYawVisible = function(isVisible) {
Overlays.editOverlay(handleRotateYawRing, { visible: isVisible }); Overlays.editOverlay(handleRotateYawRing, { visible: isVisible, ignorePickIntersection: !isVisible });
}; };
that.setHandleRotateRollVisible = function(isVisible) { that.setHandleRotateRollVisible = function(isVisible) {
Overlays.editOverlay(handleRotateRollRing, { visible: isVisible }); Overlays.editOverlay(handleRotateRollRing, { visible: isVisible, ignorePickIntersection: !isVisible });
}; };
// FUNCTION: SET HANDLE STRETCH VISIBLE // FUNCTION: SET HANDLE STRETCH VISIBLE
@ -1935,15 +1941,15 @@ SelectionDisplay = (function() {
}; };
that.setHandleStretchXVisible = function(isVisible) { that.setHandleStretchXVisible = function(isVisible) {
Overlays.editOverlay(handleStretchXCube, { visible: isVisible }); Overlays.editOverlay(handleStretchXCube, { visible: isVisible, ignorePickIntersection: !isVisible });
}; };
that.setHandleStretchYVisible = function(isVisible) { that.setHandleStretchYVisible = function(isVisible) {
Overlays.editOverlay(handleStretchYCube, { visible: isVisible }); Overlays.editOverlay(handleStretchYCube, { visible: isVisible, ignorePickIntersection: !isVisible });
}; };
that.setHandleStretchZVisible = function(isVisible) { that.setHandleStretchZVisible = function(isVisible) {
Overlays.editOverlay(handleStretchZCube, { visible: isVisible }); Overlays.editOverlay(handleStretchZCube, { visible: isVisible, ignorePickIntersection: !isVisible });
}; };
// FUNCTION: SET HANDLE SCALE VISIBLE // FUNCTION: SET HANDLE SCALE VISIBLE
@ -1953,16 +1959,16 @@ SelectionDisplay = (function() {
}; };
that.setHandleScaleVisible = function(isVisible) { that.setHandleScaleVisible = function(isVisible) {
Overlays.editOverlay(handleScaleCube, { visible: isVisible }); Overlays.editOverlay(handleScaleCube, { visible: isVisible, ignorePickIntersection: !isVisible });
}; };
that.setHandleBoundingBoxVisible = function(isVisible) { that.setHandleBoundingBoxVisible = function(isVisible) {
Overlays.editOverlay(handleBoundingBox, { visible: isVisible }); Overlays.editOverlay(handleBoundingBox, { visible: isVisible, ignorePickIntersection: true });
}; };
// FUNCTION: SET HANDLE DUPLICATOR VISIBLE // FUNCTION: SET HANDLE DUPLICATOR VISIBLE
that.setHandleDuplicatorVisible = function(isVisible) { that.setHandleDuplicatorVisible = function(isVisible) {
Overlays.editOverlay(handleDuplicator, { visible: isVisible }); Overlays.editOverlay(handleDuplicator, { visible: isVisible, ignorePickIntersection: !isVisible });
}; };
// FUNCTION: DEBUG PICK PLANE // FUNCTION: DEBUG PICK PLANE
@ -1975,7 +1981,7 @@ SelectionDisplay = (function() {
position: pickPlanePosition, position: pickPlanePosition,
rotation: rotation, rotation: rotation,
dimensions: dimensions, dimensions: dimensions,
visible: true visible: true
}); });
}; };
@ -1986,7 +1992,7 @@ SelectionDisplay = (function() {
shape: "Sphere", shape: "Sphere",
solid: true, solid: true,
visible: true, visible: true,
ignoreRayIntersection: true, ignorePickIntersection: true,
drawInFront: false, drawInFront: false,
color: COLOR_DEBUG_PICK_PLANE_HIT, color: COLOR_DEBUG_PICK_PLANE_HIT,
position: pickHitPosition, position: pickHitPosition,
@ -2082,10 +2088,12 @@ SelectionDisplay = (function() {
pushCommandForSelections(duplicatedEntityIDs); pushCommandForSelections(duplicatedEntityIDs);
if (isConstrained) { if (isConstrained) {
Overlays.editOverlay(xRailOverlay, { Overlays.editOverlay(xRailOverlay, {
visible: false visible: false,
ignorePickIntersection: true
}); });
Overlays.editOverlay(zRailOverlay, { Overlays.editOverlay(zRailOverlay, {
visible: false visible: false,
ignorePickIntersection: true
}); });
} }
}, },
@ -2174,22 +2182,26 @@ SelectionDisplay = (function() {
Overlays.editOverlay(xRailOverlay, { Overlays.editOverlay(xRailOverlay, {
start: xStart, start: xStart,
end: xEnd, end: xEnd,
visible: true visible: true,
ignorePickIntersection: true
}); });
Overlays.editOverlay(zRailOverlay, { Overlays.editOverlay(zRailOverlay, {
start: zStart, start: zStart,
end: zEnd, end: zEnd,
visible: true visible: true,
ignorePickIntersection: true
}); });
isConstrained = true; isConstrained = true;
} }
} else { } else {
if (isConstrained) { if (isConstrained) {
Overlays.editOverlay(xRailOverlay, { Overlays.editOverlay(xRailOverlay, {
visible: false visible: false,
ignorePickIntersection: true
}); });
Overlays.editOverlay(zRailOverlay, { Overlays.editOverlay(zRailOverlay, {
visible: false visible: false,
ignorePickIntersection: true
}); });
isConstrained = false; isConstrained = false;
} }
@ -2460,7 +2472,7 @@ SelectionDisplay = (function() {
} }
if (stretchPanel !== null) { if (stretchPanel !== null) {
Overlays.editOverlay(stretchPanel, { visible: true }); Overlays.editOverlay(stretchPanel, { visible: true, ignorePickIntersection: false });
} }
var stretchCubePosition = Overlays.getProperty(handleStretchCube, "position"); var stretchCubePosition = Overlays.getProperty(handleStretchCube, "position");
var stretchPanelPosition = Overlays.getProperty(stretchPanel, "position"); var stretchPanelPosition = Overlays.getProperty(stretchPanel, "position");
@ -2481,7 +2493,7 @@ SelectionDisplay = (function() {
} }
if (stretchPanel !== null) { if (stretchPanel !== null) {
Overlays.editOverlay(stretchPanel, { visible: false }); Overlays.editOverlay(stretchPanel, { visible: false, ignorePickIntersection: true });
} }
activeStretchCubePanelOffset = null; activeStretchCubePanelOffset = null;
@ -2775,7 +2787,8 @@ SelectionDisplay = (function() {
rotation: worldRotation, rotation: worldRotation,
startAt: 0, startAt: 0,
endAt: 0, endAt: 0,
visible: true visible: true,
ignorePickIntersection: false
}); });
// editOverlays may not have committed rotation changes. // editOverlays may not have committed rotation changes.
@ -2805,13 +2818,13 @@ SelectionDisplay = (function() {
if (wantDebug) { if (wantDebug) {
print("================== " + getMode() + "(addHandleRotateTool onEnd) -> ======================="); print("================== " + getMode() + "(addHandleRotateTool onEnd) -> =======================");
} }
Overlays.editOverlay(rotationDegreesDisplay, { visible: false }); Overlays.editOverlay(rotationDegreesDisplay, { visible: false, ignorePickIntersection: true });
Overlays.editOverlay(selectedHandle, { Overlays.editOverlay(selectedHandle, {
hasTickMarks: false, hasTickMarks: false,
solid: true, solid: true,
innerRadius: ROTATE_RING_IDLE_INNER_RADIUS innerRadius: ROTATE_RING_IDLE_INNER_RADIUS
}); });
Overlays.editOverlay(handleRotateCurrentRing, { visible: false }); Overlays.editOverlay(handleRotateCurrentRing, { visible: false, ignorePickIntersection: true });
pushCommandForSelections(); pushCommandForSelections();
if (wantDebug) { if (wantDebug) {
print("================== " + getMode() + "(addHandleRotateTool onEnd) <- ======================="); print("================== " + getMode() + "(addHandleRotateTool onEnd) <- =======================");