Allow Hifi.SoundEffect to be used in all qml

Including webEntities, webOverlays and the system tablet. We might want to add this to enable spatial sound effects for the web keyboard.

Anthony J. Thibault committed 9 years ago

Commit 0860c501 parent 2bff5586 files · +16 −32Browse files

Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 6 files). Show all

Unified · Split

 #include <AudioInjector.h>
 #include <PathUtils.h>
+#include <RegisteredMetaTypes.h>
 #include "ScriptEngineLogging.h"
 TabletScriptingInterface::TabletScriptingInterface() {
     }
 }
-void TabletProxy::updateTabletPosition(glm::vec3 tabletPosition) {
-    _position.set(tabletPosition);
-}
 void TabletProxy::emitScriptEvent(QVariant msg) {
     if (_qmlOffscreenSurface) {
         QMetaObject::invokeMethod(_qmlOffscreenSurface, "emitScriptEvent", Qt::AutoConnection, Q_ARG(QVariant, msg));
     _sound = DependencyManager::get<SoundCache>()->getSound(_url);
 }
-void SoundEffect::play() {
+void SoundEffect::play(QVariant position) {
     auto tsi = DependencyManager::get<TabletScriptingInterface>();
     if (tsi) {
         TabletProxy* tablet = qobject_cast<TabletProxy*>(tsi->getTablet("com.highfidelity.interface.tablet.system"));
         if (tablet) {
             AudioInjectorOptions options;
-            options.position = tablet->getPosition();
+            options.position = vec3FromVariant(position);
             options.localOnly = true;
             if (_injector) {
                 _injector->setOptions(options);