Disable bidirectional brilliance for now, due to it probably becoming obsolete soon anyway.

Author: c-lipka

changes.txt

@@ -72,9 +72,6 @@ Materials:
   - Colour and pigment maps now support non-linear interpolation to achieve more
     pleasing gradients.
 
-  - The `brilliance` effect can now be applied not only to incoming light, but
-    also to outgoing light, making the effect phyiscally more realistic.
-
   - Fresnel angle-dependent attenuation can now also be applied to highlights
     and the diffuse component for more physical realism.
 

source/core/material/texture.cpp

@@ -1158,7 +1158,9 @@ FINISH *Create_Finish()
     New->Diffuse                = 0.6;
     New->DiffuseBack            = 0.0;
     New->Brilliance             = 1.0;
+#if POV_PARSER_EXPERIMENTAL_BRILLIANCE_OUT
     New->BrillianceOut          = 1.0;
+#endif
     New->BrillianceAdjust       = 1.0;
     New->BrillianceAdjustRad    = 1.0;
     New->Phong                  = 0.0;

source/core/material/texture.h

@@ -124,7 +124,11 @@ struct Texture_Struct : public Pattern_Struct
 
 struct Finish_Struct
 {
-    SNGL Diffuse, DiffuseBack, Brilliance, BrillianceOut, BrillianceAdjust, BrillianceAdjustRad;
+    SNGL Diffuse, DiffuseBack, Brilliance;
+#if POV_PARSER_EXPERIMENTAL_BRILLIANCE_OUT
+    SNGL BrillianceOut;
+#endif
+    SNGL BrillianceAdjust, BrillianceAdjustRad;
     SNGL Specular, Roughness;
     SNGL Phong, Phong_Size;
     SNGL Irid, Irid_Film_Thickness, Irid_Turb;

source/core/render/trace.cpp

@@ -936,8 +936,10 @@ void Trace::ComputeLightedTexture(MathColour& resultColour, ColourChannel& resul
                     radiosityContribution += (layCol.colour() * ambBackCol) * (att * diffuse);
                 }
 
+#if POV_PARSER_EXPERIMENTAL_BRILLIANCE_OUT
                 if((sceneData->radiositySettings.brilliance) && (layer->Finish->BrillianceOut != 1.0))
                     radiosityContribution *= pow(fabs(cos_Angle_Incidence), layer->Finish->BrillianceOut-1.0) * (layer->Finish->BrillianceOut+7.0)/8.0;
+#endif
 
                 if(layer->Finish->Fresnel)
                 {
@@ -976,11 +978,13 @@ void Trace::ComputeLightedTexture(MathColour& resultColour, ColourChannel& resul
 
                     ComputeDiffuseLight(layer->Finish, isect.IPoint, ray, layNormal, layCol.colour(), classicContribution, att, isect.Object, relativeIor);
 
+#if POV_PARSER_EXPERIMENTAL_BRILLIANCE_OUT
                     if(layer->Finish->BrillianceOut != 1.0)
                     {
                         double cos_angle_of_incidence = dot(ray.Direction, layNormal);
                         classicContribution *= pow(fabs(cos_angle_of_incidence), layer->Finish->BrillianceOut-1.0)* (layer->Finish->BrillianceOut+7.0)/8.0;
                     }
+#endif
 
                     tmpCol += classicContribution;
                 }
@@ -995,11 +999,13 @@ void Trace::ComputeLightedTexture(MathColour& resultColour, ColourChannel& resul
 
                     ComputePhotonDiffuseLight(layer->Finish, isect.IPoint, ray, layNormal, rawnormal, layCol.colour(), photonsContribution, att, isect.Object, relativeIor, *surfacePhotonGatherer);
 
+#if POV_PARSER_EXPERIMENTAL_BRILLIANCE_OUT
                     if(layer->Finish->BrillianceOut != 1.0)
                     {
                         double cos_angle_of_incidence = dot(ray.Direction, layNormal);
                         photonsContribution *= pow(fabs(cos_angle_of_incidence), layer->Finish->BrillianceOut-1.0) * (layer->Finish->BrillianceOut+7.0)/8.0;
                     }
+#endif
 
                     tmpCol += photonsContribution;
                 }

source/parser/configparser.h

@@ -49,11 +49,11 @@
 ///
 /// @{
 
-/// @def POV_PARSER_MAX_CACHED_MACRO_SIZE
-/// Default size limit for macros to be cached in memory.
+/// @def POV_PARSER_EXPERIMENTAL_BRILLIANCE_OUT
+/// Whether experimental second brilliance parameter should be enabled.
 ///
-#ifndef POV_PARSER_MAX_CACHED_MACRO_SIZE
-    #define POV_PARSER_MAX_CACHED_MACRO_SIZE 65536
+#ifndef POV_PARSER_EXPERIMENTAL_BRILLIANCE_OUT
+    #define POV_PARSER_EXPERIMENTAL_BRILLIANCE_OUT 0
 #endif
 
 /// @def POV_PARSER_EXPERIMENTAL_OBJ_IMPORT
@@ -63,6 +63,13 @@
     #define POV_PARSER_EXPERIMENTAL_OBJ_IMPORT 0
 #endif
 
+/// @def POV_PARSER_MAX_CACHED_MACRO_SIZE
+/// Default size limit for macros to be cached in memory.
+///
+#ifndef POV_PARSER_MAX_CACHED_MACRO_SIZE
+    #define POV_PARSER_MAX_CACHED_MACRO_SIZE 65536
+#endif
+
 //******************************************************************************
 ///
 /// @name Debug Settings.

source/parser/parser_materials.cpp

@@ -2280,8 +2280,10 @@ void Parser::Parse_Finish (FINISH **Finish_Ptr)
 
         CASE (BRILLIANCE_TOKEN)
             New->Brilliance = Parse_Float ();
+#if POV_PARSER_EXPERIMENTAL_BRILLIANCE_OUT
             Parse_Comma();
             New->BrillianceOut = Allow_Float(1.0);
+#endif
         END_CASE
 
         CASE (DIFFUSE_TOKEN)