From 64fb046a33308e5ab7d4b71d5a1545f949aec34e Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Mon, 5 Aug 2019 09:25:32 -0700 Subject: [PATCH] Simplify naming for script functions to get list of picks/pointers --- interface/src/raypick/PickScriptingInterface.cpp | 4 ++-- interface/src/raypick/PickScriptingInterface.h | 4 ++-- interface/src/raypick/PointerScriptingInterface.cpp | 4 ++-- interface/src/raypick/PointerScriptingInterface.h | 4 ++-- libraries/pointers/src/PickManager.cpp | 2 +- libraries/pointers/src/PickManager.h | 2 +- libraries/pointers/src/PointerManager.cpp | 2 +- libraries/pointers/src/PointerManager.h | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/interface/src/raypick/PickScriptingInterface.cpp b/interface/src/raypick/PickScriptingInterface.cpp index 40a6560424..04bafaad72 100644 --- a/interface/src/raypick/PickScriptingInterface.cpp +++ b/interface/src/raypick/PickScriptingInterface.cpp @@ -400,8 +400,8 @@ QVariantMap PickScriptingInterface::getPickScriptParameters(unsigned int uid) co return DependencyManager::get()->getPickScriptParameters(uid); } -QVector PickScriptingInterface::getCreatedPicks() const { - return DependencyManager::get()->getCreatedPicks(); +QVector PickScriptingInterface::getPicks() const { + return DependencyManager::get()->getPicks(); } QVariantMap PickScriptingInterface::getPrevPickResult(unsigned int uid) { diff --git a/interface/src/raypick/PickScriptingInterface.h b/interface/src/raypick/PickScriptingInterface.h index e58297061a..35f8293c92 100644 --- a/interface/src/raypick/PickScriptingInterface.h +++ b/interface/src/raypick/PickScriptingInterface.h @@ -164,10 +164,10 @@ public: /**jsdoc * Gets all picks which currently exist, including disabled picks. - * @function Picks.getCreatedPicks + * @function Picks.getPicks * @returns {number[]} picks - The IDs of the picks. */ - Q_INVOKABLE QVector getCreatedPicks() const; + Q_INVOKABLE QVector getPicks() const; /**jsdoc * Gets the most recent result from a pick. A pick continues to be updated ready to return a result, as long as it is diff --git a/interface/src/raypick/PointerScriptingInterface.cpp b/interface/src/raypick/PointerScriptingInterface.cpp index 3ae162281c..61fad61ab2 100644 --- a/interface/src/raypick/PointerScriptingInterface.cpp +++ b/interface/src/raypick/PointerScriptingInterface.cpp @@ -69,8 +69,8 @@ bool PointerScriptingInterface::isPointerEnabled(unsigned int uid) const { return DependencyManager::get()->isPointerEnabled(uid); } -QVector PointerScriptingInterface::getCreatedPointers() const { - return DependencyManager::get()->getCreatedPointers(); +QVector PointerScriptingInterface::getPointers() const { + return DependencyManager::get()->getPointers(); } QVariantMap PointerScriptingInterface::getPointerProperties(unsigned int uid) const { diff --git a/interface/src/raypick/PointerScriptingInterface.h b/interface/src/raypick/PointerScriptingInterface.h index f0324a8a0b..20c1094da1 100644 --- a/interface/src/raypick/PointerScriptingInterface.h +++ b/interface/src/raypick/PointerScriptingInterface.h @@ -173,10 +173,10 @@ public: /**jsdoc * Gets all pointers which currently exist, including disabled pointers. - * @function Pointers.getCreatedPointers + * @function Pointers.getPointers * @returns {number[]} pointers - The IDs of the pointers. */ - Q_INVOKABLE QVector getCreatedPointers() const; + Q_INVOKABLE QVector getPointers() const; /**jsdoc * Edits a render state of a {@link Pointers.RayPointerProperties|ray} or diff --git a/libraries/pointers/src/PickManager.cpp b/libraries/pointers/src/PickManager.cpp index 2fcb192d26..cad44b1864 100644 --- a/libraries/pointers/src/PickManager.cpp +++ b/libraries/pointers/src/PickManager.cpp @@ -65,7 +65,7 @@ QVariantMap PickManager::getPickScriptParameters(unsigned int uid) const { return QVariantMap(); } -QVector PickManager::getCreatedPicks() const { +QVector PickManager::getPicks() const { QVector picks; withReadLock([&] { for (auto typeIt = _picks.cbegin(); typeIt != _picks.cend(); ++typeIt) { diff --git a/libraries/pointers/src/PickManager.h b/libraries/pointers/src/PickManager.h index 8e015c8dd4..79ab6ca2c8 100644 --- a/libraries/pointers/src/PickManager.h +++ b/libraries/pointers/src/PickManager.h @@ -32,7 +32,7 @@ public: void enablePick(unsigned int uid) const; void disablePick(unsigned int uid) const; bool isPickEnabled(unsigned int uid) const; - QVector getCreatedPicks() const; + QVector getPicks() const; PickResultPointer getPrevPickResult(unsigned int uid) const; // The actual current properties of the pick diff --git a/libraries/pointers/src/PointerManager.cpp b/libraries/pointers/src/PointerManager.cpp index 68f7195394..de403a46e8 100644 --- a/libraries/pointers/src/PointerManager.cpp +++ b/libraries/pointers/src/PointerManager.cpp @@ -62,7 +62,7 @@ bool PointerManager::isPointerEnabled(unsigned int uid) const { return false; } -QVector PointerManager::getCreatedPointers() const { +QVector PointerManager::getPointers() const { QVector pointers; withReadLock([&] { for (auto it = _pointers.cbegin(); it != _pointers.cend(); ++it) { diff --git a/libraries/pointers/src/PointerManager.h b/libraries/pointers/src/PointerManager.h index 41248ee8c7..609f944101 100644 --- a/libraries/pointers/src/PointerManager.h +++ b/libraries/pointers/src/PointerManager.h @@ -28,7 +28,7 @@ public: void enablePointer(unsigned int uid) const; void disablePointer(unsigned int uid) const; bool isPointerEnabled(unsigned int uid) const; - QVector getCreatedPointers() const; + QVector getPointers() const; void setRenderState(unsigned int uid, const std::string& renderState) const; void editRenderState(unsigned int uid, const std::string& state, const QVariant& startProps, const QVariant& pathProps, const QVariant& endProps) const;