History

updates based on austin's comments

SamGondelman committed 9 years ago

Commit 640ad511 parent 05f48835 files · +26 −27Browse files

Showing the changes to interface/src/raypick/RayPickScriptingInterface.h (1 of 5 files). Show all

Unified · Split

interface/src/raypick/RayPickScriptingInterface.h+14−14
@@ -46,20 +46,20 @@ public slots: · 45 unmodified lines
46 Q_INVOKABLE void setIgnoreItems(const QUuid& uid, const QScriptValue& ignoreEntities);46 Q_INVOKABLE void setIgnoreItems(const QUuid& uid, const QScriptValue& ignoreEntities);
47 Q_INVOKABLE void setIncludeItems(const QUuid& uid, const QScriptValue& includeEntities);47 Q_INVOKABLE void setIncludeItems(const QUuid& uid, const QScriptValue& includeEntities);
48 48
49 unsigned int PICK_NOTHING() { return 0; }49 static unsigned int PICK_NOTHING() { return 0; }
50 unsigned int PICK_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_ENTITIES); }50 static unsigned int PICK_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_ENTITIES); }
51 unsigned int PICK_OVERLAYS() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_OVERLAYS); }51 static unsigned int PICK_OVERLAYS() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_OVERLAYS); }
52 unsigned int PICK_AVATARS() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_AVATARS); }52 static unsigned int PICK_AVATARS() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_AVATARS); }
53 unsigned int PICK_HUD() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_HUD); }53 static unsigned int PICK_HUD() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_HUD); }
54 unsigned int PICK_COARSE() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_COARSE); }54 static unsigned int PICK_COARSE() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_COARSE); }
55 unsigned int PICK_INCLUDE_INVISIBLE() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_INCLUDE_INVISIBLE); }55 static unsigned int PICK_INCLUDE_INVISIBLE() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_INCLUDE_INVISIBLE); }
56 unsigned int PICK_INCLUDE_NONCOLLIDABLE() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_INCLUDE_NONCOLLIDABLE); }56 static unsigned int PICK_INCLUDE_NONCOLLIDABLE() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_INCLUDE_NONCOLLIDABLE); }
57 unsigned int PICK_ALL_INTERSECTIONS() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_ALL_INTERSECTIONS); }57 static unsigned int PICK_ALL_INTERSECTIONS() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_ALL_INTERSECTIONS); }
58 unsigned int INTERSECTED_NONE() { return IntersectionType::NONE; }58 static unsigned int INTERSECTED_NONE() { return IntersectionType::NONE; }
59 unsigned int INTERSECTED_ENTITY() { return IntersectionType::ENTITY; }59 static unsigned int INTERSECTED_ENTITY() { return IntersectionType::ENTITY; }
60 unsigned int INTERSECTED_OVERLAY() { return IntersectionType::OVERLAY; }60 static unsigned int INTERSECTED_OVERLAY() { return IntersectionType::OVERLAY; }
61 unsigned int INTERSECTED_AVATAR() { return IntersectionType::AVATAR; }61 static unsigned int INTERSECTED_AVATAR() { return IntersectionType::AVATAR; }
62 unsigned int INTERSECTED_HUD() { return IntersectionType::HUD; }62 static unsigned int INTERSECTED_HUD() { return IntersectionType::HUD; }
63};63};
64 64
65#endif // hifi_RayPickScriptingInterface_h65#endif // hifi_RayPickScriptingInterface_h

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t