Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-07 23:53:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Simplify naming for script functions to get list of picks/pointers

Browse source
This commit is contained in:
sabrina-shanman 2019-08-05 09:25:32 -07:00
parent 20fa78e51d
commit 64fb046a33
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/raypick/PickScriptingInterface.cpp
View file

@ -400,8 +400,8 @@ QVariantMap PickScriptingInterface::getPickScriptParameters(unsigned int uid) co
return DependencyManager::get<PickManager>()->getPickScriptParameters(uid);
}
QVector<unsigned int> PickScriptingInterface::getCreatedPicks() const {
return DependencyManager::get<PickManager>()->getCreatedPicks();
QVector<unsigned int> PickScriptingInterface::getPicks() const {
return DependencyManager::get<PickManager>()->getPicks();
}
QVariantMap PickScriptingInterface::getPrevPickResult(unsigned int uid) {

4
interface/src/raypick/PickScriptingInterface.h
View file

@ -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<unsigned int> getCreatedPicks() const;
Q_INVOKABLE QVector<unsigned int> 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

4
interface/src/raypick/PointerScriptingInterface.cpp
View file

@ -69,8 +69,8 @@ bool PointerScriptingInterface::isPointerEnabled(unsigned int uid) const {
return DependencyManager::get<PointerManager>()->isPointerEnabled(uid);
}
QVector<unsigned int> PointerScriptingInterface::getCreatedPointers() const {
return DependencyManager::get<PointerManager>()->getCreatedPointers();
QVector<unsigned int> PointerScriptingInterface::getPointers() const {
return DependencyManager::get<PointerManager>()->getPointers();
}
QVariantMap PointerScriptingInterface::getPointerProperties(unsigned int uid) const {

4
interface/src/raypick/PointerScriptingInterface.h
View file

@ -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<unsigned int> getCreatedPointers() const;
Q_INVOKABLE QVector<unsigned int> getPointers() const;
/**jsdoc
* Edits a render state of a {@link Pointers.RayPointerProperties|ray} or

2
libraries/pointers/src/PickManager.cpp
View file

@ -65,7 +65,7 @@ QVariantMap PickManager::getPickScriptParameters(unsigned int uid) const {
return QVariantMap();
}
QVector<unsigned int> PickManager::getCreatedPicks() const {
QVector<unsigned int> PickManager::getPicks() const {
QVector<unsigned int> picks;
withReadLock([&] {
for (auto typeIt = _picks.cbegin(); typeIt != _picks.cend(); ++typeIt) {

2
libraries/pointers/src/PickManager.h
View file

@ -32,7 +32,7 @@ public:
void enablePick(unsigned int uid) const;
void disablePick(unsigned int uid) const;
bool isPickEnabled(unsigned int uid) const;
QVector<unsigned int> getCreatedPicks() const;
QVector<unsigned int> getPicks() const;
PickResultPointer getPrevPickResult(unsigned int uid) const;
// The actual current properties of the pick

2
libraries/pointers/src/PointerManager.cpp
View file

@ -62,7 +62,7 @@ bool PointerManager::isPointerEnabled(unsigned int uid) const {
return false;
}
QVector<unsigned int> PointerManager::getCreatedPointers() const {
QVector<unsigned int> PointerManager::getPointers() const {
QVector<unsigned int> pointers;
withReadLock([&] {
for (auto it = _pointers.cbegin(); it != _pointers.cend(); ++it) {

2
libraries/pointers/src/PointerManager.h
View file

@ -28,7 +28,7 @@ public:
void enablePointer(unsigned int uid) const;
void disablePointer(unsigned int uid) const;
bool isPointerEnabled(unsigned int uid) const;
QVector<unsigned int> getCreatedPointers() const;
QVector<unsigned int> 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;