History

more overlay wip

SamGondelman committed 7 years ago

Commit 5ce8f561 parent ca8d64b62 files · +620 −864Browse files

Showing the changes to interface/src/scripting/SelectionScriptingInterface.h (1 of 62 files). Show all

Unified · Split

interface/src/scripting/SelectionScriptingInterface.h+3−9
@@ -19,7 +19,6 @@ · 18 unmodified lines
1919 #include <AbstractViewStateInterface.h>
2020
2121 #include "RenderableEntityItem.h"
22−#include "ui/overlays/Overlay.h"
2322 #include <avatar/AvatarManager.h>
2423 #include <render/HighlightStyle.h>
2524
@@ -37,15 +36,10 @@ public: · 11 unmodified lines
3736 bool addToGameplayObjects(const EntityItemID& entityID);
3837 bool removeFromGameplayObjects(const EntityItemID& entityID);
3938
40− std::vector<OverlayID> getOverlayIDs() const { return _overlayIDs; }
41− bool addToGameplayObjects(const OverlayID& overlayID);
42− bool removeFromGameplayObjects(const OverlayID& overlayID);
43−
4439 private:
4540 bool containsData { false };
4641 std::vector<QUuid> _avatarIDs;
4742 std::vector<EntityItemID> _entityIDs;
48− std::vector<OverlayID> _overlayIDs;
4943 };
5044
5145
@@ -83,7 +77,7 @@ protected: · 31 unmodified lines
8377 };
8478
8579 /**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.
8781 * @namespace Selection
8882 *
8983 * @hifi-interface
@@ -174,14 +168,14 @@ public: · 84 unmodified lines
174168 Q_INVOKABLE bool clearSelectedItemsList(const QString& listName);
175169
176170 /**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).
178172 * @function Selection.printList
179173 * @param {string} listName - The name of the selection list.
180174 */
181175 Q_INVOKABLE void printList(const QString& listName);
182176
183177 /**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.
185179 * @function Selection.getSelectedItemsList
186180 * @param {string} listName - The name of the selection list.
187181 * @returns {Selection.SelectedItemsList} The content of a selection list. If the list name doesn't exist, the function