Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 20:36:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Created the PlatformInfo scripting object.

Browse source
This commit is contained in:
NissimHadar 2018-12-28 14:41:55 -08:00
parent c28167f797
commit 246c4dab94
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -170,6 +170,7 @@
#include "scripting/Audio.h" #include "scripting/Audio.h"
#include "networking/CloseEventSender.h" #include "networking/CloseEventSender.h"
#include "scripting/TestScriptingInterface.h" #include "scripting/TestScriptingInterface.h"
#include "scripting/PlatformInfoScriptingInterface.h"
#include "scripting/AssetMappingsScriptingInterface.h" #include "scripting/AssetMappingsScriptingInterface.h"
#include "scripting/ClipboardScriptingInterface.h" #include "scripting/ClipboardScriptingInterface.h"
#include "scripting/DesktopScriptingInterface.h" #include "scripting/DesktopScriptingInterface.h"
@ -6994,6 +6995,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
scriptEngine->registerGlobalObject("Test", TestScriptingInterface::getInstance()); scriptEngine->registerGlobalObject("Test", TestScriptingInterface::getInstance());
} }
scriptEngine->registerGlobalObject("PlatformInfo", PlatformInfoScriptingInterface::getInstance());
scriptEngine->registerGlobalObject("Rates", new RatesScriptingInterface(this)); scriptEngine->registerGlobalObject("Rates", new RatesScriptingInterface(this));
// hook our avatar and avatar hash map object into this script engine // hook our avatar and avatar hash map object into this script engine

4
interface/src/scripting/PlatformInfoScriptingInterface.h
View file

@ -25,6 +25,10 @@ public slots:
* @returns {string} "WINDOWS", "MACOS" or "UNKNOWN" * @returns {string} "WINDOWS", "MACOS" or "UNKNOWN"
*/ */
QString getOperatingSystemType(); QString getOperatingSystemType();
/**jsdoc
* Returns the CPU brand
*/
}; };
#endif // hifi_PlatformInfoScriptingInterface_h #endif // hifi_PlatformInfoScriptingInterface_h