bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

EEVEE: Add Ray Visibility > Camera support

Browse Source 
FIx #122980.

Pull Request: https://projects.blender.org/blender/blender/pulls/123248
This commit is contained in:
Miguel Pozo 2024-06-15 08:54:20 +02:00 committed by Clément Foucault
parent a0b556a39a
commit a11d3c6c01
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/startup/bl_ui/properties_object.py
View File

@ -393,6 +393,7 @@ class OBJECT_PT_visibility(ObjectButtonsPanel, Panel):
if ob.type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT', 'CURVES', 'POINTCLOUD', 'VOLUME'}:
layout.separator()
col = layout.column(heading="Ray Visibility")
col.prop(ob, "visible_camera", text="Camera", toggle=False)
col.prop(ob, "visible_shadow", text="Shadow", toggle=False)
if ob.type in {'LIGHT'}:

26
source/blender/draw/engines/eevee_next/eevee_material.cc
View File

@ -255,6 +255,8 @@ Material &MaterialModule::material_sync(Object *ob,
eMaterialGeometry geometry_type,
bool has_motion)
{
bool hide_on_camera = ob->visibility_flag & OB_HIDE_CAMERA;
if (geometry_type == MAT_GEOM_VOLUME) {
MaterialKey material_key(
blender_mat, geometry_type, MAT_PIPE_VOLUME_MATERIAL, ob->visibility_flag);
@ -268,7 +270,8 @@ Material &MaterialModule::material_sync(Object *ob,
});
/* Volume needs to use one sub pass per object to support layering. */
VolumeLayer *layer = inst_.pipelines.volume.register_and_get_layer(ob);
VolumeLayer *layer = hide_on_camera ? nullptr :
inst_.pipelines.volume.register_and_get_layer(ob);
if (layer) {
mat.volume_occupancy.sub_pass = layer->occupancy_add(
ob, blender_mat, mat.volume_occupancy.gpumat);
@ -317,8 +320,20 @@ Material &MaterialModule::material_sync(Object *ob,
}
else {
/* Order is important for transparent. */
mat.prepass = material_pass_get(ob, blender_mat, prepass_pipe, geometry_type);
if (!hide_on_camera) {
mat.prepass = material_pass_get(ob, blender_mat, prepass_pipe, geometry_type);
}
else {
mat.prepass = MaterialPass();
}
mat.shading = material_pass_get(ob, blender_mat, surface_pipe, geometry_type);
if (hide_on_camera) {
/* Only null the sub_pass.
* mat.shading.gpumat is is always needed for using the GPU_material API. */
mat.shading.sub_pass = nullptr;
}
mat.overlap_masking = MaterialPass();
mat.capture = MaterialPass();
@ -347,7 +362,7 @@ Material &MaterialModule::material_sync(Object *ob,
mat.has_surface = GPU_material_has_surface_output(mat.shading.gpumat);
mat.has_volume = GPU_material_has_volume_output(mat.shading.gpumat);
if (mat.has_volume) {
if (mat.has_volume && !hide_on_camera) {
mat.volume_occupancy = material_pass_get(
ob, blender_mat, MAT_PIPE_VOLUME_OCCUPANCY, geometry_type);
mat.volume_material = material_pass_get(
@ -376,7 +391,7 @@ Material &MaterialModule::material_sync(Object *ob,
return mat;
});
if (mat.is_alpha_blend_transparent) {
if (mat.is_alpha_blend_transparent && !hide_on_camera) {
/* Transparent needs to use one sub pass per object to support reordering.
* NOTE: Pre-pass needs to be created first in order to be sorted first. */
mat.overlap_masking.sub_pass = inst_.pipelines.forward.prepass_transparent_add(
@ -387,7 +402,8 @@ Material &MaterialModule::material_sync(Object *ob,
if (mat.has_volume) {
/* Volume needs to use one sub pass per object to support layering. */
VolumeLayer *layer = inst_.pipelines.volume.register_and_get_layer(ob);
VolumeLayer *layer = hide_on_camera ? nullptr :
inst_.pipelines.volume.register_and_get_layer(ob);
if (layer) {
mat.volume_occupancy.sub_pass = layer->occupancy_add(
ob, blender_mat, mat.volume_occupancy.gpumat);