Minimal working version for avatar's client

Also merge of Wayne's proof-of-concept

Simon Walton committed 7 years ago

Commit de97af51 parent c03839e10 files · +480 −28Browse files

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

Unified · Split

interface/src/Application.cpp+1−0

@@ -3368,6 +3368,7 @@ void Application::setupQmlSurface(QQmlContext* surfaceContext, bool setAdditiona · 3367 unmodified lines
3368	surfaceContext->setContextProperty("KeyboardScriptingInterface", DependencyManager::get<KeyboardScriptingInterface>().data());	3368	surfaceContext->setContextProperty("KeyboardScriptingInterface", DependencyManager::get<KeyboardScriptingInterface>().data());
3369		3369
3370	if (setAdditionalContextProperties) {	3370	if (setAdditionalContextProperties) {
		3371	qDebug() << "setting additional context properties!";
3371	auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();	3372	auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
3372	auto flags = tabletScriptingInterface->getFlags();	3373	auto flags = tabletScriptingInterface->getFlags();
3373		3374