WallyHackenslacker/PhotonMF
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added direct diffuse lighting.

Browse Source
This commit is contained in:
Wally Hackenslacker
2016-12-26 19:14:21 -04:00
parent 9ad63d489a
commit d48e8e0ba3
11 changed files with 566 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sphere.cpp
View File

@@ -4,8 +4,7 @@
using glm::normalize;
bool Sphere::intersect(Ray & r, float & t, vec3 & n) const {
vec3 i;
bool Sphere::intersect(Ray & r, float & t) const {
float d;
float a = (r.m_direction.x * r.m_direction.x) +
@@ -28,10 +27,13 @@ bool Sphere::intersect(Ray & r, float & t, vec3 & n) const {
if (d >= 0.0f) {
t = (-b - sqrt(d)) / (2 * a);
i = vec3(r.m_origin + (t * r.m_direction));
n = normalize(vec3((i - m_center) / m_radius));
return t >= 0.0f;
} else
return false;
}
vec3 Sphere::normal_at_int(Ray & r, float & t) const {
vec3 i = vec3(r.m_origin + (t * r.m_direction));
return normalize(vec3((i - m_center) / m_radius));
}