Can now add and remove from selection using shift and alt
This commit is contained in:
parent
137b1603e5
commit
1a5815a994
12 changed files with 103 additions and 61 deletions
|
|
@ -8,6 +8,8 @@ class DrawingProgramSelection {
|
|||
public:
|
||||
DrawingProgramSelection(DrawingProgram& initDrawP);
|
||||
void add_from_cam_coord_collider_to_selection(const SCollision::ColliderCollection<float>& cC);
|
||||
void remove_from_cam_coord_collider_to_selection(const SCollision::ColliderCollection<float>& cC);
|
||||
|
||||
void deselect_all();
|
||||
void update();
|
||||
void draw_components(SkCanvas* canvas, const DrawData& drawData);
|
||||
|
|
@ -18,9 +20,13 @@ class DrawingProgramSelection {
|
|||
bool is_selected(const CollabListType::ObjectInfoPtr& objToCheck);
|
||||
const std::unordered_set<CollabListType::ObjectInfoPtr>& get_selected_set();
|
||||
|
||||
bool is_being_transformed();
|
||||
|
||||
void invalidate_cache_at_optional_aabb_before_pos(const std::optional<SCollision::AABB<WorldScalar>>& aabb, uint64_t placementToInvalidateAt);
|
||||
void preupdate_component(const CollabListType::ObjectInfoPtr& objToCheck);
|
||||
private:
|
||||
std::function<bool(const std::shared_ptr<DrawingProgramCacheBVHNode>&, std::vector<CollabListType::ObjectInfoPtr>&)> erase_select_objects_in_bvh_func(std::unordered_set<CollabListType::ObjectInfoPtr>& selectedComponents, const SCollision::ColliderCollection<float>& cC, const SCollision::ColliderCollection<WorldScalar>& cCWorld);
|
||||
|
||||
void delete_all();
|
||||
bool mouse_collided_with_selection_aabb();
|
||||
bool mouse_collided_with_scale_point();
|
||||
|
|
@ -28,7 +34,10 @@ class DrawingProgramSelection {
|
|||
bool mouse_collided_with_rotate_handle_point();
|
||||
void selection_to_clipboard();
|
||||
void paste_clipboard();
|
||||
|
||||
void set_to_selection(const std::unordered_set<CollabListType::ObjectInfoPtr>& newSelection);
|
||||
void add_to_selection(const std::unordered_set<CollabListType::ObjectInfoPtr>& newSelection);
|
||||
void add_erased_objects_back_to_cache(const std::unordered_set<CollabListType::ObjectInfoPtr>& erasedObjects);
|
||||
|
||||
void commit_transform_selection();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue