diff options
Diffstat (limited to 'examples/TinyRenderer/TinyRenderer.cpp')
| -rw-r--r-- | examples/TinyRenderer/TinyRenderer.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/examples/TinyRenderer/TinyRenderer.cpp b/examples/TinyRenderer/TinyRenderer.cpp index 06984b6e8..eecc42577 100644 --- a/examples/TinyRenderer/TinyRenderer.cpp +++ b/examples/TinyRenderer/TinyRenderer.cpp @@ -1,20 +1,21 @@ #include "TinyRenderer.h" -#include <vector> -#include <limits> +#include <cmath> #include <iostream> -#include "tgaimage.h" -#include "model.h" -#include "geometry.h" -#include "our_gl.h" +#include <limits> +#include <vector> +#include "../CommonInterfaces/CommonFileIOInterface.h" +#include "../OpenGLWindow/ShapeData.h" +#include "../Utils/b3BulletDefaultFileIO.h" #include "../Utils/b3ResourcePath.h" +#include "Bullet3Common/b3Logging.h" #include "Bullet3Common/b3MinMax.h" -#include "../OpenGLWindow/ShapeData.h" #include "LinearMath/btAlignedObjectArray.h" #include "LinearMath/btVector3.h" -#include "Bullet3Common/b3Logging.h" -#include "../CommonInterfaces/CommonFileIOInterface.h" -#include "../Utils/b3BulletDefaultFileIO.h" +#include "geometry.h" +#include "model.h" +#include "our_gl.h" +#include "tgaimage.h" struct DepthShader : public IShader { @@ -161,10 +162,11 @@ struct Shader : public IShader Vec2f uv = varying_uv * bar; Vec3f reflection_direction = (bn * (bn * m_light_dir_local * 2.f) - m_light_dir_local).normalize(); - float specular = pow(b3Max(reflection_direction.z, 0.f), m_model->specular(uv)); - float diffuse = b3Max(0.f, bn * m_light_dir_local); + float specular = std::pow(b3Max(reflection_direction.z, 0.f), + m_model->specular(uv)); + float diffuse = b3Max(0.f, bn * m_light_dir_local); - color = m_model->diffuse(uv); + color = m_model->diffuse(uv); color[0] *= m_colorRGBA[0]; color[1] *= m_colorRGBA[1]; color[2] *= m_colorRGBA[2]; |