tmp

kvark · Dec 7, 2024 · e2695ce · e2695ce
1 parent 202a229
commit e2695ce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,8 +28,8 @@ profiling = "1"
 slab = "0.4"
 strum = { version = "0.25", features = ["derive"] }
 web-sys = "0.3.60"
-winit = { version = "0.30" }
-# winit = { version = "0.30", default-features=false, features=["x11", "rwh_06"] }
+# winit = { version = "0.30" }
+winit = { version = "0.30", default-features=false, features=["x11", "rwh_06"] }
 
 [lib]
 
@@ -91,7 +91,7 @@ del-geo = "=0.1.29"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 # see https://github.com/emilk/egui/issues/4270
-egui-winit = "0.29"
+egui-winit = { version="0.29", default-features=false, features=["links"] }
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 # see https://github.com/emilk/egui/issues/4270

diff --git a/examples/particle/main.rs b/examples/particle/main.rs
@@ -242,7 +242,6 @@ impl Example {
     }
 
     fn add_gui(&mut self, ui: &mut egui::Ui) {
-        ui.add_space(5.0);
         ui.heading("Particle System");
         self.particle_system.add_gui(ui);
 
@@ -260,6 +259,7 @@ impl Example {
                             self.context.wait_for(&sp, !0);
                         }
 
+                        let old_params = self.particle_system.params;
                         self.particle_system.destroy(&self.context);
                         self.particle_system = particle::System::new(
                             &self.context,
@@ -270,6 +270,8 @@ impl Example {
                             },
                             self.sample_count,
                         );
+                        self.particle_system.params = old_params;
+
                         if let Some(msaa_view) = self.msaa_view.take() {
                             self.context.destroy_texture_view(msaa_view);
                         }
@@ -351,7 +353,10 @@ fn main() {
                             let raw_input = egui_winit.take_egui_input(&window);
                             let egui_output = egui_winit.egui_ctx().run(raw_input, |egui_ctx| {
                                 egui::SidePanel::left("info").show(egui_ctx, |ui| {
+                                    ui.add_space(5.0);
                                     example.add_gui(ui);
+
+                                    ui.add_space(5.0);
                                     if ui.button("Quit").clicked() {
                                         target.exit();
                                     }