Das Problem mit der Erreichbarkeit der HS-Koblenz ist behoben. Es können sich wieder alle anmelden.

Commit 645227ce authored by unknown's avatar unknown
Browse files

Added c-t-btdf and emissive material part.

parent 1b132604
......@@ -118,12 +118,9 @@ bool shade(int id, inout vec3 radiance, uint bounce, out uint bsdf_id)
return false;
}
if(bsdf_result.generated_ray.direction == vec3(0))
if(bsdf_result.bsdf_id == eEmit)
{
// Treat as emissive material.
//writeColorStore(ray, radiance * bsdf_result.irradiance, clamp_color_max);
//if(!isnan(normali))
writeColorStore(ray, bsdf_result.radiance, clamp_color_max);
writeColorStore(ray, radiance * bsdf_result.radiance, clamp_color_max);
b_traces[id].hit.invalidate();
return false;
}
......
......@@ -80,8 +80,8 @@ float ggxDistribution(float cosT, float roughness)
// Half of the full ggx geometry attenuation term
float ggxPartialGeometry(const in vec3 vector, const in vec3 normal, const in vec3 half_view, float roughness)
{
float eye_dot_half2 = clamp(dot(vector, half_view), 0, 1);
float chi = ggxChi(eye_dot_half2 / clamp(dot(vector, normal), 0, 1));
float eye_dot_half2 = clamp(dot(vector, half_view), -1, 1);
float chi = ggxChi(eye_dot_half2 / clamp(dot(vector, normal), -1, 1));
eye_dot_half2 = eye_dot_half2 * eye_dot_half2;
float tan2 = (1 - eye_dot_half2) / eye_dot_half2;
......
......@@ -111,7 +111,8 @@ namespace glare
//Create a skybox from cube map.
m_skybox = std::make_shared<core::Skybox>(core::Skybox::collectFilesFrom(files::asset("/textures/ryfjallet/")));
initializeScene(m_current_scene_root / "cbox.dae", 1.f);
//initializeScene(m_current_scene_root / "cbox.dae", 1.f);
initializeScene(m_current_scene_root / "dragn.dae", 1.f);
//initializeScene(m_current_scene_root / "benchmark_stfd_bunny_diff.dae", 1.f);
//initializeScene(m_current_scene_root / "banni.dae", 1.f);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment