maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

AO support for GIProbe (right on time for Godot Sprint!)

Browse source
This commit is contained in:
Juan Linietsky 2019-10-14 03:45:44 -03:00 committed by Juan Linietsky
parent 76c6f39d99
commit 2c67cc654f
13 changed files with 129 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scene/3d/gi_probe.cpp
View file

@ -134,6 +134,24 @@ float GIProbeData::get_energy() const {
return energy;
}
void GIProbeData::set_ao(float p_ao) {
VS::get_singleton()->gi_probe_set_ao(probe, p_ao);
ao = p_ao;
}
float GIProbeData::get_ao() const {
return ao;
}
void GIProbeData::set_ao_strength(float p_ao_strength) {
VS::get_singleton()->gi_probe_set_ao_strength(probe, p_ao_strength);
ao_strength = p_ao_strength;
}
float GIProbeData::get_ao_strength() const {
return ao_strength;
}
void GIProbeData::set_bias(float p_bias) {
VS::get_singleton()->gi_probe_set_bias(probe, p_bias);
bias = p_bias;
@ -213,6 +231,12 @@ void GIProbeData::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_anisotropy_strength", "strength"), &GIProbeData::set_anisotropy_strength);
ClassDB::bind_method(D_METHOD("get_anisotropy_strength"), &GIProbeData::get_anisotropy_strength);
ClassDB::bind_method(D_METHOD("set_ao", "ao"), &GIProbeData::set_ao);
ClassDB::bind_method(D_METHOD("get_ao"), &GIProbeData::get_ao);
ClassDB::bind_method(D_METHOD("set_ao_strength", "strength"), &GIProbeData::set_ao_strength);
ClassDB::bind_method(D_METHOD("get_ao_strength"), &GIProbeData::get_ao_strength);
ClassDB::bind_method(D_METHOD("set_interior", "interior"), &GIProbeData::set_interior);
ClassDB::bind_method(D_METHOD("is_interior"), &GIProbeData::is_interior);
@ -230,12 +254,16 @@ void GIProbeData::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::REAL, "normal_bias", PROPERTY_HINT_RANGE, "0,8,0.01"), "set_normal_bias", "get_normal_bias");
ADD_PROPERTY(PropertyInfo(Variant::REAL, "propagation", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_propagation", "get_propagation");
ADD_PROPERTY(PropertyInfo(Variant::REAL, "anisotropy_strength", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_anisotropy_strength", "get_anisotropy_strength");
ADD_PROPERTY(PropertyInfo(Variant::REAL, "ao", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_ao", "get_ao");
ADD_PROPERTY(PropertyInfo(Variant::REAL, "ao_strength", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_ao_strength", "get_ao_strength");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_two_bounces"), "set_use_two_bounces", "is_using_two_bounces");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "interior"), "set_interior", "is_interior");
}
GIProbeData::GIProbeData() {
ao = 0.0;
ao_strength = 0.5;
dynamic_range = 4;
energy = 1.0;
bias = 1.5;

8
scene/3d/gi_probe.h
View file

@ -53,6 +53,8 @@ class GIProbeData : public Resource {
float normal_bias;
float propagation;
float anisotropy_strength;
float ao;
float ao_strength;
bool interior;
bool use_two_bounces;
@ -79,6 +81,12 @@ public:
void set_anisotropy_strength(float p_anisotropy_strength);
float get_anisotropy_strength() const;
void set_ao(float p_ao);
float get_ao() const;
void set_ao_strength(float p_ao_strength);
float get_ao_strength() const;
void set_energy(float p_energy);
float get_energy() const;

6
servers/visual/rasterizer.h
View file

@ -508,6 +508,12 @@ public:
virtual void gi_probe_set_energy(RID p_gi_probe, float p_energy) = 0;
virtual float gi_probe_get_energy(RID p_gi_probe) const = 0;
virtual void gi_probe_set_ao(RID p_gi_probe, float p_ao) = 0;
virtual float gi_probe_get_ao(RID p_gi_probe) const = 0;
virtual void gi_probe_set_ao_strength(RID p_gi_probe, float p_strength) = 0;
virtual float gi_probe_get_ao_strength(RID p_gi_probe) const = 0;
virtual void gi_probe_set_bias(RID p_gi_probe, float p_bias) = 0;
virtual float gi_probe_get_bias(RID p_gi_probe) const = 0;

2
servers/visual/rasterizer_rd/rasterizer_scene_forward_rd.cpp
View file

@ -1555,6 +1555,8 @@ void RasterizerSceneForwardRD::_setup_gi_probes(RID *p_gi_probe_probe_cull_resul
gi_probe_ubo.blend_ambient = !storage->gi_probe_is_interior(base_probe);
gi_probe_ubo.texture_slot = gi_probe_instance_get_slot(rpi);
gi_probe_ubo.anisotropy_strength = storage->gi_probe_get_anisotropy_strength(base_probe);
gi_probe_ubo.ao = storage->gi_probe_get_ao(base_probe);
gi_probe_ubo.ao_strength = storage->gi_probe_get_ao_strength(base_probe);
if (gi_probe_is_anisotropic()) {
gi_probe_ubo.texture_slot *= 3;

4
servers/visual/rasterizer_rd/rasterizer_scene_forward_rd.h
View file

@ -262,7 +262,9 @@ class RasterizerSceneForwardRD : public RasterizerSceneRD {
uint32_t texture_slot;
float anisotropy_strength;
uint32_t pad[3];
float ao;
float ao_strength;
uint32_t pad[1];
};
enum {

1
servers/visual/rasterizer_rd/rasterizer_scene_rd.h
View file

@ -229,6 +229,7 @@ private:
bool gi_probe_use_anisotropy = false;
GIProbeQuality gi_probe_quality = GIPROBE_QUALITY_MEDIUM;
bool gi_probe_slots_dirty = true;
Vector<RID> gi_probe_slots;
enum {

26
servers/visual/rasterizer_rd/rasterizer_storage_rd.cpp
View file

@ -3771,6 +3771,32 @@ float RasterizerStorageRD::gi_probe_get_energy(RID p_gi_probe) const {
return gi_probe->energy;
}
void RasterizerStorageRD::gi_probe_set_ao(RID p_gi_probe, float p_ao) {
GIProbe *gi_probe = gi_probe_owner.getornull(p_gi_probe);
ERR_FAIL_COND(!gi_probe);
gi_probe->ao = p_ao;
}
float RasterizerStorageRD::gi_probe_get_ao(RID p_gi_probe) const {
GIProbe *gi_probe = gi_probe_owner.getornull(p_gi_probe);
ERR_FAIL_COND_V(!gi_probe, 0);
return gi_probe->ao;
}
void RasterizerStorageRD::gi_probe_set_ao_strength(RID p_gi_probe, float p_strength) {
GIProbe *gi_probe = gi_probe_owner.getornull(p_gi_probe);
ERR_FAIL_COND(!gi_probe);
gi_probe->ao_strength = p_strength;
}
float RasterizerStorageRD::gi_probe_get_ao_strength(RID p_gi_probe) const {
GIProbe *gi_probe = gi_probe_owner.getornull(p_gi_probe);
ERR_FAIL_COND_V(!gi_probe, 0);
return gi_probe->ao_strength;
}
void RasterizerStorageRD::gi_probe_set_bias(RID p_gi_probe, float p_bias) {
GIProbe *gi_probe = gi_probe_owner.getornull(p_gi_probe);
ERR_FAIL_COND(!gi_probe);

8
servers/visual/rasterizer_rd/rasterizer_storage_rd.h
View file

@ -423,6 +423,8 @@ private:
float dynamic_range = 4.0;
float energy = 1.0;
float ao = 0.0;
float ao_strength = 0.5;
float bias = 1.4;
float normal_bias = 0.0;
float propagation = 0.7;
@ -987,6 +989,12 @@ public:
void gi_probe_set_energy(RID p_gi_probe, float p_energy);
float gi_probe_get_energy(RID p_gi_probe) const;
void gi_probe_set_ao(RID p_gi_probe, float p_ao);
float gi_probe_get_ao(RID p_gi_probe) const;
void gi_probe_set_ao_strength(RID p_gi_probe, float p_strength);
float gi_probe_get_ao_strength(RID p_gi_probe) const;
void gi_probe_set_bias(RID p_gi_probe, float p_bias);
float gi_probe_get_bias(RID p_gi_probe) const;

66
servers/visual/rasterizer_rd/shaders/scene_forward.glsl
View file

@ -956,37 +956,7 @@ vec4 voxel_cone_trace(texture3D probe, vec3 cell_size, vec3 pos, vec3 direction,
return color;
}
#if 0
vec4 voxel_cone_trace_skiplod(texture3D probe, vec3 cell_size, vec3 pos, vec3 direction, float tan_half_angle, float max_distance, float p_bias) {
float dist = p_bias;
vec4 color = vec4(0.0);
float skip_lod = 1.0;
while (dist < max_distance && color.a < 0.95) {
float diameter = max(1.0, 2.0 * tan_half_angle * dist);
vec3 uvw_pos = (pos + dist * direction) * cell_size;
float half_diameter = diameter * 0.5;
//check if outside, then break
if ( any(greaterThan(abs(uvw_pos - 0.5),vec3(0.5f + half_diameter * cell_size)) ) ) {
break;
}
vec4 scolor = textureLod(sampler3D(probe,material_samplers[SAMPLER_LINEAR_WITH_MIPMAPS_CLAMP]), uvw_pos, log2(diameter));
float a = (1.0 - color.a);
color += a * scolor;
float upper_opacity = textureLod(sampler3D(probe,material_samplers[SAMPLER_LINEAR_WITH_MIPMAPS_CLAMP]), uvw_pos, skip_lod).a;
float skip_factor = exp2( max( 0.0f, skip_lod * 0.5f - 1.0f ) ) * (1.0f - upper_opacity) + upper_opacity;
skip_factor = mix( skip_factor, 1.0f, min( -1.0 + upper_opacity * probeParams.vctSpecularSdfFactor + tan_half_angle * 50.0f, 1.0f ) );
skip_lod = clamp( skip_lod + (1.0f - upper_opacity) * 2.0f - 1.0f, 1.0f, probeParams.vctSpecSdfMaxMip );
dist += half_diameter * skip_factor;
}
return color;
}
#endif
#ifndef GI_PROBE_HIGH_QUALITY
//faster version for 45 degrees
@ -1015,7 +985,8 @@ vec4 voxel_cone_trace_anisotropic_45_degrees(texture3D probe,texture3D aniso_pos
lod_level+=1.0;
float a = (1.0 - color.a);
color += a * scolor;
scolor *= a;
color += scolor;
dist += radius;
radius = max(0.5, tan_half_angle * dist);
@ -1026,7 +997,7 @@ vec4 voxel_cone_trace_anisotropic_45_degrees(texture3D probe,texture3D aniso_pos
}
#else
vec4 voxel_cone_trace_45_degrees(texture3D probe, vec3 cell_size, vec3 pos, vec3 direction, float tan_half_angle, float max_distance, float p_bias) {
vec4 voxel_cone_trace_45_degrees(texture3D probe, vec3 cell_size, vec3 pos, vec3 direction, float tan_half_angle, float max_distance, float p_bias ) {
float dist = p_bias;
vec4 color = vec4(0.0);
@ -1044,7 +1015,8 @@ vec4 voxel_cone_trace_45_degrees(texture3D probe, vec3 cell_size, vec3 pos, vec3
lod_level+=1.0;
float a = (1.0 - color.a);
color += a * scolor;
scolor *= a;
color += scolor;
dist += radius;
radius = max(0.5, tan_half_angle * dist);
@ -1060,7 +1032,7 @@ vec4 voxel_cone_trace_45_degrees(texture3D probe, vec3 cell_size, vec3 pos, vec3
//standard voxel cone trace
vec4 voxel_cone_trace_anisotropic(texture3D probe,texture3D aniso_pos,texture3D aniso_neg,vec3 normal, vec3 cell_size, vec3 pos, vec3 direction, float tan_half_angle, float max_distance, float p_bias) {
vec4 voxel_cone_trace_anisotropic(texture3D probe,texture3D aniso_pos,texture3D aniso_neg,vec3 normal, vec3 cell_size, vec3 pos, vec3 direction, float tan_half_angle, float max_distance, float p_bias ) {
float dist = p_bias;
vec4 color = vec4(0.0);
@ -1081,7 +1053,8 @@ vec4 voxel_cone_trace_anisotropic(texture3D probe,texture3D aniso_pos,texture3D
scolor.rgb*=dot(max(vec3(0.0),(normal * aniso_pos)),vec3(1.0)) + dot(max(vec3(0.0),(-normal * aniso_neg)),vec3(1.0));
float a = (1.0 - color.a);
color += a * scolor;
scolor *= a;
color += scolor;
dist += half_diameter;
}
@ -1155,8 +1128,8 @@ void gi_probe_compute(uint index, vec3 position, vec3 normal,vec3 ref_vec, mat3
#endif
vec3 light = vec3(0.0);
for (int i = 0; i < MAX_CONE_DIRS; i++) {
for (int i = 0; i < MAX_CONE_DIRS; i++) {
vec3 dir = normalize((gi_probes.data[index].xform * vec4(normal_xform * cone_dirs[i], 0.0)).xyz);
@ -1165,11 +1138,14 @@ void gi_probe_compute(uint index, vec3 position, vec3 normal,vec3 ref_vec, mat3
#ifdef GI_PROBE_USE_ANISOTROPY
vec4 cone_light = voxel_cone_trace_anisotropic(gi_probe_textures[gi_probes.data[index].texture_slot],gi_probe_textures[gi_probes.data[index].texture_slot+1],gi_probe_textures[gi_probes.data[index].texture_slot+2],normalize(mix(dir,normal,gi_probes.data[index].anisotropy_strength)),cell_size, position, dir, cone_angle_tan, max_distance, gi_probes.data[index].bias);
#else
vec4 cone_light = voxel_cone_trace(gi_probe_textures[gi_probes.data[index].texture_slot], cell_size, position, dir, cone_angle_tan, max_distance, gi_probes.data[index].bias);
#endif // GI_PROBE_USE_ANISOTROPY
#else
#ifdef GI_PROBE_USE_ANISOTROPY
vec4 cone_light = voxel_cone_trace_anisotropic_45_degrees(gi_probe_textures[gi_probes.data[index].texture_slot],gi_probe_textures[gi_probes.data[index].texture_slot+1],gi_probe_textures[gi_probes.data[index].texture_slot+2],normalize(mix(dir,normal,gi_probes.data[index].anisotropy_strength)),cell_size, position, dir, cone_angle_tan, max_distance, gi_probes.data[index].bias);
#else
@ -1180,11 +1156,24 @@ void gi_probe_compute(uint index, vec3 position, vec3 normal,vec3 ref_vec, mat3
if (gi_probes.data[index].blend_ambient) {
cone_light.rgb = mix(ambient, cone_light.rgb, min(1.0, cone_light.a / 0.95));
}
light+=cone_weights[i] * cone_light.rgb;
}
light *= gi_probes.data[index].dynamic_range;
if (gi_probes.data[index].ambient_occlusion > 0.01) {
float ao = 0.0;
for (int i=0;i<5;i++) {
vec3 ofs = (position + normal * float(1<<i) * 1.5) * cell_size;
ao += textureLod(sampler3D(gi_probe_textures[gi_probes.data[index].texture_slot],material_samplers[SAMPLER_LINEAR_WITH_MIPMAPS_CLAMP]),ofs,float(i) ).a;
light *= mix(max(0.0,1.0-(ao * gi_probes.data[index].ambient_occlusion )),1.0,gi_probes.data[index].ambient_occlusion_strength);
}
}
out_diff += vec4(light * blend, blend);
//irradiance
@ -1415,13 +1404,12 @@ FRAGMENT_SHADER_CODE
vec4 amb_accum = vec4(0.0);
vec4 spec_accum = vec4(0.0);
gi_probe_compute(index1, vertex, normal, ref_vec,normal_mat, roughness * roughness, ambient_light, specular_light, spec_accum, amb_accum );
gi_probe_compute(index1, vertex, normal, ref_vec,normal_mat, roughness * roughness, ambient_light, specular_light, spec_accum, amb_accum);
uint index2 = instances.data[instance_index].gi_offset>>16;
if (index2!=0xFFFF) {
gi_probe_compute(index2, vertex, normal, ref_vec,normal_mat, roughness * roughness, ambient_light, specular_light, spec_accum, amb_accum );
gi_probe_compute(index2, vertex, normal, ref_vec,normal_mat, roughness * roughness, ambient_light, specular_light, spec_accum, amb_accum);
}
if (amb_accum.a > 0.0) {

4
servers/visual/rasterizer_rd/shaders/scene_forward_inc.glsl
View file

@ -207,8 +207,8 @@ struct GIProbeData {
uint texture_slot;
float anisotropy_strength;
uint pad0;
uint pad1;
float ambient_occlusion;
float ambient_occlusion_strength;
uint pad2;
};

6
servers/visual/visual_server_raster.h
View file

@ -363,6 +363,12 @@ public:
BIND2(gi_probe_set_energy, RID, float)
BIND1RC(float, gi_probe_get_energy, RID)
BIND2(gi_probe_set_ao, RID, float)
BIND1RC(float, gi_probe_get_ao, RID)
BIND2(gi_probe_set_ao_strength, RID, float)
BIND1RC(float, gi_probe_get_ao_strength, RID)
BIND2(gi_probe_set_bias, RID, float)
BIND1RC(float, gi_probe_get_bias, RID)

6
servers/visual/visual_server_wrap_mt.h
View file

@ -287,6 +287,12 @@ public:
FUNC2(gi_probe_set_energy, RID, float)
FUNC1RC(float, gi_probe_get_energy, RID)
FUNC2(gi_probe_set_ao, RID, float)
FUNC1RC(float, gi_probe_get_ao, RID)
FUNC2(gi_probe_set_ao_strength, RID, float)
FUNC1RC(float, gi_probe_get_ao_strength, RID)
FUNC2(gi_probe_set_bias, RID, float)
FUNC1RC(float, gi_probe_get_bias, RID)

6
servers/visual_server.h
View file

@ -484,6 +484,12 @@ public:
virtual void gi_probe_set_energy(RID p_gi_probe, float p_energy) = 0;
virtual float gi_probe_get_energy(RID p_gi_probe) const = 0;
virtual void gi_probe_set_ao(RID p_gi_probe, float p_ao) = 0;
virtual float gi_probe_get_ao(RID p_gi_probe) const = 0;
virtual void gi_probe_set_ao_strength(RID p_gi_probe, float p_strength) = 0;
virtual float gi_probe_get_ao_strength(RID p_gi_probe) const = 0;
virtual void gi_probe_set_bias(RID p_gi_probe, float p_bias) = 0;
virtual float gi_probe_get_bias(RID p_gi_probe) const = 0;