Add rendering layer mask to GridMap #86992
Open
+67
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
modules/gridmap/grid_map.cpp
Outdated
| @@ -1121,6 +1160,8 @@ void GridMap::_bind_methods() { | |||
| ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "collision_priority"), "set_collision_priority", "get_collision_priority"); | |||
| ADD_GROUP("Navigation", ""); | |||
| ADD_PROPERTY(PropertyInfo(Variant::BOOL, "bake_navigation"), "set_bake_navigation", "is_baking_navigation"); | |||
| ADD_GROUP("Rendering", "rendering_"); | |||
| ADD_PROPERTY(PropertyInfo(Variant::INT, "rendering_layer", PROPERTY_HINT_LAYERS_3D_RENDER), "set_rendering_layer_mask", "get_rendering_layer_mask"); | |||
There was a problem hiding this comment.
Suggested change
| ADD_PROPERTY(PropertyInfo(Variant::INT, "rendering_layer", PROPERTY_HINT_LAYERS_3D_RENDER), "set_rendering_layer_mask", "get_rendering_layer_mask"); | |
| ADD_PROPERTY(PropertyInfo(Variant::INT, "rendering_layers", PROPERTY_HINT_LAYERS_3D_RENDER), "set_rendering_layer_mask", "get_rendering_layer_mask"); |
To match other use, it's layers in VisualInstance3D, and it's not a singular layer
modules/gridmap/grid_map.h
Outdated
| @@ -151,6 +151,7 @@ class GridMap : public Node3D { | |||
|
|
|||
| uint32_t collision_layer = 1; | |||
| uint32_t collision_mask = 1; | |||
| uint32_t rendering_layer = 1; | |||
There was a problem hiding this comment.
Suggested change
| uint32_t rendering_layer = 1; | |
| uint32_t rendering_layers = 1; |
modules/gridmap/grid_map.cpp
Outdated
| @@ -962,11 +993,14 @@ void GridMap::_update_visibility() { | |||
| for (int i = 0; i < octant->multimesh_instances.size(); i++) { | |||
| const Octant::MultimeshInstance &mi = octant->multimesh_instances[i]; | |||
| RS::get_singleton()->instance_set_visible(mi.instance, is_visible_in_tree()); | |||
| RS::get_singleton()->instance_set_layer_mask(mi.instance, get_rendering_layer_mask()); | |||
|
|
|||
kilojool
force-pushed
the
gridmap-rendering-layer
branch
from
520bf25 to
6db96b9
Compare
kilojool
force-pushed
the
gridmap-rendering-layer
branch
from
6db96b9 to
6db1545
Compare
37 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds support for rendering layers to GridMap. It is mostly a straight-up copy of the code from VisualInstance3D. Perhaps it would be better to inherit from VisualInstance3D, but since GridMap handles collision and navigation also, I assumed that was the reason it didn't already.
Solves #40245