cosmol-viewer 0.1.0__tar.gz → 0.1.1.dev1__tar.gz

{cosmol_viewer-0.1.0 → cosmol_viewer-0.1.1.dev1}/Cargo.lock

@@ -431,6 +431,15 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bit-set"
 version = "0.8.0"
@@ -688,35 +697,75 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cosmol_viewer"
+version = "0.1.1-nightly.1"
+dependencies = [
+ "bytemuck",
+ "cosmol_viewer_core",
+ "eframe",
+ "egui_extras",
+ "glam",
+ "hex",
+ "ipc-channel",
+ "serde",
+ "serde_json",
+ "sha2",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "cosmol_viewer_core"
-version = "0.1.0"
+version = "0.1.1-nightly.1"
+dependencies = [
+ "bytemuck",
+ "eframe",
+ "egui_extras",
+ "glam",
+ "serde",
+ "serde_json",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "cosmol_viewer_gui"
+version = "0.1.1-nightly.1"
 dependencies = [
  "bytemuck",
+ "cosmol_viewer_core",
  "eframe",
  "egui_extras",
  "glam",
+ "ipc-channel",
  "serde",
+ "serde_json",
+ "wasm-bindgen-futures",
+ "web-sys",
 ]
 
 [[package]]
 name = "cosmol_viewer_python"
-version = "0.1.0"
+version = "0.0.0"
 dependencies = [
  "base64 0.22.1",
  "cosmol_viewer_core",
  "eframe",
  "egui_extras",
  "glam",
+ "hex",
+ "ipc-channel",
  "pyo3",
  "serde_json",
+ "sha2",
  "uuid",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "cosmol_viewer_wasm"
-version = "0.1.0"
+version = "0.1.1-nightly.1"
 dependencies = [
  "cosmol_viewer_core",
  "eframe",
@@ -747,6 +796,15 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
@@ -1132,6 +1190,12 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
 
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
 [[package]]
 name = "foldhash"
 version = "0.1.5"
@@ -1603,6 +1667,24 @@ version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
+[[package]]
+name = "ipc-channel"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b1c98b70019c830a1fc39cecfe1f60ff99c4122f0a189697c810c90ec545c14"
+dependencies = [
+ "bincode",
+ "crossbeam-channel",
+ "fnv",
+ "libc",
+ "mio",
+ "rand 0.9.1",
+ "serde",
+ "tempfile",
+ "uuid",
+ "windows",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.15"
@@ -1826,6 +1908,17 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "mio"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+dependencies = [
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "naga"
 version = "24.0.0"
@@ -2318,7 +2411,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
  "phf_shared",
- "rand",
+ "rand 0.8.5",
 ]
 
 [[package]]
@@ -2579,8 +2672,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
 ]
 
 [[package]]
@@ -2590,7 +2693,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
 ]
 
 [[package]]
@@ -2602,6 +2715,15 @@ dependencies = [
  "getrandom 0.2.16",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.3",
+]
+
 [[package]]
 name = "raw-window-handle"
 version = "0.6.2"
@@ -2805,6 +2927,17 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -3027,8 +3160,9 @@ dependencies = [
 
 [[package]]
 name = "test"
-version = "0.1.0"
+version = "0.1.1-nightly.1"
 dependencies = [
+ "cosmol_viewer",
  "cosmol_viewer_core",
  "eframe",
  "egui_extras",
@@ -4242,7 +4376,7 @@ dependencies = [
  "hex",
  "nix",
  "ordered-stream",
- "rand",
+ "rand 0.8.5",
  "serde",
  "serde_repr",
  "sha1",

cosmol_viewer-0.1.1.dev1/Cargo.toml

@@ -0,0 +1,21 @@
+[workspace.package]
+edition = "2024"
+version = "0.1.1-nightly.1"
+authors = ["9028 wjt@cosmol.org"]
+repository = "https://github.com/COSMol-repl/COSMol-viewer"
+homepage = "https://github.com/COSMol-repl/COSMol-viewer"
+keywords = ["molecular", "visualization"]
+
+[workspace]
+resolver = "2"
+members = ["crates/python"]
+
+[workspace.dependencies]
+cosmol_viewer = {path = "cosmol_viewer"}
+cosmol_viewer_core = { path = "crates/core" }
+eframe = { version = "0.31.1"}
+egui_extras = { version = "0.31.1", features = ["svg"] }
+glam = { version = "0.30.3" , features = ["serde"] }
+serde_json = "1.0.140"
+sha2 = "0.10.9"
+hex = "0.4.3"

{cosmol_viewer-0.1.0 → cosmol_viewer-0.1.1.dev1}/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.4
 Name: cosmol-viewer
-Version: 0.1.0
+Version: 0.1.1.dev1
 Summary: Molecular visualization tools
 Author-email: 95028 <wjt@cosmol.org>

{cosmol_viewer-0.1.0/cosmol_viewer_core → cosmol_viewer-0.1.1.dev1/crates/core}/Cargo.toml

@@ -2,10 +2,14 @@
 name = "cosmol_viewer_core"
 version.workspace = true
 edition = "2024"
+publish = false
 
 [dependencies]
 eframe.workspace = true
+serde_json.workspace = true
 glam.workspace = true
 egui_extras.workspace = true
 serde = { version = "1.0.219" , features = ["derive"] }
 bytemuck = "1.23.1"
+web-sys = "0.3.77"
+wasm-bindgen-futures = "0.4.50"

cosmol_viewer-0.1.1.dev1/crates/core/src/lib.rs

@@ -0,0 +1,74 @@
+mod shader;
+use std::{
+    collections::HashMap,
+    sync::{Arc, Mutex},
+};
+
+pub mod utils;
+
+use eframe::egui::{self, Color32, Stroke};
+
+
+use serde::{Deserialize, Serialize};
+use shader::Canvas;
+
+pub use crate::utils::{Shape};
+pub mod shapes;
+use crate::{scene::Scene, shader::CameraState, utils::ToMesh};
+
+pub mod scene;
+
+pub struct AppWrapper(pub Arc<Mutex<Option<App>>>);
+
+impl eframe::App for AppWrapper {
+    fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
+        if let Some(app) = &mut *self.0.lock().unwrap() {
+            app.update(ctx, frame);
+        }
+    }
+}
+
+pub struct App {
+    canvas: Canvas,
+    gl: Option<Arc<eframe::glow::Context>>,
+    pub ctx: egui::Context,
+}
+
+impl App {
+    // #[cfg(not(target_arch = "wasm32"))]
+    pub fn new(cc: &eframe::CreationContext<'_>, scene: Scene) -> Self {
+        let gl = cc.gl.clone();
+        let canvas = Canvas::new(gl.as_ref().unwrap().clone(), scene).unwrap();
+        App {
+            gl,
+            canvas,
+            ctx: cc.egui_ctx.clone(),
+        }
+    }
+
+    pub fn update_scene(&mut self, scene: Scene) {
+        self.canvas.update_scene(scene);
+    }
+}
+
+impl eframe::App for App {
+    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
+        egui_extras::install_image_loaders(ctx);
+        egui::CentralPanel::default()
+            .frame(
+                egui::Frame::default()
+                    .fill(Color32::from_rgb(48, 48, 48))
+                    .inner_margin(0.0)
+                    .outer_margin(0.0)
+                    .stroke(Stroke::new(0.0, Color32::from_rgb(30, 200, 30))),
+            )
+            .show(ctx, |ui| {
+                ui.set_width(ui.available_width());
+                ui.set_height(ui.available_height());
+
+                self.canvas.custom_painting(ui);
+            });
+    }
+}
+
+

cosmol_viewer-0.1.1.dev1/crates/core/src/scene.rs

@@ -0,0 +1,57 @@
+use std::collections::HashMap;
+
+use serde::{Deserialize, Serialize};
+
+use crate::{shader::CameraState, utils::{self, ToMesh}, Shape};
+
+
+#[derive(Deserialize, Serialize, Clone)]
+pub struct Scene {
+    pub background_color: [f32; 3],
+    pub camera_state: CameraState,
+    pub named_shapes: HashMap<String, Shape>,
+    pub unnamed_shapes: Vec<Shape>,
+}
+
+impl Scene {
+    pub fn _get_meshes(&self) -> Vec<utils::MeshData> {
+        self.named_shapes
+            .values()
+            .chain(self.unnamed_shapes.iter())
+            .map(|s| s.to_mesh())
+            .collect()
+    }
+
+    pub fn new() -> Self {
+        Scene {
+            background_color: [1.0, 1.0, 1.0],
+            camera_state: CameraState::new(1.0),
+            named_shapes: HashMap::new(),
+            unnamed_shapes: Vec::new(),
+        }
+    }
+
+    pub fn add_shape<S: Into<Shape>>(&mut self, shape: S, id: Option<&str>) {
+        let shape = shape.into();
+        if let Some(id) = id {
+            self.named_shapes.insert(id.into(), shape);
+        } else {
+            self.unnamed_shapes.push(shape);
+        }
+    }
+
+    pub fn delete_shape(&mut self, id: &str) {
+        if self.named_shapes.remove(id).is_none() {
+            panic!("Sphere with ID '{}' not found", id);
+        }
+    }
+
+    pub fn update_shape<S: Into<Shape>>(&mut self, shape: S, id: &str) {
+        let shape = shape.into();
+        if let Some(existing_shape) = self.named_shapes.get_mut(id) {
+            *existing_shape = shape;
+        } else {
+            panic!("Shape with ID '{}' not found", id);
+        }
+    }
+}

cosmol_viewer-0.1.0/cosmol_viewer_core/src/shader/app.rs → cosmol_viewer-0.1.1.dev1/crates/core/src/shader/canvas.rs

@@ -13,21 +13,18 @@ use glam::{Quat, Vec3};
 use crate::Scene;
 
 pub struct Canvas {
-    /// Behind an `Arc<Mutex<…>>` so we can pass it to [`egui::PaintCallback`] and paint later.
     shader: Arc<Mutex<Shader>>,
     camera_state: CameraState,
 }
 
 impl Canvas {
-    pub fn new<'a>(gl: Arc<eframe::glow::Context>, scene: &Scene) -> Option<Self> {
+    pub fn new<'a>(gl: Arc<eframe::glow::Context>, scene: Scene) -> Option<Self> {
         Some(Self {
             shader: Arc::new(Mutex::new(Shader::new(&gl, scene)?)),
             camera_state: CameraState::new(1.0),
         })
     }
-}
 
-impl Canvas {
     pub fn custom_painting(&mut self, ui: &mut egui::Ui) {
         let (rect, response) = ui.allocate_exact_size(
             egui::Vec2 {
@@ -65,6 +62,11 @@ impl Canvas {
         };
         ui.painter().add(callback);
     }
+
+    pub fn update_scene(&mut self, scene: Scene) {
+        self.shader.lock().update_scene(scene);
+        println!("Scene updated in Canvas");
+    }
 }
 
 struct Shader {
@@ -74,11 +76,14 @@ struct Shader {
     vertex3d: Vec<Vertex3d>,
     indices: Vec<u32>,
     background_color: [f32; 3],
+    vbo: glow::Buffer,
+    element_array_buffer: glow::Buffer,
+    dirty: bool,
 }
 
 #[expect(unsafe_code)] // we need unsafe code to use glow
 impl Shader {
-    fn new(gl: &glow::Context, scene: &Scene) -> Option<Self> {
+    fn new(gl: &glow::Context, scene: Scene) -> Option<Self> {
         use glow::HasContext as _;
 
         let shader_version = egui_glow::ShaderVersion::get(gl);
@@ -87,13 +92,13 @@ impl Shader {
 
         let default_color = [1.0, 1.0, 1.0, 1.0];
 
-        let mut vertices: Vec<Vertex3d> = Vec::new();
+        let mut vertex3d: Vec<Vertex3d> = Vec::new();
         let mut indices: Vec<u32> = Vec::new();
 
         let mut vertex_offset = 0u32;
 
-        for mesh in scene.get_meshes() {
-            vertices.extend(mesh.vertices.iter().enumerate().map(|(i, pos)| {
+        for mesh in scene._get_meshes() {
+            vertex3d.extend(mesh.vertices.iter().enumerate().map(|(i, pos)| {
                 Vertex3d {
                     position: *pos,
                     normal: mesh.normals[i],
@@ -180,7 +185,6 @@ impl Shader {
                 gl.delete_shader(shader);
             }
 
-
             let shaders_bg: Vec<_> = shader_bg
                 .iter()
                 .map(|(shader_type, shader_source)| {
@@ -230,17 +234,17 @@ impl Shader {
             gl.bind_buffer(glow::ARRAY_BUFFER, Some(vertex_buffer));
             gl.buffer_data_u8_slice(
                 glow::ARRAY_BUFFER,
-                bytemuck::cast_slice(&vertices),
-                glow::STATIC_DRAW,
+                bytemuck::cast_slice(&vertex3d),
+                glow::DYNAMIC_DRAW,
             );
 
             // EBO
-            let ebo = gl.create_buffer().unwrap();
+            let ebo = gl.create_buffer().expect("Cannot create element buffer");
             gl.bind_buffer(glow::ELEMENT_ARRAY_BUFFER, Some(ebo));
             gl.buffer_data_u8_slice(
                 glow::ELEMENT_ARRAY_BUFFER,
                 bytemuck::cast_slice(&indices),
-                glow::STATIC_DRAW,
+                glow::DYNAMIC_DRAW,
             );
 
             let stride = std::mem::size_of::<Vertex3d>() as i32;
@@ -264,14 +268,49 @@ impl Shader {
             Some(Self {
                 program,
                 program_bg,
-                vertex3d: vertices,
+                vertex3d,
                 vertex_array,
                 indices,
                 background_color,
+                dirty: false,
+                vbo: vertex_buffer,
+                element_array_buffer: ebo,
             })
         }
     }
 
+    fn update_scene(&mut self, scene_data: Scene) {
+        self.background_color = scene_data.background_color;
+        self.vertex3d.clear();
+        self.indices.clear();
+
+        let mut vertex_offset = 0u32;
+
+        for mesh in scene_data._get_meshes() {
+            self.vertex3d
+                .extend(mesh.vertices.iter().enumerate().map(|(i, pos)| {
+                    let mut j = i;
+                    j = i % 50;
+                    Vertex3d {
+                        position: *pos,
+                        normal: mesh.normals[i],
+                        color: mesh
+                            .colors
+                            .as_ref()
+                            .and_then(|colors| colors.get(j))
+                            .unwrap_or(&[1.0, 1.0, 1.0, 1.0])
+                            .clone(),
+                    }
+                }));
+
+            self.indices
+                .extend(mesh.indices.iter().map(|&i| i + vertex_offset));
+            vertex_offset += mesh.vertices.len() as u32;
+        }
+
+        self.dirty = true;
+    }
+
     fn destroy(&self, gl: &glow::Context) {
         // use glow::HasContext as _;
         // unsafe {
@@ -280,7 +319,7 @@ impl Shader {
         // }
     }
 
-    fn paint(&self, gl: &glow::Context, aspect_ratio: f32, camera_state: CameraState) {
+    fn paint(&mut self, gl: &glow::Context, aspect_ratio: f32, camera_state: CameraState) {
         use glow::HasContext as _;
 
         let proj = if aspect_ratio > 1.0 {
@@ -403,18 +442,25 @@ impl Shader {
                 1.0,
             );
 
+            if self.dirty {
+                self.dirty = false;
+            }
+
             // 初始化时或每帧渲染前
             gl.bind_vertex_array(Some(self.vertex_array));
+            gl.bind_buffer(glow::ARRAY_BUFFER, Some(self.vbo));
             gl.buffer_data_u8_slice(
                 glow::ARRAY_BUFFER,
                 bytemuck::cast_slice(&self.vertex3d),
-                glow::STATIC_DRAW,
+                glow::DYNAMIC_DRAW,
             );
 
+            gl.bind_buffer(glow::ELEMENT_ARRAY_BUFFER, Some(self.element_array_buffer));
+
             gl.buffer_data_u8_slice(
                 glow::ELEMENT_ARRAY_BUFFER,
                 bytemuck::cast_slice(&self.indices),
-                glow::STATIC_DRAW,
+                glow::DYNAMIC_DRAW,
             );
 
             gl.draw_elements(

cosmol_viewer-0.1.1.dev1/crates/core/src/shader/mod.rs

@@ -0,0 +1,3 @@
+mod canvas;
+
+pub use canvas::*;

cosmol_viewer-0.1.1.dev1/crates/core/src/shapes/mod.rs

@@ -0,0 +1 @@
+pub mod sphere;