Annotated potential wasm problems

perezandy · perezandy · commit 5923760ce984 · 2023-11-22T09:23:58.000-05:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,7 @@ eframe = { version = "0.22.0", default-features = false, features = [
     "glow",          # Use the glow rendering backend. Alternative: "wgpu".
     "persistence",   # Enable restoring app state when restarting the app.
 ] }
+wasm-bindgen = "0.2"
 tracing = "0.1.37"
 tracing-subscriber = "0.3"
 log = "0.4.19"
@@ -35,4 +36,8 @@ prettyplease = "0.2.10"
 slotmap = "1.0.6"
 clap = { version = "4.3.19", features = ["derive"] }
 usvg = "0.35.0"
-cargo-generate = "0.18.4"
+cargo-generate = "0.18.4"
+clang = "2.0.0"
+
+[lib]
+crate-type = ["cdylib"]
diff --git a/src/app/code_editor.rs b/src/app/code_editor.rs
@@ -55,6 +55,24 @@ impl Default for CodeFile {
 }
 
 impl CodeFile {
+
+
+    // These implementations will be slightly more challenging. We can't use include_bytes!()
+    // since that doesnt work on runtime file creation. Instead, LocalStorage seems like the best bet
+    // Local Storage utilizes a key value pair and saves it to the local browser.
+    #[wasm_bindgen]
+    fn load_from_file(key: &str) -> Option<String>{
+
+    }
+
+
+
+    #[wasm_bindgen]
+    fn save(key: &str, data: &str) -> Option<String>{
+
+    }
+
+
     // Load some code from a path
     fn load_from_file(&mut self, file_path: &Path) -> std::io::Result<()> {
         let CodeFile { code, .. } = self;
diff --git a/src/app/icons.rs b/src/app/icons.rs
@@ -21,6 +21,15 @@ pub const ICON_DIR: &'static str = "assets/icons/pack/white/";
 pub const SMALL_ICON_SIZE: Vec2 = Vec2::new(8.0, 8.0);
 pub const DEFAULT_ICON_SIZE: Vec2 = Vec2::new(12.0, 12.0);
 
+
+
+#[wasm_bindgen] //TODO: implement this using local binary-stored data.
+pub fn load_icons() -> HashMap<&'static str, RetainedImage> {
+
+}
+
+
+
 // This function returns a mapping of icon names to RetainedImages 
 pub fn load_icons(icon_path: &Path) -> HashMap<&'static str, RetainedImage> {
 
diff --git a/src/app/mod.rs b/src/app/mod.rs
@@ -73,10 +73,28 @@ pub struct IronCoderApp {
 }
 
 impl Default for IronCoderApp {
+
+    #[wasm_bindgen] //TODO: Locally store the board files
+    fn default() -> Self {
+        
+        // Might be difficult to find a way to store the entire directory,
+        // so it'll be important to find the necessary components and load them in
+        // with include_bytes!()
+
+        
+
+    }
+
     fn default() -> Self {
         // Populate the boards
-        let boards_dir = Path::new("./iron-coder-boards");
+
+
+        let boards_dir = Path::new("./iron-coder-boards"); 
         let boards: Vec<board::Board> = board::get_boards(boards_dir);
+
+        
+
+
         Self {
             project: Project::default(),
             display_about: false,
diff --git a/src/board/mod.rs b/src/board/mod.rs
@@ -126,6 +126,17 @@ impl Hash for Board {
 /// information about them.
 impl Board {
 
+
+
+    #[wasm_bindgen] //TODO: Implement
+    fn load_from_toml(path: &Path) -> std::io::Result<Self> {
+        // Anything relating to a file will have to utilize the include_bytes! macro.
+        // It is very likely that any structs with paths to images as member variables
+        // will have to be replaced with constant data, which is then assigned at compile time.
+        // Functions like this will then instead
+    }
+
+
     /// Loads a board from its toml description
     fn load_from_toml(path: &Path) -> std::io::Result<Self> {
         
diff --git a/src/board/parsing.rs b/src/board/parsing.rs
@@ -114,12 +114,24 @@ impl<'ast> Visit<'ast> for BspParseInfo {
 /// Board impls regarding parsing of BSP syntax
 impl Board {
 
+    #[wasm_bindgen] //TODO: Implement
+    fn parse_bsp(&self) -> Option<syn::File>{
+        // To include files in wasm, you have to do this, but this won't work since
+        // all paths need to be known at compile time. Likely will need to go back 
+        // and change the board implementations.
+        const svg_string: &'static [u8] = include_bytes!(path)
+
+
+    }
+
     // Attempt to parse the BSP lib file.
     fn parse_bsp(&self) -> Option<syn::File> {
         let mut syntax = None;
         if let Some(bsp_dir) = self.bsp_path.clone() {
             let src = bsp_dir.join("src/lib.rs");
+            
             let src = fs::read_to_string(src.as_path()).unwrap();
+
             syntax = match syn::parse_file(src.as_str()) {
                 Ok(syntax) => {
                     Some(syntax)
diff --git a/src/board/svg_reader.rs b/src/board/svg_reader.rs
@@ -41,6 +41,10 @@ pub struct SvgBoardInfo {
 
 impl SvgBoardInfo {
 
+
+    // We could make a wasm build target version of this function, but most likely we can just 
+    // prerender and include the .png files.
+
     /// Parse an Iron Coder SVG Board image from the filesystem.
     pub fn from_path(path: &Path) -> Result<SvgBoardInfo, Error> {
 
