Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid crashes in TinyRenderer

Browse Source
This commit is contained in:
Erwin Coumans
2019-10-09 22:26:20 -04:00
parent 3a4159c793
commit 31e778c913
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
examples/TinyRenderer/TinyRenderer.cpp
View File

@@ -156,8 +156,11 @@ struct Shader : public IShader
float index_x = b3Max(float(0.0), b3Min(float(m_width - 1), p[0])); float index_x = b3Max(float(0.0), b3Min(float(m_width - 1), p[0]));
float index_y = b3Max(float(0.0), b3Min(float(m_height - 1), p[1])); float index_y = b3Max(float(0.0), b3Min(float(m_height - 1), p[1]));
int idx = int(index_x) + int(index_y) * m_width; // index in the shadowbuffer array int idx = int(index_x) + int(index_y) * m_width; // index in the shadowbuffer array
float shadow = 0.8 + 0.2 * (m_shadowBuffer->at(idx) < -depth + 0.05); // magic coeff to avoid z-fighting float shadow = 1.0;
if (m_shadowBuffer && idx >=0 && idx <m_shadowBuffer->size())
{
shadow = 0.8 + 0.2 * (m_shadowBuffer->at(idx) < -depth + 0.05); // magic coeff to avoid z-fighting
}
Vec3f bn = (varying_nrm * bar).normalize(); Vec3f bn = (varying_nrm * bar).normalize();
Vec2f uv = varying_uv * bar; Vec2f uv = varying_uv * bar;
@@ -174,7 +177,13 @@ struct Shader : public IShader
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
{ {
color[i] = b3Min(int(m_ambient_coefficient * color[i] + shadow * (m_diffuse_coefficient * diffuse + m_specular_coefficient * specular) * color[i] * m_light_color[i]), 255); int orgColor = 0;
float floatColor = (m_ambient_coefficient * color[i] + shadow * (m_diffuse_coefficient * diffuse + m_specular_coefficient * specular) * color[i] * m_light_color[i]);
if (floatColor==floatColor)
{
orgColor=int(floatColor);
}
color[i] = b3Min(orgColor, 255);
} }
return false; return false;