Merge branch 'develop'

harshkaso · Dec 25, 2024 · d112bcf · d112bcf
2 parents 1ebd22e + f1af231
commit d112bcf
Show file tree

Hide file tree

Showing 34 changed files with 728 additions and 338 deletions.
diff --git a/README.md b/README.md
@@ -1,21 +1,20 @@
 <h1 align='center'>Flux</h1>
 A beautiful dynamic flowfield visualization with particle simulation. It demonstrates the movement of particles within a vector field, offering an engaging visualization of the underlying noisemaps.
 <p align='center'>
-    <img src='assets\flux4-gif.gif'>
+    <img src='assets\screenshots\Flux_FranksLabText_light.png'>
 </p>
 <p align='center'>
-    <img src='assets\flux1.png'>
+    <img src='assets\screenshots\SeaAnemone_FNS.png'>
 </p>
 <p align='center'>
-    <img src='assets\flux2.png'>
+    <img src='assets\screenshots\Greens_Swirly.png'>
 </p>
 <p align='center'>
-    <img src='assets\flux3.png'>
-</p>
-<p align='center'>
-    <img src='assets\flux5.png'>
+    <img src='assets\screenshots\Bubbles_Quattro.png'>
 </p>
 
+#### For additional screenshots, visit the full folder: [Screenshots Folder](assets/screenshots)
+
 ## System Support
 |     OS    | Supported |
 |   :---:   |   :---:   |

diff --git a/assets/flux1.png b/assets/flux1.png
diff --git a/assets/flux2.png b/assets/flux2.png
diff --git a/assets/flux3.png b/assets/flux3.png
diff --git a/assets/flux4-gif.gif b/assets/flux4-gif.gif
diff --git a/assets/flux4.png b/assets/flux4.png
diff --git a/assets/flux5.png b/assets/flux5.png
diff --git a/assets/fonts/Inter-BlackItalic.otf b/assets/fonts/Inter-BlackItalic.otf
diff --git a/assets/fonts/impact.ttf b/assets/fonts/impact.ttf
diff --git a/assets/screenshots/Blues_Swirly.png b/assets/screenshots/Blues_Swirly.png
diff --git a/assets/screenshots/Bubbles_FNS.png b/assets/screenshots/Bubbles_FNS.png
diff --git a/assets/screenshots/Bubbles_Quattro.png b/assets/screenshots/Bubbles_Quattro.png
diff --git a/assets/screenshots/Flux_FranksLabText.png b/assets/screenshots/Flux_FranksLabText.png
diff --git a/assets/screenshots/Flux_FranksLabText_Light.png b/assets/screenshots/Flux_FranksLabText_Light.png
diff --git a/assets/screenshots/Greens_Swirly.png b/assets/screenshots/Greens_Swirly.png
diff --git a/assets/screenshots/SeaAnemone_FNS.png b/assets/screenshots/SeaAnemone_FNS.png
diff --git a/color_functions.py b/color_functions.py
diff --git a/flux.py b/flux.py
diff --git a/flux/__init__.py b/flux/__init__.py
diff --git a/flux/__main__.py b/flux/__main__.py
@@ -0,0 +1,3 @@
+from flux import start_flux
+
+start_flux()
diff --git a/flux/color_functions/__init__.py b/flux/color_functions/__init__.py
@@ -0,0 +1,16 @@
+import os
+import importlib
+
+__globals = globals()
+__clr_funcs = {}
+for file in os.listdir(os.path.dirname(__file__)):
+    mod_name = file[:-3]   # strip .py at the end
+    if not mod_name.startswith('__'): # Avoid importing __init__.py
+        __globals[mod_name] = importlib.import_module('.' + mod_name, package=__name__)
+        __clr_funcs[__globals[mod_name].get_color_function_name()] = __globals[mod_name].color 
+
+def get_color_function(func):
+    return __clr_funcs.get(func)
+
+def get_color_function_names():
+    return list(__clr_funcs.keys())
diff --git a/flux/color_functions/age.py b/flux/color_functions/age.py
@@ -0,0 +1,13 @@
+import numpy as np
+
+def get_color_function_name():
+    return 'Age'
+
+def color(min_rgb, max_rgb, base_alpha, args):
+    age_range = args['max_age'] - args['min_age']
+    age_norm = np.divide(np.subtract(args['particles'][2], args['min_age']), age_range)
+    r = np.add(min_rgb[0], np.multiply(age_norm, (max_rgb[0] - min_rgb[0])))
+    g = np.add(min_rgb[1], np.multiply(age_norm, (max_rgb[1] - min_rgb[1])))
+    b = np.add(min_rgb[2], np.multiply(age_norm, (max_rgb[2] - min_rgb[2])))
+    a = np.repeat(base_alpha, r.size)
+    return r, g, b, a