From 4d03033c9e21b4c1ff9187916791573d85bac12e Mon Sep 17 00:00:00 2001 From: ksuprynowicz Date: Sat, 25 Mar 2023 00:43:11 +0100 Subject: [PATCH] Fixed pick and ray pick scripting interface --- interface/src/Application.cpp | 2 +- interface/src/LoginStateManager.cpp | 4 +- .../src/raypick/PickScriptingInterface.cpp | 2 +- .../src/raypick/PickScriptingInterface.h | 86 ++++++++++--------- .../src/raypick/RayPickScriptingInterface.h | 56 ++++++------ interface/src/ui/Keyboard.cpp | 4 +- 6 files changed, 78 insertions(+), 76 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 9585b50ce6..67a8cdca78 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2409,7 +2409,7 @@ Application::Application( // Setup the mouse ray pick and related operators { - auto mouseRayPick = std::make_shared(Vectors::ZERO, Vectors::UP, PickFilter(PickScriptingInterface::PICK_ENTITIES() | PickScriptingInterface::PICK_LOCAL_ENTITIES()), 0.0f, true); + auto mouseRayPick = std::make_shared(Vectors::ZERO, Vectors::UP, PickFilter(PickScriptingInterface::getPickEntities() | PickScriptingInterface::getPickLocalEntities()), 0.0f, true); mouseRayPick->parentTransform = std::make_shared(); mouseRayPick->setJointState(PickQuery::JOINT_STATE_MOUSE); auto mouseRayPickID = DependencyManager::get()->addPick(PickQuery::Ray, mouseRayPick); diff --git a/interface/src/LoginStateManager.cpp b/interface/src/LoginStateManager.cpp index 0a09d33775..af3c35ec4c 100644 --- a/interface/src/LoginStateManager.cpp +++ b/interface/src/LoginStateManager.cpp @@ -170,7 +170,7 @@ void LoginStateManager::setUp() { const unsigned int leftHand = 0; QVariantMap leftPointerProperties { { "joint", "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND" }, - { "filter", PickScriptingInterface::PICK_LOCAL_ENTITIES() }, + { "filter", PickScriptingInterface::getPickLocalEntities() }, { "triggers", leftPointerTriggerProperties }, { "posOffset", vec3toVariant(grabPointSphereOffsetLeft + malletOffset) }, { "hover", true }, @@ -197,7 +197,7 @@ void LoginStateManager::setUp() { rightPointerTriggerProperties = QList({rtClick1, rtClick2}); QVariantMap rightPointerProperties{ { "joint", "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" }, - { "filter", PickScriptingInterface::PICK_LOCAL_ENTITIES() }, + { "filter", PickScriptingInterface::getPickLocalEntities() }, { "triggers", rightPointerTriggerProperties }, { "posOffset", vec3toVariant(grabPointSphereOffsetRight + malletOffset) }, { "hover", true }, diff --git a/interface/src/raypick/PickScriptingInterface.cpp b/interface/src/raypick/PickScriptingInterface.cpp index 085b90185a..71a13b096a 100644 --- a/interface/src/raypick/PickScriptingInterface.cpp +++ b/interface/src/raypick/PickScriptingInterface.cpp @@ -89,7 +89,7 @@ unsigned int PickScriptingInterface::createPick(const PickQuery::PickType type, PickFilter getPickFilter(unsigned int filter) { // FIXME: Picks always intersect visible and collidable things right now - filter = filter | (PickScriptingInterface::PICK_INCLUDE_VISIBLE() | PickScriptingInterface::PICK_INCLUDE_COLLIDABLE()); + filter = filter | (PickScriptingInterface::getPickIncludeVisible() | PickScriptingInterface::getPickIncludeCollidable()); return PickFilter(filter); } diff --git a/interface/src/raypick/PickScriptingInterface.h b/interface/src/raypick/PickScriptingInterface.h index 4a1755e200..e6af97e662 100644 --- a/interface/src/raypick/PickScriptingInterface.h +++ b/interface/src/raypick/PickScriptingInterface.h @@ -76,34 +76,34 @@ class ScriptValue; class PickScriptingInterface : public QObject, public Dependency { Q_OBJECT - Q_PROPERTY(unsigned int PICK_ENTITIES READ PICK_ENTITIES CONSTANT) - Q_PROPERTY(unsigned int PICK_OVERLAYS READ PICK_OVERLAYS CONSTANT) + Q_PROPERTY(unsigned int PICK_ENTITIES READ getPickEntities CONSTANT) + Q_PROPERTY(unsigned int PICK_OVERLAYS READ getPickOverlays CONSTANT) - Q_PROPERTY(unsigned int PICK_DOMAIN_ENTITIES READ PICK_DOMAIN_ENTITIES CONSTANT) - Q_PROPERTY(unsigned int PICK_AVATAR_ENTITIES READ PICK_AVATAR_ENTITIES CONSTANT) - Q_PROPERTY(unsigned int PICK_LOCAL_ENTITIES READ PICK_LOCAL_ENTITIES CONSTANT) - Q_PROPERTY(unsigned int PICK_AVATARS READ PICK_AVATARS CONSTANT) - Q_PROPERTY(unsigned int PICK_HUD READ PICK_HUD CONSTANT) + Q_PROPERTY(unsigned int PICK_DOMAIN_ENTITIES READ getPickDomainEntities CONSTANT) + Q_PROPERTY(unsigned int PICK_AVATAR_ENTITIES READ getPickAvatarEntities CONSTANT) + Q_PROPERTY(unsigned int PICK_LOCAL_ENTITIES READ getPickLocalEntities CONSTANT) + Q_PROPERTY(unsigned int PICK_AVATARS READ getPickAvatars CONSTANT) + Q_PROPERTY(unsigned int PICK_HUD READ getPickHud CONSTANT) - Q_PROPERTY(unsigned int PICK_INCLUDE_VISIBLE READ PICK_INCLUDE_VISIBLE CONSTANT) - Q_PROPERTY(unsigned int PICK_INCLUDE_INVISIBLE READ PICK_INCLUDE_INVISIBLE CONSTANT) + Q_PROPERTY(unsigned int PICK_INCLUDE_VISIBLE READ getPickIncludeVisible CONSTANT) + Q_PROPERTY(unsigned int PICK_INCLUDE_INVISIBLE READ getPickIncludeInvisible CONSTANT) - Q_PROPERTY(unsigned int PICK_INCLUDE_COLLIDABLE READ PICK_INCLUDE_COLLIDABLE CONSTANT) - Q_PROPERTY(unsigned int PICK_INCLUDE_NONCOLLIDABLE READ PICK_INCLUDE_NONCOLLIDABLE CONSTANT) + Q_PROPERTY(unsigned int PICK_INCLUDE_COLLIDABLE READ getPickIncludeCollidable CONSTANT) + Q_PROPERTY(unsigned int PICK_INCLUDE_NONCOLLIDABLE READ getPickIncludeNoncollidable CONSTANT) - Q_PROPERTY(unsigned int PICK_PRECISE READ PICK_PRECISE CONSTANT) - Q_PROPERTY(unsigned int PICK_COARSE READ PICK_COARSE CONSTANT) + Q_PROPERTY(unsigned int PICK_PRECISE READ getPickPrecise CONSTANT) + Q_PROPERTY(unsigned int PICK_COARSE READ getPickCoarse CONSTANT) - Q_PROPERTY(unsigned int PICK_ALL_INTERSECTIONS READ PICK_ALL_INTERSECTIONS CONSTANT) + Q_PROPERTY(unsigned int PICK_ALL_INTERSECTIONS READ getPickAllIntersections CONSTANT) - Q_PROPERTY(unsigned int PICK_BYPASS_IGNORE READ PICK_BYPASS_IGNORE CONSTANT) + Q_PROPERTY(unsigned int PICK_BYPASS_IGNORE READ getPickBypassIgnore CONSTANT) - Q_PROPERTY(unsigned int INTERSECTED_NONE READ INTERSECTED_NONE CONSTANT) - Q_PROPERTY(unsigned int INTERSECTED_ENTITY READ INTERSECTED_ENTITY CONSTANT) - Q_PROPERTY(unsigned int INTERSECTED_LOCAL_ENTITY READ INTERSECTED_LOCAL_ENTITY CONSTANT) - Q_PROPERTY(unsigned int INTERSECTED_OVERLAY READ INTERSECTED_OVERLAY CONSTANT) - Q_PROPERTY(unsigned int INTERSECTED_AVATAR READ INTERSECTED_AVATAR CONSTANT) - Q_PROPERTY(unsigned int INTERSECTED_HUD READ INTERSECTED_HUD CONSTANT) + Q_PROPERTY(unsigned int INTERSECTED_NONE READ getIntersectedNone CONSTANT) + Q_PROPERTY(unsigned int INTERSECTED_ENTITY READ getIntersectedEntity CONSTANT) + Q_PROPERTY(unsigned int INTERSECTED_LOCAL_ENTITY READ getIntersectedLocalEntity CONSTANT) + Q_PROPERTY(unsigned int INTERSECTED_OVERLAY READ getIntersectedOverlay CONSTANT) + Q_PROPERTY(unsigned int INTERSECTED_AVATAR READ getIntersectedAvatar CONSTANT) + Q_PROPERTY(unsigned int INTERSECTED_HUD READ getIntersectedHud CONSTANT) Q_PROPERTY(unsigned int perFrameTimeBudget READ getPerFrameTimeBudget WRITE setPerFrameTimeBudget) SINGLETON_DEPENDENCY @@ -295,7 +295,9 @@ public: unsigned int getPerFrameTimeBudget() const; void setPerFrameTimeBudget(unsigned int numUsecs); - static constexpr unsigned int PICK_BYPASS_IGNORE() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_BYPASS_IGNORE); } +public slots: + + static constexpr unsigned int getPickBypassIgnore() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_BYPASS_IGNORE); } /*@jsdoc * @function Picks.PICK_ENTITIES @@ -303,7 +305,7 @@ public: * Picks.PICK_AVATAR_ENTITIES properties expression instead. * @returns {number} */ - static constexpr unsigned int PICK_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES); } + static constexpr unsigned int getPickEntities() { return PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES); } /*@jsdoc * @function Picks.PICK_OVERLAYS @@ -311,7 +313,7 @@ public: * instead. * @returns {number} */ - static constexpr unsigned int PICK_OVERLAYS() { return PickFilter::getBitMask(PickFilter::FlagBit::LOCAL_ENTITIES); } + static constexpr unsigned int getPickOverlays() { return PickFilter::getBitMask(PickFilter::FlagBit::LOCAL_ENTITIES); } /*@jsdoc @@ -320,7 +322,7 @@ public: * instead. * @returns {number} */ - static constexpr unsigned int PICK_DOMAIN_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES); } + static constexpr unsigned int getPickDomainEntities() { return PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES); } /*@jsdoc * @function Picks.PICK_AVATAR_ENTITIES @@ -328,7 +330,7 @@ public: * instead. * @returns {number} */ - static constexpr unsigned int PICK_AVATAR_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES); } + static constexpr unsigned int getPickAvatarEntities() { return PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES); } /*@jsdoc * @function Picks.PICK_LOCAL_ENTITIES @@ -336,7 +338,7 @@ public: * instead. * @returns {number} */ - static constexpr unsigned int PICK_LOCAL_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::LOCAL_ENTITIES); } + static constexpr unsigned int getPickLocalEntities() { return PickFilter::getBitMask(PickFilter::FlagBit::LOCAL_ENTITIES); } /*@jsdoc * @function Picks.PICK_AVATARS @@ -344,14 +346,14 @@ public: * instead. * @returns {number} */ - static constexpr unsigned int PICK_AVATARS() { return PickFilter::getBitMask(PickFilter::FlagBit::AVATARS); } + static constexpr unsigned int getPickAvatars() { return PickFilter::getBitMask(PickFilter::FlagBit::AVATARS); } /*@jsdoc * @function Picks.PICK_HUD * @deprecated This function is deprecated and will be removed. Use the Picks.PICK_HUD property instead. * @returns {number} */ - static constexpr unsigned int PICK_HUD() { return PickFilter::getBitMask(PickFilter::FlagBit::HUD); } + static constexpr unsigned int getPickHud() { return PickFilter::getBitMask(PickFilter::FlagBit::HUD); } /*@jsdoc @@ -360,7 +362,7 @@ public: * instead. * @returns {number} */ - static constexpr unsigned int PICK_INCLUDE_VISIBLE() { return PickFilter::getBitMask(PickFilter::FlagBit::VISIBLE); } + static constexpr unsigned int getPickIncludeVisible() { return PickFilter::getBitMask(PickFilter::FlagBit::VISIBLE); } /*@jsdoc * @function Picks.PICK_INCLUDE_INVISIBLE @@ -368,7 +370,7 @@ public: * instead. * @returns {number} */ - static constexpr unsigned int PICK_INCLUDE_INVISIBLE() { return PickFilter::getBitMask(PickFilter::FlagBit::INVISIBLE); } + static constexpr unsigned int getPickIncludeInvisible() { return PickFilter::getBitMask(PickFilter::FlagBit::INVISIBLE); } /*@jsdoc @@ -377,7 +379,7 @@ public: * instead. * @returns {number} */ - static constexpr unsigned int PICK_INCLUDE_COLLIDABLE() { return PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE); } + static constexpr unsigned int getPickIncludeCollidable() { return PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE); } /*@jsdoc * @function Picks.PICK_INCLUDE_NONCOLLIDABLE @@ -385,7 +387,7 @@ public: * property instead. * @returns {number} */ - static constexpr unsigned int PICK_INCLUDE_NONCOLLIDABLE() { return PickFilter::getBitMask(PickFilter::FlagBit::NONCOLLIDABLE); } + static constexpr unsigned int getPickIncludeNoncollidable() { return PickFilter::getBitMask(PickFilter::FlagBit::NONCOLLIDABLE); } /*@jsdoc @@ -393,14 +395,14 @@ public: * @deprecated This function is deprecated and will be removed. Use the Picks.PICK_PRECISE property instead. * @returns {number} */ - static constexpr unsigned int PICK_PRECISE() { return PickFilter::getBitMask(PickFilter::FlagBit::PRECISE); } + static constexpr unsigned int getPickPrecise() { return PickFilter::getBitMask(PickFilter::FlagBit::PRECISE); } /*@jsdoc * @function Picks.PICK_COARSE * @deprecated This function is deprecated and will be removed. Use the Picks.PICK_COARSE property instead. * @returns {number} */ - static constexpr unsigned int PICK_COARSE() { return PickFilter::getBitMask(PickFilter::FlagBit::COARSE); } + static constexpr unsigned int getPickCoarse() { return PickFilter::getBitMask(PickFilter::FlagBit::COARSE); } /*@jsdoc @@ -409,7 +411,7 @@ public: * instead. * @returns {number} */ - static constexpr unsigned int PICK_ALL_INTERSECTIONS() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_ALL_INTERSECTIONS); } + static constexpr unsigned int getPickAllIntersections() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_ALL_INTERSECTIONS); } /*@jsdoc * @function Picks.INTERSECTED_NONE @@ -417,7 +419,7 @@ public: * instead. * @returns {number} */ - static constexpr unsigned int INTERSECTED_NONE() { return IntersectionType::NONE; } + static constexpr unsigned int getIntersectedNone() { return IntersectionType::NONE; } /*@jsdoc * @function Picks.INTERSECTED_ENTITY @@ -425,7 +427,7 @@ public: * instead. * @returns {number} */ - static constexpr unsigned int INTERSECTED_ENTITY() { return IntersectionType::ENTITY; } + static constexpr unsigned int getIntersectedEntity() { return IntersectionType::ENTITY; } /*@jsdoc * @function Picks.INTERSECTED_LOCAL_ENTITY @@ -433,7 +435,7 @@ public: * property instead. * @returns {number} */ - static constexpr unsigned int INTERSECTED_LOCAL_ENTITY() { return IntersectionType::LOCAL_ENTITY; } + static constexpr unsigned int getIntersectedLocalEntity() { return IntersectionType::LOCAL_ENTITY; } /*@jsdoc * @function Picks.INTERSECTED_OVERLAY @@ -441,7 +443,7 @@ public: * property instead. * @returns {number} */ - static constexpr unsigned int INTERSECTED_OVERLAY() { return INTERSECTED_LOCAL_ENTITY(); } + static constexpr unsigned int getIntersectedOverlay() { return getIntersectedLocalEntity(); } /*@jsdoc * @function Picks.INTERSECTED_AVATAR @@ -449,7 +451,7 @@ public: * instead. * @returns {number} */ - static constexpr unsigned int INTERSECTED_AVATAR() { return IntersectionType::AVATAR; } + static constexpr unsigned int getIntersectedAvatar() { return IntersectionType::AVATAR; } /*@jsdoc * @function Picks.INTERSECTED_HUD @@ -457,7 +459,7 @@ public: * instead. * @returns {number} */ - static constexpr unsigned int INTERSECTED_HUD() { return IntersectionType::HUD; } + static constexpr unsigned int getIntersectedHud() { return IntersectionType::HUD; } protected: static std::shared_ptr buildRayPick(const QVariantMap& properties); diff --git a/interface/src/raypick/RayPickScriptingInterface.h b/interface/src/raypick/RayPickScriptingInterface.h index 86f6523205..f88d7785b5 100644 --- a/interface/src/raypick/RayPickScriptingInterface.h +++ b/interface/src/raypick/RayPickScriptingInterface.h @@ -51,20 +51,20 @@ class ScriptValue; */ class RayPickScriptingInterface : public QObject, public Dependency { Q_OBJECT - Q_PROPERTY(unsigned int PICK_ENTITIES READ PICK_ENTITIES CONSTANT) - Q_PROPERTY(unsigned int PICK_OVERLAYS READ PICK_OVERLAYS CONSTANT) - Q_PROPERTY(unsigned int PICK_AVATARS READ PICK_AVATARS CONSTANT) - Q_PROPERTY(unsigned int PICK_HUD READ PICK_HUD CONSTANT) - Q_PROPERTY(unsigned int PICK_COARSE READ PICK_COARSE CONSTANT) - Q_PROPERTY(unsigned int PICK_INCLUDE_INVISIBLE READ PICK_INCLUDE_INVISIBLE CONSTANT) - Q_PROPERTY(unsigned int PICK_INCLUDE_NONCOLLIDABLE READ PICK_INCLUDE_NONCOLLIDABLE CONSTANT) - Q_PROPERTY(unsigned int PICK_ALL_INTERSECTIONS READ PICK_ALL_INTERSECTIONS CONSTANT) - Q_PROPERTY(unsigned int INTERSECTED_NONE READ INTERSECTED_NONE CONSTANT) - Q_PROPERTY(unsigned int INTERSECTED_ENTITY READ INTERSECTED_ENTITY CONSTANT) - Q_PROPERTY(unsigned int INTERSECTED_LOCAL_ENTITY READ INTERSECTED_LOCAL_ENTITY CONSTANT) - Q_PROPERTY(unsigned int INTERSECTED_OVERLAY READ INTERSECTED_OVERLAY CONSTANT) - Q_PROPERTY(unsigned int INTERSECTED_AVATAR READ INTERSECTED_AVATAR CONSTANT) - Q_PROPERTY(unsigned int INTERSECTED_HUD READ INTERSECTED_HUD CONSTANT) + Q_PROPERTY(unsigned int PICK_ENTITIES READ getPickEntities CONSTANT) + Q_PROPERTY(unsigned int PICK_OVERLAYS READ getPickOverlays CONSTANT) + Q_PROPERTY(unsigned int PICK_AVATARS READ getPickAvatars CONSTANT) + Q_PROPERTY(unsigned int PICK_HUD READ getPickHud CONSTANT) + Q_PROPERTY(unsigned int PICK_COARSE READ getPickCoarse CONSTANT) + Q_PROPERTY(unsigned int PICK_INCLUDE_INVISIBLE READ getPickIncludeInvisible CONSTANT) + Q_PROPERTY(unsigned int PICK_INCLUDE_NONCOLLIDABLE READ getPickIncludeNoncollidable CONSTANT) + Q_PROPERTY(unsigned int PICK_ALL_INTERSECTIONS READ getPickAllIntersections CONSTANT) + Q_PROPERTY(unsigned int INTERSECTED_NONE READ getIntersectedNone CONSTANT) + Q_PROPERTY(unsigned int INTERSECTED_ENTITY READ getIntersectedEntity CONSTANT) + Q_PROPERTY(unsigned int INTERSECTED_LOCAL_ENTITY READ getIntersectedLocalEntity CONSTANT) + Q_PROPERTY(unsigned int INTERSECTED_OVERLAY READ getIntersectedOverlay CONSTANT) + Q_PROPERTY(unsigned int INTERSECTED_AVATAR READ getIntersectedAvatar CONSTANT) + Q_PROPERTY(unsigned int INTERSECTED_HUD READ getIntersectedHud CONSTANT) SINGLETON_DEPENDENCY public: @@ -173,35 +173,35 @@ public slots: * @deprecated This function is deprecated and will be removed. Use the Raypick.PICK_ENTITIES property instead. * @returns {number} */ - static unsigned int PICK_ENTITIES() { return PickScriptingInterface::PICK_ENTITIES(); } + static unsigned int getPickEntities() { return PickScriptingInterface::getPickEntities(); } /*@jsdoc * @function RayPick.PICK_OVERLAYS * @deprecated This function is deprecated and will be removed. Use the RayPick.PICK_OVERLAYS property instead. * @returns {number} */ - static unsigned int PICK_OVERLAYS() { return PickScriptingInterface::PICK_OVERLAYS(); } + static unsigned int getPickOverlays() { return PickScriptingInterface::getPickOverlays(); } /*@jsdoc * @function RayPick.PICK_AVATARS * @deprecated This function is deprecated and will be removed. Use the RayPick.PICK_AVATARS property instead. * @returns {number} */ - static unsigned int PICK_AVATARS() { return PickScriptingInterface::PICK_AVATARS(); } + static unsigned int getPickAvatars() { return PickScriptingInterface::getPickAvatars(); } /*@jsdoc * @function RayPick.PICK_HUD * @deprecated This function is deprecated and will be removed. Use the RayPick.PICK_HUD property instead. * @returns {number} */ - static unsigned int PICK_HUD() { return PickScriptingInterface::PICK_HUD(); } + static unsigned int getPickHud() { return PickScriptingInterface::getPickHud(); } /*@jsdoc * @function RayPick.PICK_COARSE * @deprecated This function is deprecated and will be removed. Use the RayPick.PICK_COARSE property instead. * @returns {number} */ - static unsigned int PICK_COARSE() { return PickScriptingInterface::PICK_COARSE(); } + static unsigned int getPickCoarse() { return PickScriptingInterface::getPickCoarse(); } /*@jsdoc * @function RayPick.PICK_INCLUDE_INVISIBLE @@ -209,7 +209,7 @@ public slots: * property instead. * @returns {number} */ - static unsigned int PICK_INCLUDE_INVISIBLE() { return PickScriptingInterface::PICK_INCLUDE_INVISIBLE(); } + static unsigned int getPickIncludeInvisible() { return PickScriptingInterface::getPickIncludeInvisible(); } /*@jsdoc * @function RayPick.PICK_INCLUDE_NONCOLLIDABLE @@ -217,7 +217,7 @@ public slots: * property instead. * @returns {number} */ - static unsigned int PICK_INCLUDE_NONCOLLIDABLE() { return PickScriptingInterface::PICK_INCLUDE_NONCOLLIDABLE(); } + static unsigned int getPickIncludeNoncollidable() { return PickScriptingInterface::getPickIncludeNoncollidable(); } /*@jsdoc * @function RayPick.PICK_ALL_INTERSECTIONS @@ -225,7 +225,7 @@ public slots: * property instead. * @returns {number} */ - static unsigned int PICK_ALL_INTERSECTIONS() { return PickScriptingInterface::PICK_ALL_INTERSECTIONS(); } + static unsigned int getPickAllIntersections() { return PickScriptingInterface::getPickAllIntersections(); } /*@jsdoc * @function RayPick.INTERSECTED_NONE @@ -233,7 +233,7 @@ public slots: * instead. * @returns {number} */ - static unsigned int INTERSECTED_NONE() { return PickScriptingInterface::INTERSECTED_NONE(); } + static unsigned int getIntersectedNone() { return PickScriptingInterface::getIntersectedNone(); } /*@jsdoc * @function RayPick.INTERSECTED_ENTITY @@ -241,7 +241,7 @@ public slots: * instead. * @returns {number} */ - static unsigned int INTERSECTED_ENTITY() { return PickScriptingInterface::INTERSECTED_ENTITY(); } + static unsigned int getIntersectedEntity() { return PickScriptingInterface::getIntersectedEntity(); } /*@jsdoc * @function RayPick.INTERSECTED_OVERLAY @@ -249,7 +249,7 @@ public slots: * property instead. * @returns {number} */ - static unsigned int INTERSECTED_LOCAL_ENTITY() { return PickScriptingInterface::INTERSECTED_LOCAL_ENTITY(); } + static unsigned int getIntersectedLocalEntity() { return PickScriptingInterface::getIntersectedLocalEntity(); } /*@jsdoc * @function RayPick.INTERSECTED_OVERLAY @@ -257,7 +257,7 @@ public slots: * instead. * @returns {number} */ - static unsigned int INTERSECTED_OVERLAY() { return PickScriptingInterface::INTERSECTED_LOCAL_ENTITY(); } + static unsigned int getIntersectedOverlay() { return PickScriptingInterface::getIntersectedOverlay(); } /*@jsdoc * @function RayPick.INTERSECTED_AVATAR @@ -265,7 +265,7 @@ public slots: * instead. * @returns {number} */ - static unsigned int INTERSECTED_AVATAR() { return PickScriptingInterface::INTERSECTED_AVATAR(); } + static unsigned int getIntersectedAvatar() { return PickScriptingInterface::getIntersectedAvatar(); } /*@jsdoc * @function RayPick.INTERSECTED_HUD @@ -273,7 +273,7 @@ public slots: * instead. * @returns {number} */ - static unsigned int INTERSECTED_HUD() { return PickScriptingInterface::INTERSECTED_HUD(); } + static unsigned int getIntersectedHud() { return PickScriptingInterface::getIntersectedHud(); } }; #endif // hifi_RayPickScriptingInterface_h diff --git a/interface/src/ui/Keyboard.cpp b/interface/src/ui/Keyboard.cpp index 6262210620..9ddcff0c50 100644 --- a/interface/src/ui/Keyboard.cpp +++ b/interface/src/ui/Keyboard.cpp @@ -271,14 +271,14 @@ void Keyboard::createKeyboard() { QVariantMap leftStylusProperties { { "hand", LEFT_HAND_CONTROLLER_INDEX }, - { "filter", PickScriptingInterface::PICK_LOCAL_ENTITIES() }, + { "filter", PickScriptingInterface::getPickLocalEntities() }, { "model", modelProperties }, { "tipOffset", vec3toVariant(MALLET_TIP_OFFSET) } }; QVariantMap rightStylusProperties { { "hand", RIGHT_HAND_CONTROLLER_INDEX }, - { "filter", PickScriptingInterface::PICK_LOCAL_ENTITIES() }, + { "filter", PickScriptingInterface::getPickLocalEntities() }, { "model", modelProperties }, { "tipOffset", vec3toVariant(MALLET_TIP_OFFSET) } };