diff options
Diffstat (limited to 'src/renderer.cpp')
| -rw-r--r-- | src/renderer.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/renderer.cpp b/src/renderer.cpp index 73b31f7..cf97af8 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -10,6 +10,7 @@ using namespace engine; using engine::math::Vector2, + engine::math::Vector3, engine::math::Vector4, engine::o3d::Triangle, engine::o3d::TriangleDerived, @@ -19,8 +20,7 @@ using engine::fb::PixelFrameBuffer; template<typename FrameBuffer> -template<typename FBArg> -Renderer<FrameBuffer>::Renderer(FBArg&& fb) : fb{std::forward<FBArg>(fb)} { +Renderer<FrameBuffer>::Renderer(FrameBuffer&& fb) : fb { std::forward<FrameBuffer>(fb) } { depth_buf.resize(this->fb.width() * this->fb.height()); } @@ -145,8 +145,9 @@ void Renderer<FrameBuffer>::_draw_cropped_triangle(const Triangle& root, const T loc_z }; fb.draw_point(x, y, loc, - VertexData::bilerp(root.vertex1.data, root.vertex2.data, root.vertex3.data, b0, b1), - Vector3::bilerp(root.vertex1.normal, root.vertex2.normal, root.vertex3.normal, b0, b1).normalize()); + Vector3 ::bilerp(root.vertex1.normal, root.vertex2.normal, root.vertex3.normal, b0, b1), + Vector2 ::bilerp(root.vertex1.uv, root.vertex2.uv, root.vertex3.uv, b0, b1), + VertexData::bilerp(root.vertex1.data, root.vertex2.data, root.vertex3.data, b0, b1)); } } }; @@ -155,8 +156,4 @@ void Renderer<FrameBuffer>::_draw_cropped_triangle(const Triangle& root, const T } template class Renderer<CharacterFrameBuffer>; -template Renderer<CharacterFrameBuffer>::Renderer(CharacterFrameBuffer&&); -template Renderer<CharacterFrameBuffer>::Renderer(const CharacterFrameBuffer&); template class Renderer<PixelFrameBuffer>; -template Renderer<PixelFrameBuffer>::Renderer(PixelFrameBuffer&&); -template Renderer<PixelFrameBuffer>::Renderer(const PixelFrameBuffer&); |