From 388cba152e898f66bcb9eeda7b2ea0666bf0cf63 Mon Sep 17 00:00:00 2001 From: yunfeibai Date: Wed, 7 Dec 2016 11:41:55 -0800 Subject: [PATCH] Fix error in integration test. --- examples/TinyRenderer/TinyRenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/TinyRenderer/TinyRenderer.cpp b/examples/TinyRenderer/TinyRenderer.cpp index 4284d484d..e3e4fe939 100644 --- a/examples/TinyRenderer/TinyRenderer.cpp +++ b/examples/TinyRenderer/TinyRenderer.cpp @@ -148,7 +148,7 @@ struct Shader : public IShader { for (int i = 0; i < 3; ++i) { - color[i] = std::min(m_ambient_coefficient*color[i] + shadow*(m_diffuse_coefficient*diffuse+m_specular_coefficient*specular)*color[i]*m_light_color[i], 255); + 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); } return false;