Continue integration

Author: lucascompython

Cargo.lock

@@ -13,7 +13,7 @@ eframe = { version = "0.31", default-features = false, features = [
 ] }
 wgpu = "24"
 egui-wgpu = "0.31"
-log = "0.4"
+log = { version = "0.4", optional = true }
 glam = { version = "0.30", features = ["fast-math"] }
 bytemuck = "1.22"
 rand = { version = "0.9", default-features = false, features = ["small_rng"] }
@@ -27,10 +27,11 @@ mimalloc = { version = "0.1" }
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wgpu = { version = "24", features = ["webgl"] }
 wasm-bindgen-futures = "0.4"
+web-time = "1.1"                                # TODO: See if I can get rid of this
 web-sys = "0.3"                                 # to access the DOM (to hide the loading text)
 
 [features]
-logs = ["dep:env_logger"]
+logs = ["dep:env_logger", "dep:log"]
 
 [profile.release]
 codegen-units = 1 # Allows LLVM to perform better optimization.

Cargo.toml

@@ -10,7 +10,10 @@ use crate::simulation::{ParticleSimulation, SimParams, SimulationMethod};
 use egui::epaint::text::{FontInsert, InsertFontFamily};
 use glam::Vec3;
 use std::collections::HashSet;
+#[cfg(not(target_arch = "wasm32"))]
 use std::time::Instant;
+#[cfg(target_arch = "wasm32")]
+use web_time::Instant;
 
 pub struct ParticleApp {
     simulation: Box<dyn ParticleSimulation>,

src/app.rs

@@ -29,6 +29,7 @@ impl CallbackTrait for ClonedParticleCallback {
         render_pass.set_pipeline(&self.render_pipeline);
         render_pass.set_bind_group(0, &self.camera_bind_group, &[]);
         render_pass.set_vertex_buffer(0, self.particle_buffer.slice(..));
+        // TODO: See this
         render_pass.draw(0..1, 0..self.num_particles);
     }
 }

src/custom_renderer.rs

@@ -62,7 +62,7 @@ fn main() -> eframe::Result {
             }),
 
             on_surface_error: Arc::new(|error| {
-                log::error!("Surface error: {:?}", error);
+                eprintln!("Surface error: {:?}", error);
                 egui_wgpu::SurfaceErrorAction::RecreateSurface
             }),
         },