Showing the changes to interface/src/Application.cpp (1 of 91 files). Show all
Unified · Split
| @@ -65,6 +65,7 @@ · 64 unmodified lines | |||
| 65 | #include <PacketHeaders.h> | 65 | #include <PacketHeaders.h> |
| 66 | #include <PerfStat.h> | 66 | #include <PerfStat.h> |
| 67 | #include <ResourceCache.h> | 67 | #include <ResourceCache.h> |
| 68 | #include <SoundCache.h> | ||
| 68 | #include <UserActivityLogger.h> | 69 | #include <UserActivityLogger.h> |
| 69 | #include <UUID.h> | 70 | #include <UUID.h> |
| 70 | 71 | ||
| @@ -3905,7 +3906,9 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 3834 unmodified lines | |||
| 3905 | connect(scriptEngine, SIGNAL(loadScript(const QString&, bool)), this, SLOT(loadScript(const QString&, bool))); | 3906 | connect(scriptEngine, SIGNAL(loadScript(const QString&, bool)), this, SLOT(loadScript(const QString&, bool))); |
| 3906 | 3907 | ||
| 3907 | scriptEngine->registerGlobalObject("Overlays", &_overlays); | 3908 | scriptEngine->registerGlobalObject("Overlays", &_overlays); |
| 3908 | qScriptRegisterMetaType(scriptEngine, RayToOverlayIntersectionResultToScriptValue, RayToOverlayIntersectionResultFromScriptValue); | 3909 | qScriptRegisterMetaType(scriptEngine, OverlayPropertyResultToScriptValue, OverlayPropertyResultFromScriptValue); |
| 3910 | qScriptRegisterMetaType(scriptEngine, RayToOverlayIntersectionResultToScriptValue, | ||
| 3911 | RayToOverlayIntersectionResultFromScriptValue); | ||
| 3909 | 3912 | ||
| 3910 | QScriptValue windowValue = scriptEngine->registerGlobalObject("Window", WindowScriptingInterface::getInstance()); | 3913 | QScriptValue windowValue = scriptEngine->registerGlobalObject("Window", WindowScriptingInterface::getInstance()); |
| 3911 | scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter, | 3914 | scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter, |
| @@ -3920,6 +3923,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 8 unmodified lines | |||
| 3920 | scriptEngine->registerGlobalObject("Settings", SettingsScriptingInterface::getInstance()); | 3923 | scriptEngine->registerGlobalObject("Settings", SettingsScriptingInterface::getInstance()); |
| 3921 | scriptEngine->registerGlobalObject("AudioDevice", AudioDeviceScriptingInterface::getInstance()); | 3924 | scriptEngine->registerGlobalObject("AudioDevice", AudioDeviceScriptingInterface::getInstance()); |
| 3922 | scriptEngine->registerGlobalObject("AnimationCache", &_animationCache); | 3925 | scriptEngine->registerGlobalObject("AnimationCache", &_animationCache); |
| 3926 | scriptEngine->registerGlobalObject("SoundCache", &SoundCache::getInstance()); | ||
| 3923 | scriptEngine->registerGlobalObject("AudioReflector", &_audioReflector); | 3927 | scriptEngine->registerGlobalObject("AudioReflector", &_audioReflector); |
| 3924 | scriptEngine->registerGlobalObject("Account", AccountScriptingInterface::getInstance()); | 3928 | scriptEngine->registerGlobalObject("Account", AccountScriptingInterface::getInstance()); |
| 3925 | scriptEngine->registerGlobalObject("Metavoxels", &_metavoxels); | 3929 | scriptEngine->registerGlobalObject("Metavoxels", &_metavoxels); |