Add multiselect to asset dock - #739
Conversation
|
Theres a few issues testing this: Having more than 1 mesh asset, and then trying to remove the last asset when not currently selected, forces it to be selected. Which then causes errors when painting assets. Having CrystalC as asset ID 0, Rock A as ID 1, have both selected, then add a 3rd asset, Rock B, causes ID 0 to render as Rock B, along with the thumbnail to swap to Rock B, even though CrystalC is still the chosen Scene file in the inspector. When it did work, it was nice to use, I can see it being very useful! |
e02f0f7 to
ceed9fc
Compare
b613a8a to
6297904
Compare
Both of these issues have now been addressed, thanks! |
f927c92 to
a9ce529
Compare
a9ce529 to
a7a6940
Compare
|
This had gone through a few changes since the last tests to bring it up to date and to add support for 4.6 This adds the ability to select multiple Mesh Assets and paint them in a single operation. I changed the selected_id int to an Array Left clicking a tile in the asset dock will add it to the selection, or deselect it if it is already selected. Right clicking a tile will add it to the selection, but will not remove from the selection. Density is independent for each MA, so you can paint grass at high density with lower density trees. Instance removal is similarly multi-select, it will remove instances of the MAs that are currently selected. Search - because we are selectively showing tiles here, we get a mismatch between the tile id and the asset id. To fix it, I have changed to a system whereby the selected_ids array contains the asset_ids, rather than tile ids. This means we can make a selection, perform a search, add a new MA to the selection, clear the search without losing our original selection. |
TokisanGames
left a comment
TokisanGames
left a comment
There was a problem hiding this comment.
Here's a first pass reviewing only the C++. So far so good, only one crash and some minor things.
|
|
||
| _brush_data["enable_texture"] = p_data.get("enable_texture", true); | ||
| _brush_data["texture_filter"] = p_data.get("texture_filter", false); | ||
| _brush_data["asset_id"] = CLAMP(int(p_data.get("asset_id", 0)), 0, ((_tool == INSTANCER) ? Terrain3DAssets::MAX_MESHES : Terrain3DAssets::MAX_TEXTURES) - 1); |
There was a problem hiding this comment.
This defaulted to id 0. Now texture painting is ignored if there is no asset_ids. Perhaps we should insert [0] if it doesn't exist.
Also it doesn't sanitize the brush data. Sanitization was limited only to 0-32/256 before instead of the actual count. We could check _terrain->get_assets()->get_texture_count() and _terrain->get_assets()->get_mesh_count().
There was a problem hiding this comment.
I have implemented sanitation and need to test it
| int mesh_id = p_params.get("asset_id", 0); | ||
| if (p_params.has("asset_id")) { | ||
| LOG(ERROR, "We are no longer using asset_id, we need an array of asset_ids"); | ||
| } |
There was a problem hiding this comment.
Removed the code and updated the docs (edited the xml files)
When it's merged could you update the tracker issue please? Or I can add it as a new comment.
| real_t random_tilt = CLAMP(real_t(p_params.get("random_tilt", 10.f)), 0.f, 180.f); // degrees | ||
| bool align_to_normal = bool(p_params.get("align_to_normal", false)); | ||
| for (int i = 0; i < mesh_ids.size(); i++) { | ||
| int mesh_id = mesh_ids[i]; |
There was a problem hiding this comment.
Can be for (const int mesh_id : mesh_ids)
There was a problem hiding this comment.
We need the current index from the selected_index array when we call _update_density_count(index, p_density)
a7a6940 to
8ee87f1
Compare
3 participants
Allows selection of multiple mesh assets in the dock for instancing or removal.
Always keeps at least one asset selected.
Click tile to select/deselect