Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-06 16:49:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove Overlays.getOverlayObject() from JavaScript API

Browse source
This commit is contained in:
David Rowe 2018-02-04 14:15:48 +13:00
parent d842e532ee
commit 8e2a3e8c99
3 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -388,21 +388,6 @@ QString Overlays::getOverlayType(OverlayID overlayId) {
return ""; return "";
} }
QObject* Overlays::getOverlayObject(OverlayID id) {
if (QThread::currentThread() != thread()) {
QObject* result;
PROFILE_RANGE(script, __FUNCTION__);
BLOCKING_INVOKE_METHOD(this, "getOverlayObject", Q_RETURN_ARG(QObject*, result), Q_ARG(OverlayID, id));
return result;
}
Overlay::Pointer thisOverlay = getOverlay(id);
if (thisOverlay) {
return qobject_cast<QObject*>(&(*thisOverlay));
}
return nullptr;
}
OverlayID Overlays::getOverlayAtPoint(const glm::vec2& point) { OverlayID Overlays::getOverlayAtPoint(const glm::vec2& point) {
if (!_enabled) { if (!_enabled) {
return UNKNOWN_OVERLAY_ID; return UNKNOWN_OVERLAY_ID;

9
interface/src/ui/overlays/Overlays.h
View file

@ -227,15 +227,6 @@ public slots:
*/ */
QString getOverlayType(OverlayID overlayId); QString getOverlayType(OverlayID overlayId);
/**jsdoc
* Get the overlay script object.
* @function Overlays.getOverlayObject
* @deprecated This function is deprecated and will soon be removed.
* @param {Uuid} overlayID - The ID of the overlay to get the script object of.
* @returns {object} The script object for the overlay if found.
*/
QObject* getOverlayObject(OverlayID id);
/**jsdoc /**jsdoc
* Get the ID of the 2D overlay at a particular point on the screen or HUD. * Get the ID of the 2D overlay at a particular point on the screen or HUD.
* @function Overlays.getOverlayAtPoint * @function Overlays.getOverlayAtPoint

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

@ -305,10 +305,6 @@ WebTablet.prototype.setScriptURL = function (scriptURL) {
Overlays.editOverlay(this.webOverlayID, { scriptURL: scriptURL }); Overlays.editOverlay(this.webOverlayID, { scriptURL: scriptURL });
}; };
WebTablet.prototype.getOverlayObject = function () {
return Overlays.getOverlayObject(this.webOverlayID);
};
WebTablet.prototype.setWidth = function (width) { WebTablet.prototype.setWidth = function (width) {
// imported from libraries/utils.js // imported from libraries/utils.js
resizeTablet(width); resizeTablet(width);