Showing the changes to interface/src/scripting/SelectionScriptingInterface.h (1 of 62 files). Show all
Unified · Split
| @@ -19,7 +19,6 @@ · 18 unmodified lines | |||
| 19 | #include <AbstractViewStateInterface.h> | 19 | #include <AbstractViewStateInterface.h> |
| 20 | 20 | ||
| 21 | #include "RenderableEntityItem.h" | 21 | #include "RenderableEntityItem.h" |
| 22 | #include "ui/overlays/Overlay.h" | ||
| 23 | #include <avatar/AvatarManager.h> | 22 | #include <avatar/AvatarManager.h> |
| 24 | #include <render/HighlightStyle.h> | 23 | #include <render/HighlightStyle.h> |
| 25 | 24 | ||
| @@ -37,15 +36,10 @@ public: · 11 unmodified lines | |||
| 37 | bool addToGameplayObjects(const EntityItemID& entityID); | 36 | bool addToGameplayObjects(const EntityItemID& entityID); |
| 38 | bool removeFromGameplayObjects(const EntityItemID& entityID); | 37 | bool removeFromGameplayObjects(const EntityItemID& entityID); |
| 39 | 38 | ||
| 40 | std::vector<OverlayID> getOverlayIDs() const { return _overlayIDs; } | ||
| 41 | bool addToGameplayObjects(const OverlayID& overlayID); | ||
| 42 | bool removeFromGameplayObjects(const OverlayID& overlayID); | ||
| 43 | |||
| 44 | private: | 39 | private: |
| 45 | bool containsData { false }; | 40 | bool containsData { false }; |
| 46 | std::vector<QUuid> _avatarIDs; | 41 | std::vector<QUuid> _avatarIDs; |
| 47 | std::vector<EntityItemID> _entityIDs; | 42 | std::vector<EntityItemID> _entityIDs; |
| 48 | std::vector<OverlayID> _overlayIDs; | ||
| 49 | }; | 43 | }; |
| 50 | 44 | ||
| 51 | 45 | ||
| @@ -83,7 +77,7 @@ protected: · 31 unmodified lines | |||
| 83 | }; | 77 | }; |
| 84 | 78 | ||
| 85 | /**jsdoc | 79 | /**jsdoc |
| 86 | * The <code>Selection</code> API provides a means of grouping together avatars, entities, and overlays in named lists. | 80 | * The <code>Selection</code> API provides a means of grouping together avatars and entities in named lists. |
| 87 | * @namespace Selection | 81 | * @namespace Selection |
| 88 | * | 82 | * |
| 89 | * @hifi-interface | 83 | * @hifi-interface |
| @@ -174,14 +168,14 @@ public: · 84 unmodified lines | |||
| 174 | Q_INVOKABLE bool clearSelectedItemsList(const QString& listName); | 168 | Q_INVOKABLE bool clearSelectedItemsList(const QString& listName); |
| 175 | 169 | ||
| 176 | /**jsdoc | 170 | /**jsdoc |
| 177 | * Print out the list of avatars, entities, and overlays in a selection to the <em>debug log</em> (not the script log). | 171 | * Print out the list of avatars and entities in a selection to the <em>debug log</em> (not the script log). |
| 178 | * @function Selection.printList | 172 | * @function Selection.printList |
| 179 | * @param {string} listName - The name of the selection list. | 173 | * @param {string} listName - The name of the selection list. |
| 180 | */ | 174 | */ |
| 181 | Q_INVOKABLE void printList(const QString& listName); | 175 | Q_INVOKABLE void printList(const QString& listName); |
| 182 | 176 | ||
| 183 | /**jsdoc | 177 | /**jsdoc |
| 184 | * Get the list of avatars, entities, and overlays stored in a selection list. | 178 | * Get the list of avatars and entities stored in a selection list. |
| 185 | * @function Selection.getSelectedItemsList | 179 | * @function Selection.getSelectedItemsList |
| 186 | * @param {string} listName - The name of the selection list. | 180 | * @param {string} listName - The name of the selection list. |
| 187 | * @returns {Selection.SelectedItemsList} The content of a selection list. If the list name doesn't exist, the function | 181 | * @returns {Selection.SelectedItemsList} The content of a selection list. If the list name doesn't exist, the function |