From 57c2f9241543a7d18eab98077530730d49ee10c2 Mon Sep 17 00:00:00 2001 From: Julian T Date: Thu, 14 Jan 2021 00:56:57 +0100 Subject: Replace color with pbr-book inspired Spectrum class --- app/rendercoord.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'app/rendercoord.cpp') diff --git a/app/rendercoord.cpp b/app/rendercoord.cpp index 00a6437..4abc5d0 100644 --- a/app/rendercoord.cpp +++ b/app/rendercoord.cpp @@ -8,13 +8,13 @@ #include #include -uint32_t colorToUint32(const Color &c) { - Color cnew = Color(c); - cnew.clamp(); +uint32_t colorToUint32(const Spectrum &c) { + Spectrum cnew = c.clamp(0, 1); + cnew *= 255; return (0xFF << 24) + - (cnew.r() << 16) + - (cnew.g() << 8) + - cnew.b(); + ((int)cnew.R() << 16) + + ((int)cnew.G() << 8) + + cnew.B(); } // Run by main thread @@ -36,7 +36,7 @@ void RenderThread::run() { m_work.acquire(); // Very expensive, but necesary to get live rendering - Color *sum = new Color[m_render.m_width * m_render.m_height]; + Spectrum *sum = new Spectrum[m_render.m_width * m_render.m_height]; m_current_samples = 0; -- cgit v1.2.3