History

I understand again...getting started again

Zach Fox committed 9 years ago

Commit 657beef1 parent 52ef0f25 files · +61 −58Browse files

Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all

Unified · Split

interface/src/Application.cpp+2−0
@@ -2219,6 +2219,7 @@ void Application::initializeUi() { · 2218 unmodified lines
2219 2219
2220 surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());2220 surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
2221 surfaceContext->setContextProperty("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());2221 surfaceContext->setContextProperty("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());
2222 surfaceContext->setContextProperty("Selection", DependencyManager::get<SelectionScriptingInterface>().data());
2222 2223
2223 if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {2224 if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
2224 surfaceContext->setContextProperty("Steam", new SteamScriptingInterface(engine, steamClient.get()));2225 surfaceContext->setContextProperty("Steam", new SteamScriptingInterface(engine, steamClient.get()));
@@ -6020,6 +6021,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 3795 unmodified lines
6020 scriptEngine->registerGlobalObject("EntityScriptServerLog", entityScriptServerLog.data());6021 scriptEngine->registerGlobalObject("EntityScriptServerLog", entityScriptServerLog.data());
6021 scriptEngine->registerGlobalObject("AvatarInputs", AvatarInputs::getInstance());6022 scriptEngine->registerGlobalObject("AvatarInputs", AvatarInputs::getInstance());
6022 scriptEngine->registerGlobalObject("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());6023 scriptEngine->registerGlobalObject("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());
6024 scriptEngine->registerGlobalObject("Selection", DependencyManager::get<SelectionScriptingInterface>().data());
6023 6025
6024 qScriptRegisterMetaType(scriptEngine, OverlayIDtoScriptValue, OverlayIDfromScriptValue);6026 qScriptRegisterMetaType(scriptEngine, OverlayIDtoScriptValue, OverlayIDfromScriptValue);
6025 6027