Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-19 08:18:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed load script issue

Browse source
This commit is contained in:
Dante Ruiz 2017-01-25 15:59:08 +00:00
parent 096b2e876f
commit a147ce3f5f
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/script-engine/src/TabletScriptingInterface.cpp
View file

@ -204,7 +204,7 @@ void TabletProxy::gotoMenuScreen() {
if (_qmlTabletRoot) {
if (_state != State::Menu) {
auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen()));
QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen()), Qt::DirectConnection);
QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL)));
_state = State::Menu;
}
@ -215,7 +215,7 @@ void TabletProxy::gotoHomeScreen() {
if (_qmlTabletRoot) {
if (_state != State::Home) {
auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen()));
QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen()), Qt::DirectConnection);
QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(TABLET_SOURCE_URL)));
QMetaObject::invokeMethod(_qmlTabletRoot, "playButtonClickSound");
_state = State::Home;

1
scripts/system/edit.js
View file

@ -196,6 +196,7 @@ var toolBar = (function () {
function cleanup() {
that.setActive(false);
tablet.removeButton(activeButton);
}
function addButton(name, image, handler) {

6
scripts/system/tablet-ui/tabletUI.js
View file

@ -104,4 +104,10 @@
}
return micLevel;
}
Script.scriptEnding.connect(function () {
Entities.deleteEntity(HMD.tabletID);
HMD.tabletID = null;
HDM.homeButtonID = null;
});
}()); // END LOCAL_SCOPE