Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui

Seth Alves committed 9 years ago

Commit fffff812 parents e3f1d80 494b60211 files · +35 −1285Browse files

Showing the changes to interface/src/scripting/HMDScriptingInterface.cpp (1 of 11 files). Show all

Unified · Split

@@ -81,6 +81,10 @@ void HMDScriptingInterface::closeTablet() { · 80 unmodified lines
81	81	_showTablet = false;
82	82	}
83	83
	84	+void HMDScriptingInterface::openTablet() {
	85	+ _showTablet = true;
	86	+}
	87	+
84	88	QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine) {
85	89	glm::vec3 hudIntersection;
86	90	auto instance = DependencyManager::get<HMDScriptingInterface>();