Merge branch 'master' into M18586

# Conflicts: # interface/src/raypick/PointerScriptingInterface.cpp # interface/src/raypick/PointerScriptingInterface.h # interface/src/raypick/StylusPointer.h # libraries/pointers/src/Pointer.h # scripts/system/controllers/controllerModules/teleport.js

David Rowe committed 8 years ago

Commit e29b4032 parents c41d746 ea7bc26375 files · +10588 −5704Browse files

Showing the changes to libraries/pointers/src/PointerManager.cpp (1 of 375 files). Show all

Unified · Split

libraries/pointers/src/PointerManager.cpp+9−0

@@ -77,6 +77,15 @@ PickResultPointer PointerManager::getPrevPickResult(unsigned int uid) const { · 76 unmodified lines
77	77	return result;
78	78	}
79	79
	80	+QVariantMap PointerManager::getPointerProperties(unsigned int uid) const {
	81	+ auto pointer = find(uid);
	82	+ if (pointer) {
	83	+ return pointer->toVariantMap();
	84	+ } else {
	85	+ return QVariantMap();
	86	+ }
	87	+}
	88	+
80	89	void PointerManager::update() {
81	90	auto cachedPointers = resultWithReadLock<std::unordered_map<unsigned int, std::shared_ptr<Pointer>>>([&] {
82	91	return _pointers;