Make radiance values to be in sRGB colorspace by default

This is an unfortunate consequence of QColor having no notion of colorspace and its usage patterns being strongly biased towards sRGB. All color values are transformed back to linear space for rendering.
Nadrin · Mar 5, 2019 · 178ce20 · 178ce20
1 parent 0cadc23
commit 178ce20
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/raytrace/CMakeLists.txt b/src/raytrace/CMakeLists.txt
@@ -16,6 +16,7 @@ set(SOURCES_PRIVATE
     qt3draytrace_global_p.h
     qraytraceaspect.cpp
     qraytraceaspect_p.h
+    qt3draytracecontext.cpp
     frontend/qgeometryrenderer.cpp
     frontend/qgeometryrenderer_p.h
     frontend/qgeometry.cpp
@@ -83,11 +84,13 @@ set(SOURCES_PRIVATE
 
 set(SOURCES_PUBLIC
     ${MODULE_API}/qt3draytrace_global.h
+    ${MODULE_API}/qt3draytracecontext.h
     ${MODULE_API}/qraytraceaspect.h
     ${MODULE_API}/qgeometryrenderer.h
     ${MODULE_API}/qgeometry.h
     ${MODULE_API}/qgeometrydata.h
     ${MODULE_API}/qgeometryfactory.h
+    ${MODULE_API}/qcolorspace.h
     ${MODULE_API}/qmesh.h
     ${MODULE_API}/qmaterial.h
     ${MODULE_API}/qdistantlight.h

diff --git a/src/raytrace/backend/distantlight_p.h b/src/raytrace/backend/distantlight_p.h
@@ -27,7 +27,7 @@ class DistantLight : public BackendNode
 
     LinearColor radiance() const
     {
-        return LinearColor(m_color, m_intensity);
+        return LinearColor::from_sRgb(m_color, m_intensity);
     }
     QVector3D direction() const
     {

diff --git a/src/raytrace/backend/rendersettings_p.h b/src/raytrace/backend/rendersettings_p.h
@@ -32,7 +32,7 @@ class RenderSettings : public BackendNode
 
     LinearColor skyRadiance() const
     {
-        return LinearColor(m_skyColor, m_skyIntensity);
+        return LinearColor::from_sRgb(m_skyColor, m_skyIntensity);
     }
 
     float skyIntensity() const { return m_skyIntensity; }