Update eframe and rerun

PikminGuts92 · Jan 17, 2024 · 17f6453 · 17f6453
1 parent 7d20b2d
commit 17f6453
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/utils/anim_preview/Cargo.toml b/utils/anim_preview/Cargo.toml
@@ -8,5 +8,5 @@ edition.workspace = true
 grim = { workspace = true }
 keyframe = "1.1.1"
 nalgebra = "0.32.3"
-rerun = { version = "0.10.1", features = [ "native_viewer" ] }
-shared = { path = "../shared" }
+rerun = { version = "0.12.0", features = [ "native_viewer" ] }
+shared = { path = "../shared" }
diff --git a/utils/anim_preview/src/main.rs b/utils/anim_preview/src/main.rs
@@ -80,15 +80,15 @@ fn main() -> Result<(), Box<dyn Error>> {
         })
         .collect::<Vec<_>>();
 
-    let (mut rec_stream, storage) = RecordingStreamBuilder::new("anim_preview").memory()?;
+    let (rec_stream, storage) = RecordingStreamBuilder::new("anim_preview").memory()?;
 
     rec_stream.log_timeless(
         "world",
         &rerun::ViewCoordinates::new(
             ViewCoordinates::from_up_and_handedness(
                 SignedAxis3::POSITIVE_Z,
                 Handedness::Right))
-    );
+    )?;
 
     for mesh_anim in mesh_anims {
         println!("{}", mesh_anim.get_name());
@@ -145,7 +145,7 @@ fn main() -> Result<(), Box<dyn Error>> {
             rec_stream.log(
                 mesh_anim.get_name().as_str(),
                 &Points3D::new(glam_points)
-            );
+            )?;
 
             // Send line strip to rerun
             /*MsgSender::new(mesh_anim.get_name().as_str())
@@ -505,7 +505,7 @@ fn add_bones_to_stream(bone: &BoneNode, rec_stream: &RecordingStream, i: usize)
     rec_stream.log(
         format!("world/{}/lines", bone.name),
         &rerun::LineStrips3D::new(strips)
-    );
+    ).unwrap();
 
     // Add direction arrow (not working)
     /*MsgSender::new(format!("world/{}/arrows", bone.name))

diff --git a/utils/lipsync_preview/Cargo.toml b/utils/lipsync_preview/Cargo.toml
@@ -6,9 +6,9 @@ edition.workspace = true
 
 [dependencies]
 grim = { workspace = true, features = [ "audio" ] }
-eframe = "0.23.0"
-egui_plot = "0.23.0"
+eframe = "0.25.0"
+egui_plot = "0.25.0"
 keyframe = "1.1.1"
 nalgebra = "0.32.3"
 #rerun = "0.2.0"
-shared = { path = "../shared" }
+shared = { path = "../shared" }
diff --git a/utils/lipsync_preview/src/main.rs b/utils/lipsync_preview/src/main.rs
@@ -23,9 +23,11 @@ fn main() -> Result<(), Box<dyn Error>> {
     app.load_args(&args)?;
 
     let ops = NativeOptions {
-        drag_and_drop_support: true,
+        viewport: eframe::egui::ViewportBuilder::default()
+            .with_min_inner_size([320.0, 240.0])
+            .with_drag_and_drop(true),
         // icon_data: Some(icon),
-        min_window_size: Some([1000., 600.].into()),
+        // min_window_size: Some([1000., 600.].into()),
         follow_system_theme: false, // Always dark by default
         default_theme: eframe::Theme::Dark,
         ..NativeOptions::default()