History

merge with pointers branch

SamGondelman committed 9 years ago

Commit f970eb22 parents 7d420f5 544c54b46 files · +1117 −604Browse files

Showing the changes to interface/src/raypick/LaserPointerScriptingInterface.cpp (1 of 46 files). Show all

Unified · Split

interface/src/raypick/LaserPointerScriptingInterface.cpp+6−1
@@ -17,6 +17,7 @@ · 16 unmodified lines
17void LaserPointerScriptingInterface::setIgnoreItems(unsigned int uid, const QScriptValue& ignoreItems) const {17void LaserPointerScriptingInterface::setIgnoreItems(unsigned int uid, const QScriptValue& ignoreItems) const {
18 DependencyManager::get<PointerManager>()->setIgnoreItems(uid, qVectorQUuidFromScriptValue(ignoreItems));18 DependencyManager::get<PointerManager>()->setIgnoreItems(uid, qVectorQUuidFromScriptValue(ignoreItems));
19}19}
20
20void LaserPointerScriptingInterface::setIncludeItems(unsigned int uid, const QScriptValue& includeItems) const {21void LaserPointerScriptingInterface::setIncludeItems(unsigned int uid, const QScriptValue& includeItems) const {
21 DependencyManager::get<PointerManager>()->setIncludeItems(uid, qVectorQUuidFromScriptValue(includeItems));22 DependencyManager::get<PointerManager>()->setIncludeItems(uid, qVectorQUuidFromScriptValue(includeItems));
22}23}
@@ -27,4 +28,8 @@ unsigned int LaserPointerScriptingInterface::createLaserPointer(const QVariant& · 4 unmodified lines
27 28
28void LaserPointerScriptingInterface::editRenderState(unsigned int uid, const QString& renderState, const QVariant& properties) const {29void LaserPointerScriptingInterface::editRenderState(unsigned int uid, const QString& renderState, const QVariant& properties) const {
29 DependencyManager::get<PointerScriptingInterface>()->editRenderState(uid, renderState, properties);30 DependencyManager::get<PointerScriptingInterface>()->editRenderState(uid, renderState, properties);
30}31}
32
33QVariantMap LaserPointerScriptingInterface::getPrevRayPickResult(unsigned int uid) const {
34 return DependencyManager::get<PointerScriptingInterface>()->getPrevPickResult(uid);
35}