Appleseed: control caustics via project param

FreeCAD · May 26, 2024 · 81ddd92 · 81ddd92
1 parent ed0a8c4
commit 81ddd92
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 15 deletions.
diff --git a/Render/project.py b/Render/project.py
@@ -233,6 +233,17 @@ class Project(FeatureBase):
             ),
             False,
         ),
+        "AppleseedUseCaustics": Prop(
+            "App::PropertyBool",
+            chr(127) + "Specifics",
+            QT_TRANSLATE_NOOP(
+                "App::Property",
+                "Activate caustics in Appleseed (usefull for interior scenes "
+                "ligthened by external light sources through glass)\n"
+                "SPECIFIC TO APPLESEED",
+            ),
+            False,
+        ),
     }
 
     ON_CHANGED = {

diff --git a/Render/renderers/Appleseed.py b/Render/renderers/Appleseed.py
@@ -1461,6 +1461,16 @@ def enclose_rpath(rpath):
     if denoise:
         set_denoiser(root)
 
+    # Use caustics if required
+    caustics = (
+        "true" if getattr(project, "AppleseedUseCaustics", False) else "false"
+    )
+    root = set_config_param(
+        root, "interactive", "pt", "enable_caustics", caustics
+    )
+    root = set_config_param(root, "final", "pt", "enable_caustics", caustics)
+    root = set_config_param(root, "final", "sppm", "enable_caustics", caustics)
+
     # Template update
     template = et.tostring(root, encoding="unicode", xml_declaration=True)
 

diff --git a/templates/appleseed_flat.appleseed b/templates/appleseed_flat.appleseed
@@ -34,7 +34,6 @@
             </parameters>
             <parameters name="pt">
                 <parameter name="dl_light_samples" value="1.000000" />
-                <parameter name="enable_caustics" value="false" />
                 <parameter name="enable_dl" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="ibl_env_samples" value="1.000000" />
@@ -45,7 +44,6 @@
             <parameters name="sppm">
                 <parameter name="alpha" value="0.700000" />
                 <parameter name="dl_mode" value="rt" />
-                <parameter name="enable_caustics" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="env_photons_per_pass" value="1000000" />
                 <parameter name="initial_radius" value="0.100000" />
@@ -68,7 +66,6 @@
             <parameter name="sampling_mode" value="qmc" />
             <parameters name="pt">
                 <parameter name="dl_light_samples" value="1.000000" />
-                <parameter name="enable_caustics" value="false" />
                 <parameter name="enable_dl" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="ibl_env_samples" value="1.000000" />

diff --git a/templates/appleseed_standard.appleseed b/templates/appleseed_standard.appleseed
@@ -55,7 +55,6 @@
             </parameters>
             <parameters name="pt">
                 <parameter name="dl_light_samples" value="1.000000" />
-                <parameter name="enable_caustics" value="false" />
                 <parameter name="enable_dl" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="ibl_env_samples" value="1.000000" />
@@ -66,7 +65,6 @@
             <parameters name="sppm">
                 <parameter name="alpha" value="0.700000" />
                 <parameter name="dl_mode" value="rt" />
-                <parameter name="enable_caustics" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="env_photons_per_pass" value="1000000" />
                 <parameter name="initial_radius" value="0.100000" />
@@ -89,7 +87,6 @@
             <parameter name="sampling_mode" value="qmc" />
             <parameters name="pt">
                 <parameter name="dl_light_samples" value="1.000000" />
-                <parameter name="enable_caustics" value="false" />
                 <parameter name="enable_dl" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="ibl_env_samples" value="1.000000" />

diff --git a/templates/appleseed_studio_dark.appleseed b/templates/appleseed_studio_dark.appleseed
@@ -88,7 +88,6 @@
             </parameters>
             <parameters name="pt">
                 <parameter name="dl_light_samples" value="1.000000" />
-                <parameter name="enable_caustics" value="false" />
                 <parameter name="enable_dl" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="ibl_env_samples" value="1.000000" />
@@ -99,7 +98,6 @@
             <parameters name="sppm">
                 <parameter name="alpha" value="0.700000" />
                 <parameter name="dl_mode" value="rt" />
-                <parameter name="enable_caustics" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="env_photons_per_pass" value="1000000" />
                 <parameter name="initial_radius" value="0.100000" />
@@ -122,7 +120,6 @@
             <parameter name="sampling_mode" value="qmc" />
             <parameters name="pt">
                 <parameter name="dl_light_samples" value="1.000000" />
-                <parameter name="enable_caustics" value="false" />
                 <parameter name="enable_dl" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="ibl_env_samples" value="1.000000" />

diff --git a/templates/appleseed_studio_light.appleseed b/templates/appleseed_studio_light.appleseed
@@ -86,7 +86,6 @@
             </parameters>
             <parameters name="pt">
                 <parameter name="dl_light_samples" value="1.000000" />
-                <parameter name="enable_caustics" value="false" />
                 <parameter name="enable_dl" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="ibl_env_samples" value="1.000000" />
@@ -97,7 +96,6 @@
             <parameters name="sppm">
                 <parameter name="alpha" value="0.700000" />
                 <parameter name="dl_mode" value="rt" />
-                <parameter name="enable_caustics" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="env_photons_per_pass" value="1000000" />
                 <parameter name="initial_radius" value="0.100000" />
@@ -120,7 +118,6 @@
             <parameter name="sampling_mode" value="qmc" />
             <parameters name="pt">
                 <parameter name="dl_light_samples" value="1.000000" />
-                <parameter name="enable_caustics" value="false" />
                 <parameter name="enable_dl" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="ibl_env_samples" value="1.000000" />

diff --git a/templates/appleseed_sunlight.appleseed b/templates/appleseed_sunlight.appleseed
@@ -50,7 +50,6 @@
             </parameters>
             <parameters name="pt">
                 <parameter name="dl_light_samples" value="1.000000" />
-                <parameter name="enable_caustics" value="false" />
                 <parameter name="enable_dl" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="ibl_env_samples" value="1.000000" />
@@ -61,7 +60,6 @@
             <parameters name="sppm">
                 <parameter name="alpha" value="0.700000" />
                 <parameter name="dl_mode" value="rt" />
-                <parameter name="enable_caustics" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="env_photons_per_pass" value="1000000" />
                 <parameter name="initial_radius" value="0.100000" />
@@ -84,7 +82,6 @@
             <parameter name="sampling_mode" value="qmc" />
             <parameters name="pt">
                 <parameter name="dl_light_samples" value="1.000000" />
-                <parameter name="enable_caustics" value="false" />
                 <parameter name="enable_dl" value="true" />
                 <parameter name="enable_ibl" value="true" />
                 <parameter name="ibl_env_samples" value="1.000000" />