Merge pull request #6 from guaje/sh_odf_exp

Ray traced with uniforms
fury-gl · Jun 13, 2024 · c491e75 · c491e75
2 parents 44e35a7 + 668a7c3
commit c491e75
Show file tree

Hide file tree

Showing 78 changed files with 8,282 additions and 119 deletions.
diff --git a/.gitignore b/.gitignore
@@ -60,6 +60,7 @@ docs/source/api
 docs/source/auto_examples
 docs/source/auto_tutorials
 docs/source/reference
+docs/source/sg_execution_times.rst
 docs/examples/*.png
 docs/examples/*.vtk
 docs/examples/*.gif

diff --git a/...xperimental/SH-ODF experimental/README.md → ...xperimental/SH-ODF_experimental/README.md b/...xperimental/SH-ODF experimental/README.md → ...xperimental/SH-ODF_experimental/README.md
diff --git a/...ental/SH-ODF experimental/colormapping.py → ...ental/SH-ODF_experimental/colormapping.py b/...ental/SH-ODF experimental/colormapping.py → ...ental/SH-ODF_experimental/colormapping.py
diff --git a/.../SH-ODF experimental/direction_scaling.py → .../SH-ODF_experimental/direction_scaling.py b/.../SH-ODF experimental/direction_scaling.py → .../SH-ODF_experimental/direction_scaling.py
diff --git a/...xperimental/SH-ODF experimental/eff_sh.py → ...xperimental/SH-ODF_experimental/eff_sh.py b/...xperimental/SH-ODF experimental/eff_sh.py → ...xperimental/SH-ODF_experimental/eff_sh.py
diff --git a/...tal/SH-ODF experimental/ray_traced_1.0.py → ...tal/SH-ODF_experimental/ray_traced_1.0.py b/...tal/SH-ODF experimental/ray_traced_1.0.py → ...tal/SH-ODF_experimental/ray_traced_1.0.py
@@ -97,40 +97,52 @@
     in float scaleVSOutput;
     """
 
-    eval_sh_2 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_2.frag"))
+    eval_sh_2 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_2.frag")
+    )
 
-    eval_sh_4 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_4.frag"))
+    eval_sh_4 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_4.frag")
+    )
 
-    eval_sh_6 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_6.frag"))
+    eval_sh_6 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_6.frag")
+    )
 
-    eval_sh_8 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_8.frag"))
+    eval_sh_8 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_8.frag")
+    )
 
-    eval_sh_10 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_10.frag"))
+    eval_sh_10 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_10.frag")
+    )
 
-    eval_sh_12 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_12.frag"))
+    eval_sh_12 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_12.frag")
+    )
 
     eval_sh_grad_2 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_2.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_2.frag")
     )
 
     eval_sh_grad_4 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_4.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_4.frag")
     )
 
     eval_sh_grad_6 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_6.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_6.frag")
     )
 
     eval_sh_grad_8 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_8.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_8.frag")
     )
 
     eval_sh_grad_10 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_10.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_10.frag")
     )
 
     eval_sh_grad_12 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_12.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_12.frag")
     )
 
     # Searches a single root of a polynomial within a given interval.

diff --git a/...tal/SH-ODF experimental/ray_traced_2.0.py → ...tal/SH-ODF_experimental/ray_traced_2.0.py b/...tal/SH-ODF experimental/ray_traced_2.0.py → ...tal/SH-ODF_experimental/ray_traced_2.0.py
@@ -191,40 +191,52 @@ def uv_calculations(n):
     }
     """
 
-    eval_sh_2 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_2.frag"))
+    eval_sh_2 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_2.frag")
+    )
 
-    eval_sh_4 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_4.frag"))
+    eval_sh_4 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_4.frag")
+    )
 
-    eval_sh_6 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_6.frag"))
+    eval_sh_6 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_6.frag")
+    )
 
-    eval_sh_8 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_8.frag"))
+    eval_sh_8 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_8.frag")
+    )
 
-    eval_sh_10 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_10.frag"))
+    eval_sh_10 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_10.frag")
+    )
 
-    eval_sh_12 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_12.frag"))
+    eval_sh_12 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_12.frag")
+    )
 
     eval_sh_grad_2 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_2.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_2.frag")
     )
 
     eval_sh_grad_4 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_4.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_4.frag")
     )
 
     eval_sh_grad_6 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_6.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_6.frag")
     )
 
     eval_sh_grad_8 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_8.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_8.frag")
     )
 
     eval_sh_grad_10 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_10.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_10.frag")
     )
 
     eval_sh_grad_12 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_12.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_12.frag")
     )
 
     # Searches a single root of a polynomial within a given interval.

diff --git a/...tal/SH-ODF experimental/ray_traced_3.0.py → ...tal/SH-ODF_experimental/ray_traced_3.0.py b/...tal/SH-ODF experimental/ray_traced_3.0.py → ...tal/SH-ODF_experimental/ray_traced_3.0.py
@@ -98,40 +98,52 @@
     in float scaleVSOutput;
     """
 
-    eval_sh_2 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_2.frag"))
+    eval_sh_2 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_2.frag")
+    )
 
-    eval_sh_4 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_4.frag"))
+    eval_sh_4 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_4.frag")
+    )
 
-    eval_sh_6 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_6.frag"))
+    eval_sh_6 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_6.frag")
+    )
 
-    eval_sh_8 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_8.frag"))
+    eval_sh_8 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_8.frag")
+    )
 
-    eval_sh_10 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_10.frag"))
+    eval_sh_10 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_10.frag")
+    )
 
-    eval_sh_12 = import_fury_shader(os.path.join("rt_odfs", "eval_sh_12.frag"))
+    eval_sh_12 = import_fury_shader(
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_12.frag")
+    )
 
     eval_sh_grad_2 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_2.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_2.frag")
     )
 
     eval_sh_grad_4 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_4.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_4.frag")
     )
 
     eval_sh_grad_6 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_6.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_6.frag")
     )
 
     eval_sh_grad_8 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_8.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_8.frag")
     )
 
     eval_sh_grad_10 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_10.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_10.frag")
     )
 
     eval_sh_grad_12 = import_fury_shader(
-        os.path.join("rt_odfs", "eval_sh_grad_12.frag")
+        os.path.join("rt_odfs", "descoteaux", "eval_sh_grad_12.frag")
     )
 
     # Searches a single root of a polynomial within a given interval.