Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 14:44:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve cross-thread support for panel children.

Browse source
This commit is contained in:
Zander Otavka 2015-08-06 11:40:49 -07:00
parent 021dff63b4
commit 6165e7e6ca
5 changed files with 37 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/example/ui/floatingUIExample.js
View file

@ -186,6 +186,10 @@ function onScriptEnd() {
mainPanel.destroy();
}
print(JSON.stringify(mainPanel.children));
print(JSON.stringify(bluePanel.children));
print(bluePanel._id);
Controller.mousePressEvent.connect(onMouseDown);
Controller.mouseReleaseEvent.connect(onMouseUp);
Script.scriptEnding.connect(onScriptEnd);

49
examples/libraries/overlayManager.js
View file

@ -60,10 +60,6 @@
}
var overlay = new overlayTypes[type]();
overlay._id = id;
var attachedPanel = findPanel(Overlays.getAttachedPanel(id))
if (attachedPanel) {
attachedPanel.addChild(overlay);
}
overlays[id] = overlay;
return overlay;
}
@ -101,10 +97,6 @@
}
var panel = new FloatingUIPanel();
panel._id = id;
var attachedPanel = findPanel(Overlays.getAttachedPanel(id))
if (attachedPanel) {
attachedPanel.addChild(panel);
}
overlays[id] = overlay;
return overlay;
}
@ -133,6 +125,11 @@
return null;
}
function findOverlayOrPanel(id, knownObjectsOnly, searchList) {
return findOverlay(id, knownObjectsOnly, searchList) ||
findPanel(id, knownObjectsOnly, searchList);
}
//
// Perform global scoped operations on overlays, such as finding by ray intersection.
@ -154,10 +151,10 @@
return OverlayManager.findOnRay(pickRay, knownOverlaysOnly, searchList);
}
},
makeSearchList: function(overlayArray) {
makeSearchList: function(array) {
var searchList = {};
overlayArray.forEach(function(overlay){
searchList[overlay._id] = overlay;
array.forEach(function(object) {
searchList[object._id] = object;
});
return searchList;
}
@ -280,7 +277,7 @@
};
that.prototype.isPanelAttachable = function() {
return true;
return false;
};
return generateOverlayClass(that, ABSTRACT, [
@ -380,17 +377,11 @@
FloatingUIPanel = (function() {
var that = function(params) {
this._id = Overlays.addPanel(params);
this._children = [];
this._visible = Boolean(params.visible);
panels[this._id] = this;
};
that.prototype.constructor = that;
that.AddChildException = function(message) {
this.message = message;
};
[
"anchorPosition", "anchorPositionBinding", "offsetRotation", "offsetRotationBinding",
"offsetPosition", "facingRotation", "visible"
@ -416,27 +407,23 @@
Object.defineProperty(that.prototype, "children", {
get: function() {
return this._children.slice();
var idArray = Overlays.getPanelProperty(this._id, "children");
var objArray = [];
for (var i = 0; i < idArray.length; i++) {
objArray[i] = findOverlayOrPanel(idArray[i]);
}
return objArray;
}
});
that.prototype.addChild = function(child) {
if (child instanceof Overlay && child.isPanelAttachable() ||
child instanceof FloatingUIPanel) {
Overlays.setAttachedPanel(child._id, this._id);
} else {
throw new that.AddChildException("Given child is not panel attachable.");
}
child.visible = this.visible;
this._children.push(child);
Overlays.setAttachedPanel(child._id, this._id);
return child;
};
that.prototype.removeChild = function(child) {
var i = this._children.indexOf(child);
if (i >= 0) {
if (child.attachedPanel === this) {
Overlays.setAttachedPanel(child._id, 0);
this._children.splice(i, 1);
}
};
@ -445,7 +432,7 @@
};
that.prototype.setChildrenVisible = function() {
this._children.forEach(function(child) {
this.children.forEach(function(child) {
child.visible = true;
if (child.setChildrenVisible !== undefined) {
child.setChildrenVisible();

7
interface/src/ui/overlays/FloatingUIPanel.cpp
View file

@ -116,6 +116,13 @@ QScriptValue FloatingUIPanel::getProperty(const QString &property) {
if (property == "visible") {
return getVisible();
}
if (property == "children") {
QScriptValue array = _scriptEngine->newArray(_children.length());
for (int i = 0; i < _children.length(); i++) {
array.setProperty(i, _children[i]);
}
return array;
}
return QScriptValue();
}

2
interface/src/ui/overlays/FloatingUIPanel.h
View file

@ -70,7 +70,7 @@ private:
Pointer _attachedPanel = nullptr;
QList<unsigned int> _children;
bool _visible = false;
bool _visible = true;
QScriptEngine* _scriptEngine;
};

10
interface/src/ui/overlays/Overlays.cpp
View file

@ -202,7 +202,12 @@ unsigned int Overlays::cloneOverlay(unsigned int id) {
Overlay::Pointer thisOverlay = getOverlay(id);
if (thisOverlay) {
return addOverlay(Overlay::Pointer(thisOverlay->createClone()));
unsigned int cloneId = addOverlay(Overlay::Pointer(thisOverlay->createClone()));
auto attachable = std::dynamic_pointer_cast<PanelAttachable>(thisOverlay);
if (attachable && attachable->getAttachedPanel()) {
attachable->getAttachedPanel()->addChild(cloneId);
}
return cloneId;
}
return 0; // Not found
@ -284,8 +289,7 @@ unsigned int Overlays::getAttachedPanel(unsigned int childId) const {
}
void Overlays::setAttachedPanel(unsigned int childId, unsigned int panelId) {
Overlay::Pointer overlay = getOverlay(childId);
auto attachable = std::dynamic_pointer_cast<PanelAttachable>(overlay);
auto attachable = std::dynamic_pointer_cast<PanelAttachable>(getOverlay(childId));
if (attachable) {
if (_panels.contains(panelId)) {
auto panel = getPanel(panelId);