feat(viewer): add .vm file support to seamlessly load and render both…

demos/viewer/Cargo.toml

@@ -18,6 +18,7 @@ zerocopy.workspace = true
 
 fidget.workspace = true
 workspace-hack.workspace = true
+tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
 
 [features]
 default = ["jit"]

demos/viewer/src/main.rs

@@ -5,7 +5,6 @@ use eframe::{
     egui,
     egui_wgpu::{self, wgpu},
 };
-use env_logger::Env;
 use log::{debug, error, info};
 use nalgebra::Point2;
 use notify::{Event, EventKind, Watcher};
@@ -223,7 +222,8 @@ fn render_3d<F: fidget::eval::Function + fidget::render::RenderHints>(
 }
 
 fn main() -> Result<(), Box<dyn Error>> {
-    env_logger::Builder::from_env(Env::default().default_filter_or("info"))
+    tracing_subscriber::fmt()
+        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
         .init();
     let args = Args::parse();
 

demos/viewer/src/script.rs

@@ -6,17 +6,34 @@ use std::sync::{Arc, Mutex};
 
 /// Receives scripts and executes them with Fidget
 pub(crate) fn rhai_script_thread(
-    rx: Receiver<String>,
+    rx: Receiver<(String, String)>,
     tx: Sender<Result<ScriptContext, String>>,
 ) -> Result<()> {
     let mut engine = Engine::new();
 
     loop {
-        let script = rx.recv()?;
+        let (script, path) = rx.recv()?;
         debug!("rhai script thread received script");
-        let r = engine.run(&script).map_err(|e| e.to_string());
-        debug!("rhai script thread is sending result to render thread");
-        tx.send(r)?;
+        if path.ends_with(".vm") {
+            // Parse as flat text math tree
+            use fidget::context::Context;
+            use std::io::Cursor;
+            match Context::from_text(Cursor::new(&script)) {
+                Ok((ctx, node)) => {
+                    let tree = ctx.export(node).unwrap();
+                    let mut sc = ScriptContext::new();
+                    sc.shapes.push(DrawShape { tree, color_rgb: [255, 255, 255] });
+                    tx.send(Ok(sc))?;
+                }
+                Err(e) => {
+                    tx.send(Err(format!(".vm parse error: {e}")))?;
+                }
+            }
+        } else {
+            let r = engine.run(&script).map_err(|e| e.to_string());
+            debug!("rhai script thread is sending result to render thread");
+            tx.send(r)?;
+        }
     }
 }
 

demos/viewer/src/watcher.rs

@@ -7,14 +7,15 @@ use std::path::Path;
 pub(crate) fn file_watcher_thread(
     path: &Path,
     rx: Receiver<()>,
-    tx: Sender<String>,
+    tx: Sender<(String, String)>,
 ) -> Result<()> {
     let read_file = || -> Result<String> {
         let out = String::from_utf8(std::fs::read(path)?).unwrap();
         Ok(out)
     };
     let mut contents = read_file()?;
-    tx.send(contents.clone())?;
+    let path_str = path.to_string_lossy().to_string();
+    tx.send((contents.clone(), path_str.clone()))?;
 
     loop {
         // Wait for a file change notification
@@ -31,7 +32,7 @@ pub(crate) fn file_watcher_thread(
         if contents != new_contents {
             contents = new_contents;
             debug!("file contents changed!");
-            tx.send(contents.clone())?;
+            tx.send((contents.clone(), path_str.clone()))?;
         }
     }
 }