archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Probe: Add grid probe parameters.

Browse Source
This commit is contained in:
Clément Foucault
2017-06-13 15:56:04 +02:00
parent 7439919ac0
commit 8e5609665f
3 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
release/scripts/startup/bl_ui/properties_data_lightprobe.py
View File

@@ -64,16 +64,23 @@ class DATA_PT_lightprobe(DataButtonsPanel, Panel):
split = layout.split()
col = split.column(align=True)
col.label("Influence:")
col.prop(probe, "influence_type", text="")
if probe.influence_type == 'ELIPSOID':
col.prop(probe, "influence_distance", "Radius")
if probe.type == 'GRID':
col = split.column(align=True)
col.label("Resolution:")
col.prop(probe, "grid_resolution_x", text="X")
col.prop(probe, "grid_resolution_y", text="Y")
col.prop(probe, "grid_resolution_z", text="Z")
else:
col.prop(probe, "influence_distance", "Size")
col = split.column(align=True)
col.label("Influence:")
col.prop(probe, "influence_type", text="")
col.prop(probe, "falloff")
if probe.influence_type == 'ELIPSOID':
col.prop(probe, "influence_distance", "Radius")
else:
col.prop(probe, "influence_distance", "Size")
col.prop(probe, "falloff")
col = split.column(align=True)
col.label("Clipping:")
@@ -85,6 +92,11 @@ class DATA_PT_lightprobe_parallax(DataButtonsPanel, Panel):
bl_label = "Parallax"
COMPAT_ENGINES = {'BLENDER_CLAY', 'BLENDER_EEVEE'}
@classmethod
def poll(cls, context):
engine = context.scene.render.engine
return context.probe and context.probe.type == 'CUBEMAP' and (engine in cls.COMPAT_ENGINES)
def draw(self, context):
layout = self.layout

6
source/blender/makesdna/DNA_lightprobe_types.h
View File

@@ -54,6 +54,11 @@ typedef struct LightProbe {
float clipsta, clipend;
int grid_resolution_x; /* Irradiance grid resolution */
int grid_resolution_y;
int grid_resolution_z;
int pad1;
struct Object *parallax_ob; /* Object to use as a parallax origin */
struct Image *image; /* Image to use on as lighting data */
@@ -67,6 +72,7 @@ enum {
LIGHTPROBE_TYPE_CUBE = 0,
LIGHTPROBE_TYPE_PLANAR = 1,
LIGHTPROBE_TYPE_IMAGE = 2,
LIGHTPROBE_TYPE_GRID = 3,
};
/* Probe->flag */

19
source/blender/makesrna/intern/rna_lightprobe.c
View File

@@ -63,9 +63,10 @@ static EnumPropertyItem parallax_type_items[] = {
};
static EnumPropertyItem lightprobe_type_items[] = {
{LIGHTPROBE_TYPE_CUBE, "CUBEMAP", ICON_NONE, "Cubemap", ""},
{LIGHTPROBE_TYPE_CUBE, "CUBEMAP", ICON_NONE, "Cubemap", "Capture reflections"},
// {LIGHTPROBE_TYPE_PLANAR, "PLANAR", ICON_NONE, "Planar", ""},
// {LIGHTPROBE_TYPE_IMAGE, "IMAGE", ICON_NONE, "Image", ""},
{LIGHTPROBE_TYPE_GRID, "GRID", ICON_NONE, "Grid", "Volume used for precomputing indirect lighting"},
{0, NULL, 0, NULL, NULL}
};
@@ -145,6 +146,22 @@ static void rna_def_lightprobe(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Parallax Radius", "Lowest corner of the parallax bounding box");
RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, NULL);
/* irradiance grid */
prop = RNA_def_property(srna, "grid_resolution_x", PROP_INT, PROP_PIXEL);
RNA_def_property_range(prop, 1, 256);
RNA_def_property_ui_text(prop, "Resolution X", "Number of sample along the x axis of the volume");
RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, NULL);
prop = RNA_def_property(srna, "grid_resolution_y", PROP_INT, PROP_PIXEL);
RNA_def_property_range(prop, 1, 256);
RNA_def_property_ui_text(prop, "Resolution Y", "Number of sample along the y axis of the volume");
RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, NULL);
prop = RNA_def_property(srna, "grid_resolution_z", PROP_INT, PROP_PIXEL);
RNA_def_property_range(prop, 1, 256);
RNA_def_property_ui_text(prop, "Resolution Z", "Number of sample along the z axis of the volume");
RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, NULL);
/* common */
rna_def_animdata_common(srna);
}