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

Add names to objects of the selection, remove comments in shader and fix one more warning on linux

Browse source
This commit is contained in:
Sam Gateau 2017-12-11 00:31:54 -08:00
parent bb888f2d4c
commit cc4b266647
3 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/scripting/SelectionScriptingInterface.cpp
View file

@ -283,7 +283,7 @@ bool SelectionScriptingInterface::removeListFromMap(const QString& listName) {
bool removed = false; bool removed = false;
{ {
QWriteLocker lock(&_selectionListsLock); QWriteLocker lock(&_selectionListsLock);
bool removed = _selectedItemsListMap.remove(listName); removed = _selectedItemsListMap.remove(listName);
} }
if (removed) { if (removed) {
onSelectedItemsListChanged(listName); onSelectedItemsListChanged(listName);

2
libraries/render-utils/src/Highlight.slh
View file

@ -78,9 +78,7 @@ void main(void) {
{ {
outlinedDepth = texture(highlightedDepthMap, uv).x; outlinedDepth = texture(highlightedDepthMap, uv).x;
float touch = (outlinedDepth < FAR_Z) ? 1.0 : 0.0; float touch = (outlinedDepth < FAR_Z) ? 1.0 : 0.0;
//sumOutlineDepth = min(outlinedDepth, sumOutlineDepth);
sumOutlineDepth = max(outlinedDepth * touch, sumOutlineDepth); sumOutlineDepth = max(outlinedDepth * touch, sumOutlineDepth);
// sumOutlineDepth += (outlinedDepth * touch);
intensity += touch; intensity += touch;
weight += 1.f; weight += 1.f;
} }

25
scripts/developer/utilities/render/highlight.qml
View file

@ -136,14 +136,27 @@ Item {
function resetSelectionView() { function resetSelectionView() {
myModel.clear() myModel.clear()
var entities = Selection.getSelectedItemsList(root.listName)["entities"] var entities = Selection.getSelectedItemsList(root.listName)["entities"]
if (entities === undefined) { if (entities !== undefined) {
return; myModel.append({ "objectID": "Entities" })
} for (var i = 0; i < entities.length; i++) {
var fLen = entities.length;
for (var i = 0; i < fLen; i++) {
myModel.append({ "objectID": JSON.stringify(entities[i]) }) myModel.append({ "objectID": JSON.stringify(entities[i]) })
} }
} }
var overlays = Selection.getSelectedItemsList(root.listName)["overlays"]
if (overlays !== undefined) {
myModel.append({ "objectID": "Overlays" })
for (var i = 0; i < overlays.length; i++) {
myModel.append({ "objectID": JSON.stringify(overlays[i]) })
}
}
var avatars = Selection.getSelectedItemsList(root.listName)["avatars"]
if (avatars !== undefined) {
myModel.append({ "objectID": "Avatars" })
for (var i = 0; i < avatars.length; i++) {
myModel.append({ "objectID": JSON.stringify(avatars[i]) })
}
}
}
ListModel { ListModel {
id: myModel id: myModel
@ -153,7 +166,7 @@ Item {
id: myDelegate id: myDelegate
Row { Row {
id: fruit id: fruit
Text { text: JSON.stringify(objectID) } Text { text: objectID }
} }
} }