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

Fixed pick and ray pick scripting interface

Browse source
This commit is contained in:
ksuprynowicz 2023-03-25 00:43:11 +01:00
parent ff3d868eb8
commit 4d1d1cc9ba
6 changed files with 78 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -2409,7 +2409,7 @@ Application::Application(
// Setup the mouse ray pick and related operators // Setup the mouse ray pick and related operators
{ {
auto mouseRayPick = std::make_shared<RayPick>(Vectors::ZERO, Vectors::UP, PickFilter(PickScriptingInterface::PICK_ENTITIES() | PickScriptingInterface::PICK_LOCAL_ENTITIES()), 0.0f, true); auto mouseRayPick = std::make_shared<RayPick>(Vectors::ZERO, Vectors::UP, PickFilter(PickScriptingInterface::getPickEntities() | PickScriptingInterface::getPickLocalEntities()), 0.0f, true);
mouseRayPick->parentTransform = std::make_shared<MouseTransformNode>(); mouseRayPick->parentTransform = std::make_shared<MouseTransformNode>();
mouseRayPick->setJointState(PickQuery::JOINT_STATE_MOUSE); mouseRayPick->setJointState(PickQuery::JOINT_STATE_MOUSE);
auto mouseRayPickID = DependencyManager::get<PickManager>()->addPick(PickQuery::Ray, mouseRayPick); auto mouseRayPickID = DependencyManager::get<PickManager>()->addPick(PickQuery::Ray, mouseRayPick);

4
interface/src/LoginStateManager.cpp
View file

@ -170,7 +170,7 @@ void LoginStateManager::setUp() {
const unsigned int leftHand = 0; const unsigned int leftHand = 0;
QVariantMap leftPointerProperties { QVariantMap leftPointerProperties {
{ "joint", "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND" }, { "joint", "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND" },
{ "filter", PickScriptingInterface::PICK_LOCAL_ENTITIES() }, { "filter", PickScriptingInterface::getPickLocalEntities() },
{ "triggers", leftPointerTriggerProperties }, { "triggers", leftPointerTriggerProperties },
{ "posOffset", vec3toVariant(grabPointSphereOffsetLeft + malletOffset) }, { "posOffset", vec3toVariant(grabPointSphereOffsetLeft + malletOffset) },
{ "hover", true }, { "hover", true },
@ -197,7 +197,7 @@ void LoginStateManager::setUp() {
rightPointerTriggerProperties = QList<QVariant>({rtClick1, rtClick2}); rightPointerTriggerProperties = QList<QVariant>({rtClick1, rtClick2});
QVariantMap rightPointerProperties{ QVariantMap rightPointerProperties{
{ "joint", "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" }, { "joint", "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" },
{ "filter", PickScriptingInterface::PICK_LOCAL_ENTITIES() }, { "filter", PickScriptingInterface::getPickLocalEntities() },
{ "triggers", rightPointerTriggerProperties }, { "triggers", rightPointerTriggerProperties },
{ "posOffset", vec3toVariant(grabPointSphereOffsetRight + malletOffset) }, { "posOffset", vec3toVariant(grabPointSphereOffsetRight + malletOffset) },
{ "hover", true }, { "hover", true },

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

@ -89,7 +89,7 @@ unsigned int PickScriptingInterface::createPick(const PickQuery::PickType type,
PickFilter getPickFilter(unsigned int filter) { PickFilter getPickFilter(unsigned int filter) {
// FIXME: Picks always intersect visible and collidable things right now // 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); return PickFilter(filter);
} }

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

@ -76,34 +76,34 @@ class ScriptValue;
class PickScriptingInterface : public QObject, public Dependency { class PickScriptingInterface : public QObject, public Dependency {
Q_OBJECT Q_OBJECT
Q_PROPERTY(unsigned int PICK_ENTITIES READ PICK_ENTITIES CONSTANT) Q_PROPERTY(unsigned int PICK_ENTITIES READ getPickEntities CONSTANT)
Q_PROPERTY(unsigned int PICK_OVERLAYS READ PICK_OVERLAYS 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_DOMAIN_ENTITIES READ getPickDomainEntities CONSTANT)
Q_PROPERTY(unsigned int PICK_AVATAR_ENTITIES READ PICK_AVATAR_ENTITIES CONSTANT) Q_PROPERTY(unsigned int PICK_AVATAR_ENTITIES READ getPickAvatarEntities CONSTANT)
Q_PROPERTY(unsigned int PICK_LOCAL_ENTITIES READ PICK_LOCAL_ENTITIES CONSTANT) Q_PROPERTY(unsigned int PICK_LOCAL_ENTITIES READ getPickLocalEntities CONSTANT)
Q_PROPERTY(unsigned int PICK_AVATARS READ PICK_AVATARS CONSTANT) Q_PROPERTY(unsigned int PICK_AVATARS READ getPickAvatars CONSTANT)
Q_PROPERTY(unsigned int PICK_HUD READ PICK_HUD 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_VISIBLE READ getPickIncludeVisible CONSTANT)
Q_PROPERTY(unsigned int PICK_INCLUDE_INVISIBLE READ PICK_INCLUDE_INVISIBLE 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_COLLIDABLE READ getPickIncludeCollidable CONSTANT)
Q_PROPERTY(unsigned int PICK_INCLUDE_NONCOLLIDABLE READ PICK_INCLUDE_NONCOLLIDABLE 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_PRECISE READ getPickPrecise CONSTANT)
Q_PROPERTY(unsigned int PICK_COARSE READ PICK_COARSE 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_NONE READ getIntersectedNone CONSTANT)
Q_PROPERTY(unsigned int INTERSECTED_ENTITY READ INTERSECTED_ENTITY CONSTANT) Q_PROPERTY(unsigned int INTERSECTED_ENTITY READ getIntersectedEntity CONSTANT)
Q_PROPERTY(unsigned int INTERSECTED_LOCAL_ENTITY READ INTERSECTED_LOCAL_ENTITY CONSTANT) Q_PROPERTY(unsigned int INTERSECTED_LOCAL_ENTITY READ getIntersectedLocalEntity CONSTANT)
Q_PROPERTY(unsigned int INTERSECTED_OVERLAY READ INTERSECTED_OVERLAY CONSTANT) Q_PROPERTY(unsigned int INTERSECTED_OVERLAY READ getIntersectedOverlay CONSTANT)
Q_PROPERTY(unsigned int INTERSECTED_AVATAR READ INTERSECTED_AVATAR CONSTANT) Q_PROPERTY(unsigned int INTERSECTED_AVATAR READ getIntersectedAvatar CONSTANT)
Q_PROPERTY(unsigned int INTERSECTED_HUD READ INTERSECTED_HUD CONSTANT) Q_PROPERTY(unsigned int INTERSECTED_HUD READ getIntersectedHud CONSTANT)
Q_PROPERTY(unsigned int perFrameTimeBudget READ getPerFrameTimeBudget WRITE setPerFrameTimeBudget) Q_PROPERTY(unsigned int perFrameTimeBudget READ getPerFrameTimeBudget WRITE setPerFrameTimeBudget)
SINGLETON_DEPENDENCY SINGLETON_DEPENDENCY
@ -295,7 +295,9 @@ public:
unsigned int getPerFrameTimeBudget() const; unsigned int getPerFrameTimeBudget() const;
void setPerFrameTimeBudget(unsigned int numUsecs); 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 /*@jsdoc
* @function Picks.PICK_ENTITIES * @function Picks.PICK_ENTITIES
@ -303,7 +305,7 @@ public:
* Picks.PICK_AVATAR_ENTITIES</code> properties expression instead. * Picks.PICK_AVATAR_ENTITIES</code> properties expression instead.
* @returns {number} * @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 /*@jsdoc
* @function Picks.PICK_OVERLAYS * @function Picks.PICK_OVERLAYS
@ -311,7 +313,7 @@ public:
* instead. * instead.
* @returns {number} * @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 /*@jsdoc
@ -320,7 +322,7 @@ public:
* instead. * instead.
* @returns {number} * @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 /*@jsdoc
* @function Picks.PICK_AVATAR_ENTITIES * @function Picks.PICK_AVATAR_ENTITIES
@ -328,7 +330,7 @@ public:
* instead. * instead.
* @returns {number} * @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 /*@jsdoc
* @function Picks.PICK_LOCAL_ENTITIES * @function Picks.PICK_LOCAL_ENTITIES
@ -336,7 +338,7 @@ public:
* instead. * instead.
* @returns {number} * @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 /*@jsdoc
* @function Picks.PICK_AVATARS * @function Picks.PICK_AVATARS
@ -344,14 +346,14 @@ public:
* instead. * instead.
* @returns {number} * @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 /*@jsdoc
* @function Picks.PICK_HUD * @function Picks.PICK_HUD
* @deprecated This function is deprecated and will be removed. Use the <code>Picks.PICK_HUD</code> property instead. * @deprecated This function is deprecated and will be removed. Use the <code>Picks.PICK_HUD</code> property instead.
* @returns {number} * @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 /*@jsdoc
@ -360,7 +362,7 @@ public:
* instead. * instead.
* @returns {number} * @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 /*@jsdoc
* @function Picks.PICK_INCLUDE_INVISIBLE * @function Picks.PICK_INCLUDE_INVISIBLE
@ -368,7 +370,7 @@ public:
* instead. * instead.
* @returns {number} * @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 /*@jsdoc
@ -377,7 +379,7 @@ public:
* instead. * instead.
* @returns {number} * @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 /*@jsdoc
* @function Picks.PICK_INCLUDE_NONCOLLIDABLE * @function Picks.PICK_INCLUDE_NONCOLLIDABLE
@ -385,7 +387,7 @@ public:
* property instead. * property instead.
* @returns {number} * @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 /*@jsdoc
@ -393,14 +395,14 @@ public:
* @deprecated This function is deprecated and will be removed. Use the <code>Picks.PICK_PRECISE</code> property instead. * @deprecated This function is deprecated and will be removed. Use the <code>Picks.PICK_PRECISE</code> property instead.
* @returns {number} * @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 /*@jsdoc
* @function Picks.PICK_COARSE * @function Picks.PICK_COARSE
* @deprecated This function is deprecated and will be removed. Use the <code>Picks.PICK_COARSE</code> property instead. * @deprecated This function is deprecated and will be removed. Use the <code>Picks.PICK_COARSE</code> property instead.
* @returns {number} * @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 /*@jsdoc
@ -409,7 +411,7 @@ public:
* instead. * instead.
* @returns {number} * @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 /*@jsdoc
* @function Picks.INTERSECTED_NONE * @function Picks.INTERSECTED_NONE
@ -417,7 +419,7 @@ public:
* instead. * instead.
* @returns {number} * @returns {number}
*/ */
static constexpr unsigned int INTERSECTED_NONE() { return IntersectionType::NONE; } static constexpr unsigned int getIntersectedNone() { return IntersectionType::NONE; }
/*@jsdoc /*@jsdoc
* @function Picks.INTERSECTED_ENTITY * @function Picks.INTERSECTED_ENTITY
@ -425,7 +427,7 @@ public:
* instead. * instead.
* @returns {number} * @returns {number}
*/ */
static constexpr unsigned int INTERSECTED_ENTITY() { return IntersectionType::ENTITY; } static constexpr unsigned int getIntersectedEntity() { return IntersectionType::ENTITY; }
/*@jsdoc /*@jsdoc
* @function Picks.INTERSECTED_LOCAL_ENTITY * @function Picks.INTERSECTED_LOCAL_ENTITY
@ -433,7 +435,7 @@ public:
* property instead. * property instead.
* @returns {number} * @returns {number}
*/ */
static constexpr unsigned int INTERSECTED_LOCAL_ENTITY() { return IntersectionType::LOCAL_ENTITY; } static constexpr unsigned int getIntersectedLocalEntity() { return IntersectionType::LOCAL_ENTITY; }
/*@jsdoc /*@jsdoc
* @function Picks.INTERSECTED_OVERLAY * @function Picks.INTERSECTED_OVERLAY
@ -441,7 +443,7 @@ public:
* property instead. * property instead.
* @returns {number} * @returns {number}
*/ */
static constexpr unsigned int INTERSECTED_OVERLAY() { return INTERSECTED_LOCAL_ENTITY(); } static constexpr unsigned int getIntersectedOverlay() { return getIntersectedLocalEntity(); }
/*@jsdoc /*@jsdoc
* @function Picks.INTERSECTED_AVATAR * @function Picks.INTERSECTED_AVATAR
@ -449,7 +451,7 @@ public:
* instead. * instead.
* @returns {number} * @returns {number}
*/ */
static constexpr unsigned int INTERSECTED_AVATAR() { return IntersectionType::AVATAR; } static constexpr unsigned int getIntersectedAvatar() { return IntersectionType::AVATAR; }
/*@jsdoc /*@jsdoc
* @function Picks.INTERSECTED_HUD * @function Picks.INTERSECTED_HUD
@ -457,7 +459,7 @@ public:
* instead. * instead.
* @returns {number} * @returns {number}
*/ */
static constexpr unsigned int INTERSECTED_HUD() { return IntersectionType::HUD; } static constexpr unsigned int getIntersectedHud() { return IntersectionType::HUD; }
protected: protected:
static std::shared_ptr<PickQuery> buildRayPick(const QVariantMap& properties); static std::shared_ptr<PickQuery> buildRayPick(const QVariantMap& properties);

56
interface/src/raypick/RayPickScriptingInterface.h
View file

@ -51,20 +51,20 @@ class ScriptValue;
*/ */
class RayPickScriptingInterface : public QObject, public Dependency { class RayPickScriptingInterface : public QObject, public Dependency {
Q_OBJECT Q_OBJECT
Q_PROPERTY(unsigned int PICK_ENTITIES READ PICK_ENTITIES CONSTANT) Q_PROPERTY(unsigned int PICK_ENTITIES READ getPickEntities CONSTANT)
Q_PROPERTY(unsigned int PICK_OVERLAYS READ PICK_OVERLAYS CONSTANT) Q_PROPERTY(unsigned int PICK_OVERLAYS READ getPickOverlays CONSTANT)
Q_PROPERTY(unsigned int PICK_AVATARS READ PICK_AVATARS CONSTANT) Q_PROPERTY(unsigned int PICK_AVATARS READ getPickAvatars CONSTANT)
Q_PROPERTY(unsigned int PICK_HUD READ PICK_HUD CONSTANT) Q_PROPERTY(unsigned int PICK_HUD READ getPickHud CONSTANT)
Q_PROPERTY(unsigned int PICK_COARSE READ PICK_COARSE CONSTANT) Q_PROPERTY(unsigned int PICK_COARSE READ getPickCoarse CONSTANT)
Q_PROPERTY(unsigned int PICK_INCLUDE_INVISIBLE READ PICK_INCLUDE_INVISIBLE CONSTANT) Q_PROPERTY(unsigned int PICK_INCLUDE_INVISIBLE READ getPickIncludeInvisible CONSTANT)
Q_PROPERTY(unsigned int PICK_INCLUDE_NONCOLLIDABLE READ PICK_INCLUDE_NONCOLLIDABLE CONSTANT) Q_PROPERTY(unsigned int PICK_INCLUDE_NONCOLLIDABLE READ getPickIncludeNoncollidable 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 INTERSECTED_NONE READ INTERSECTED_NONE CONSTANT) Q_PROPERTY(unsigned int INTERSECTED_NONE READ getIntersectedNone CONSTANT)
Q_PROPERTY(unsigned int INTERSECTED_ENTITY READ INTERSECTED_ENTITY CONSTANT) Q_PROPERTY(unsigned int INTERSECTED_ENTITY READ getIntersectedEntity CONSTANT)
Q_PROPERTY(unsigned int INTERSECTED_LOCAL_ENTITY READ INTERSECTED_LOCAL_ENTITY CONSTANT) Q_PROPERTY(unsigned int INTERSECTED_LOCAL_ENTITY READ getIntersectedLocalEntity CONSTANT)
Q_PROPERTY(unsigned int INTERSECTED_OVERLAY READ INTERSECTED_OVERLAY CONSTANT) Q_PROPERTY(unsigned int INTERSECTED_OVERLAY READ getIntersectedOverlay CONSTANT)
Q_PROPERTY(unsigned int INTERSECTED_AVATAR READ INTERSECTED_AVATAR CONSTANT) Q_PROPERTY(unsigned int INTERSECTED_AVATAR READ getIntersectedAvatar CONSTANT)
Q_PROPERTY(unsigned int INTERSECTED_HUD READ INTERSECTED_HUD CONSTANT) Q_PROPERTY(unsigned int INTERSECTED_HUD READ getIntersectedHud CONSTANT)
SINGLETON_DEPENDENCY SINGLETON_DEPENDENCY
public: public:
@ -173,35 +173,35 @@ public slots:
* @deprecated This function is deprecated and will be removed. Use the <code>Raypick.PICK_ENTITIES</code> property instead. * @deprecated This function is deprecated and will be removed. Use the <code>Raypick.PICK_ENTITIES</code> property instead.
* @returns {number} * @returns {number}
*/ */
static unsigned int PICK_ENTITIES() { return PickScriptingInterface::PICK_ENTITIES(); } static unsigned int getPickEntities() { return PickScriptingInterface::getPickEntities(); }
/*@jsdoc /*@jsdoc
* @function RayPick.PICK_OVERLAYS * @function RayPick.PICK_OVERLAYS
* @deprecated This function is deprecated and will be removed. Use the <code>RayPick.PICK_OVERLAYS</code> property instead. * @deprecated This function is deprecated and will be removed. Use the <code>RayPick.PICK_OVERLAYS</code> property instead.
* @returns {number} * @returns {number}
*/ */
static unsigned int PICK_OVERLAYS() { return PickScriptingInterface::PICK_OVERLAYS(); } static unsigned int getPickOverlays() { return PickScriptingInterface::getPickOverlays(); }
/*@jsdoc /*@jsdoc
* @function RayPick.PICK_AVATARS * @function RayPick.PICK_AVATARS
* @deprecated This function is deprecated and will be removed. Use the <code>RayPick.PICK_AVATARS</code> property instead. * @deprecated This function is deprecated and will be removed. Use the <code>RayPick.PICK_AVATARS</code> property instead.
* @returns {number} * @returns {number}
*/ */
static unsigned int PICK_AVATARS() { return PickScriptingInterface::PICK_AVATARS(); } static unsigned int getPickAvatars() { return PickScriptingInterface::getPickAvatars(); }
/*@jsdoc /*@jsdoc
* @function RayPick.PICK_HUD * @function RayPick.PICK_HUD
* @deprecated This function is deprecated and will be removed. Use the <code>RayPick.PICK_HUD</code> property instead. * @deprecated This function is deprecated and will be removed. Use the <code>RayPick.PICK_HUD</code> property instead.
* @returns {number} * @returns {number}
*/ */
static unsigned int PICK_HUD() { return PickScriptingInterface::PICK_HUD(); } static unsigned int getPickHud() { return PickScriptingInterface::getPickHud(); }
/*@jsdoc /*@jsdoc
* @function RayPick.PICK_COARSE * @function RayPick.PICK_COARSE
* @deprecated This function is deprecated and will be removed. Use the <code>RayPick.PICK_COARSE</code> property instead. * @deprecated This function is deprecated and will be removed. Use the <code>RayPick.PICK_COARSE</code> property instead.
* @returns {number} * @returns {number}
*/ */
static unsigned int PICK_COARSE() { return PickScriptingInterface::PICK_COARSE(); } static unsigned int getPickCoarse() { return PickScriptingInterface::getPickCoarse(); }
/*@jsdoc /*@jsdoc
* @function RayPick.PICK_INCLUDE_INVISIBLE * @function RayPick.PICK_INCLUDE_INVISIBLE
@ -209,7 +209,7 @@ public slots:
* property instead. * property instead.
* @returns {number} * @returns {number}
*/ */
static unsigned int PICK_INCLUDE_INVISIBLE() { return PickScriptingInterface::PICK_INCLUDE_INVISIBLE(); } static unsigned int getPickIncludeInvisible() { return PickScriptingInterface::getPickIncludeInvisible(); }
/*@jsdoc /*@jsdoc
* @function RayPick.PICK_INCLUDE_NONCOLLIDABLE * @function RayPick.PICK_INCLUDE_NONCOLLIDABLE
@ -217,7 +217,7 @@ public slots:
* property instead. * property instead.
* @returns {number} * @returns {number}
*/ */
static unsigned int PICK_INCLUDE_NONCOLLIDABLE() { return PickScriptingInterface::PICK_INCLUDE_NONCOLLIDABLE(); } static unsigned int getPickIncludeNoncollidable() { return PickScriptingInterface::getPickIncludeNoncollidable(); }
/*@jsdoc /*@jsdoc
* @function RayPick.PICK_ALL_INTERSECTIONS * @function RayPick.PICK_ALL_INTERSECTIONS
@ -225,7 +225,7 @@ public slots:
* property instead. * property instead.
* @returns {number} * @returns {number}
*/ */
static unsigned int PICK_ALL_INTERSECTIONS() { return PickScriptingInterface::PICK_ALL_INTERSECTIONS(); } static unsigned int getPickAllIntersections() { return PickScriptingInterface::getPickAllIntersections(); }
/*@jsdoc /*@jsdoc
* @function RayPick.INTERSECTED_NONE * @function RayPick.INTERSECTED_NONE
@ -233,7 +233,7 @@ public slots:
* instead. * instead.
* @returns {number} * @returns {number}
*/ */
static unsigned int INTERSECTED_NONE() { return PickScriptingInterface::INTERSECTED_NONE(); } static unsigned int getIntersectedNone() { return PickScriptingInterface::getIntersectedNone(); }
/*@jsdoc /*@jsdoc
* @function RayPick.INTERSECTED_ENTITY * @function RayPick.INTERSECTED_ENTITY
@ -241,7 +241,7 @@ public slots:
* instead. * instead.
* @returns {number} * @returns {number}
*/ */
static unsigned int INTERSECTED_ENTITY() { return PickScriptingInterface::INTERSECTED_ENTITY(); } static unsigned int getIntersectedEntity() { return PickScriptingInterface::getIntersectedEntity(); }
/*@jsdoc /*@jsdoc
* @function RayPick.INTERSECTED_OVERLAY * @function RayPick.INTERSECTED_OVERLAY
@ -249,7 +249,7 @@ public slots:
* property instead. * property instead.
* @returns {number} * @returns {number}
*/ */
static unsigned int INTERSECTED_LOCAL_ENTITY() { return PickScriptingInterface::INTERSECTED_LOCAL_ENTITY(); } static unsigned int getIntersectedLocalEntity() { return PickScriptingInterface::getIntersectedLocalEntity(); }
/*@jsdoc /*@jsdoc
* @function RayPick.INTERSECTED_OVERLAY * @function RayPick.INTERSECTED_OVERLAY
@ -257,7 +257,7 @@ public slots:
* instead. * instead.
* @returns {number} * @returns {number}
*/ */
static unsigned int INTERSECTED_OVERLAY() { return PickScriptingInterface::INTERSECTED_LOCAL_ENTITY(); } static unsigned int getIntersectedOverlay() { return PickScriptingInterface::getIntersectedOverlay(); }
/*@jsdoc /*@jsdoc
* @function RayPick.INTERSECTED_AVATAR * @function RayPick.INTERSECTED_AVATAR
@ -265,7 +265,7 @@ public slots:
* instead. * instead.
* @returns {number} * @returns {number}
*/ */
static unsigned int INTERSECTED_AVATAR() { return PickScriptingInterface::INTERSECTED_AVATAR(); } static unsigned int getIntersectedAvatar() { return PickScriptingInterface::getIntersectedAvatar(); }
/*@jsdoc /*@jsdoc
* @function RayPick.INTERSECTED_HUD * @function RayPick.INTERSECTED_HUD
@ -273,7 +273,7 @@ public slots:
* instead. * instead.
* @returns {number} * @returns {number}
*/ */
static unsigned int INTERSECTED_HUD() { return PickScriptingInterface::INTERSECTED_HUD(); } static unsigned int getIntersectedHud() { return PickScriptingInterface::getIntersectedHud(); }
}; };
#endif // hifi_RayPickScriptingInterface_h #endif // hifi_RayPickScriptingInterface_h

4
interface/src/ui/Keyboard.cpp
View file

@ -271,14 +271,14 @@ void Keyboard::createKeyboard() {
QVariantMap leftStylusProperties { QVariantMap leftStylusProperties {
{ "hand", LEFT_HAND_CONTROLLER_INDEX }, { "hand", LEFT_HAND_CONTROLLER_INDEX },
{ "filter", PickScriptingInterface::PICK_LOCAL_ENTITIES() }, { "filter", PickScriptingInterface::getPickLocalEntities() },
{ "model", modelProperties }, { "model", modelProperties },
{ "tipOffset", vec3toVariant(MALLET_TIP_OFFSET) } { "tipOffset", vec3toVariant(MALLET_TIP_OFFSET) }
}; };
QVariantMap rightStylusProperties { QVariantMap rightStylusProperties {
{ "hand", RIGHT_HAND_CONTROLLER_INDEX }, { "hand", RIGHT_HAND_CONTROLLER_INDEX },
{ "filter", PickScriptingInterface::PICK_LOCAL_ENTITIES() }, { "filter", PickScriptingInterface::getPickLocalEntities() },
{ "model", modelProperties }, { "model", modelProperties },
{ "tipOffset", vec3toVariant(MALLET_TIP_OFFSET) } { "tipOffset", vec3toVariant(MALLET_TIP_OFFSET) }
}; };