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

Don't disable lasering on particle or light entity icon when is selected

Browse source
This commit is contained in:
David Rowe 2018-05-06 20:23:49 +12:00
parent ed1391581e
commit 8fd972fce9
3 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/system/edit.js
View file

@ -778,7 +778,6 @@ var toolBar = (function () {
selectionDisplay.triggerMapping.enable();
print("starting tablet in landscape mode");
tablet.landscape = true;
entityIconOverlayManager.setIconsSelectable(null,false);
// Not sure what the following was meant to accomplish, but it currently causes
// everybody else to think that Interface has lost focus overall. fogbugzid:558
// Window.setFocus();

26
scripts/system/libraries/entityIconOverlayManager.js
View file

@ -70,29 +70,6 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
}
};
this.setIconsSelectable = function(arrayOfSelectedEntityIDs, isIconsSelectable) {
if (arrayOfSelectedEntityIDs === null) {
for (var id in entityOverlays) {
Overlays.editOverlay(entityOverlays[id], {
ignoreRayIntersection: isIconsSelectable
});
}
} else {
for (var id in entityOverlays) {
if (arrayOfSelectedEntityIDs.indexOf(id) !== -1) { // in the entityOverlays array and selectable
Overlays.editOverlay(entityOverlays[id], {
ignoreRayIntersection: isIconsSelectable
});
} else {
Overlays.editOverlay(entityOverlays[id], {
ignoreRayIntersection: !isIconsSelectable
});
}
}
}
};
// Allocate or get an unused overlay
function getOverlay() {
var overlay;
@ -138,9 +115,6 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
overlayProperties[key] = customProperties[key];
}
}
if(properties.type === 'ParticleEffect' || properties.type === 'Light'){
overlayProperties.ignoreRayIntersection = true;
}
Overlays.editOverlay(overlay, overlayProperties);
}
}

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

@ -723,10 +723,6 @@ SelectionDisplay = (function() {
return false;
}
/*
entityIconOverlayManager.setIconsSelectable(SelectionManager.selections, true);
*/
var hitTool = handleTools[ hitOverlayID ];
if (hitTool) {
activeTool = hitTool;