From d3cb0b1957d954e7a5b96eadee8c911c6f236ca2 Mon Sep 17 00:00:00 2001 From: Braeden Sowinski Date: Fri, 2 Oct 2026 13:45:24 -0700 Subject: [PATCH] lab 4 --- lectures/04/alist/Cargo.lock | 7 + lectures/04/alist/Cargo.toml | 6 + lectures/04/alist/src/main.rs | 42 +++++ lectures/04/game_of_life/.gitignore | 6 + lectures/04/game_of_life/Cargo.toml | 33 ++++ lectures/04/game_of_life/LICENSE-APACHE | 201 ++++++++++++++++++++++++ lectures/04/game_of_life/LICENSE-MIT | 25 +++ lectures/04/game_of_life/README.md | 78 +++++++++ lectures/04/game_of_life/index.html | 28 ++++ lectures/04/game_of_life/index.js | 200 +++++++++++++++++++++++ lectures/04/game_of_life/src/lib.rs | 132 ++++++++++++++++ lectures/04/game_of_life/tests/web.rs | 13 ++ lectures/04/hello/.gitignore | 6 + lectures/04/hello/Cargo.toml | 27 ++++ lectures/04/hello/LICENSE-APACHE | 201 ++++++++++++++++++++++++ lectures/04/hello/LICENSE-MIT | 25 +++ lectures/04/hello/README.md | 78 +++++++++ lectures/04/hello/index.html | 15 ++ lectures/04/hello/src/lib.rs | 13 ++ lectures/04/hello/src/utils.rs | 10 ++ lectures/04/hello/tests/web.rs | 13 ++ useful.md | 7 + 22 files changed, 1166 insertions(+) create mode 100644 lectures/04/alist/Cargo.lock create mode 100644 lectures/04/alist/Cargo.toml create mode 100644 lectures/04/alist/src/main.rs create mode 100644 lectures/04/game_of_life/.gitignore create mode 100644 lectures/04/game_of_life/Cargo.toml create mode 100644 lectures/04/game_of_life/LICENSE-APACHE create mode 100644 lectures/04/game_of_life/LICENSE-MIT create mode 100644 lectures/04/game_of_life/README.md create mode 100644 lectures/04/game_of_life/index.html create mode 100644 lectures/04/game_of_life/index.js create mode 100644 lectures/04/game_of_life/src/lib.rs create mode 100644 lectures/04/game_of_life/tests/web.rs create mode 100644 lectures/04/hello/.gitignore create mode 100644 lectures/04/hello/Cargo.toml create mode 100644 lectures/04/hello/LICENSE-APACHE create mode 100644 lectures/04/hello/LICENSE-MIT create mode 100644 lectures/04/hello/README.md create mode 100644 lectures/04/hello/index.html create mode 100644 lectures/04/hello/src/lib.rs create mode 100644 lectures/04/hello/src/utils.rs create mode 100644 lectures/04/hello/tests/web.rs diff --git a/lectures/04/alist/Cargo.lock b/lectures/04/alist/Cargo.lock new file mode 100644 index 0000000..7435a93 --- /dev/null +++ b/lectures/04/alist/Cargo.lock @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "alist" +version = "0.1.0" diff --git a/lectures/04/alist/Cargo.toml b/lectures/04/alist/Cargo.toml new file mode 100644 index 0000000..7ed24ed --- /dev/null +++ b/lectures/04/alist/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "alist" +version = "0.1.0" +edition = "2024" + +[dependencies] diff --git a/lectures/04/alist/src/main.rs b/lectures/04/alist/src/main.rs new file mode 100644 index 0000000..ae652fd --- /dev/null +++ b/lectures/04/alist/src/main.rs @@ -0,0 +1,42 @@ +// for demo purposes +struct Alist(Vec<(K, V)>); // newtype pattern + +impl Alist { + fn new() -> Self { + Self(Vec::new()) + } + + fn insert(&mut self, key: K, value: V) { + self.0.push((key, value)); + } + + fn len(&self) -> usize { + self.0.len() + } + + fn into_iter(self) -> std::vec::IntoIter<(K, V)> { + self.0.into_iter() + } +} + +use std::ops::Deref; + +impl Deref for Alist { + type Target = [(K, V)]; + + fn deref(&self) -> &Self::Target { + self.0.deref() + } +} + +fn main() { + let mut l = Alist::new(); + for (x, y) in [(1, 2), (3, 4), (5, 6)] { + l.insert(x, y); + } + + let mut iter = l.iter(); + while let Some((k, v)) = iter.next() { + println!("{k}: {v}"); + } +} diff --git a/lectures/04/game_of_life/.gitignore b/lectures/04/game_of_life/.gitignore new file mode 100644 index 0000000..4e30131 --- /dev/null +++ b/lectures/04/game_of_life/.gitignore @@ -0,0 +1,6 @@ +/target +**/*.rs.bk +Cargo.lock +bin/ +pkg/ +wasm-pack.log diff --git a/lectures/04/game_of_life/Cargo.toml b/lectures/04/game_of_life/Cargo.toml new file mode 100644 index 0000000..3bba37a --- /dev/null +++ b/lectures/04/game_of_life/Cargo.toml @@ -0,0 +1,33 @@ +[package] +name = "game_of_life" +version = "0.1.0" +authors = ["Braeden Sowinski "] +edition = "2018" + +[lib] +crate-type = ["cdylib", "rlib"] + +[features] +default = ["console_error_panic_hook"] + +[dependencies] +wasm-bindgen = "0.2.84" + +# The `console_error_panic_hook` crate provides better debugging of panics by +# logging them with `console.error`. This is great for development, but requires +# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for +# code size when deploying. +console_error_panic_hook = { version = "0.1.7", optional = true } + +[dev-dependencies] +wasm-bindgen-test = "0.3.34" + +[profile.release] +# Tell `rustc` to optimize for small code size. +opt-level = "s" + +# The system `wasm-opt` (binaryen) here is too old to correctly handle the +# externref tables wasm-bindgen generates, and corrupts the table's growth +# limit, breaking initialization at runtime. Skip the wasm-opt pass. +[package.metadata.wasm-pack.profile.release] +wasm-opt = false diff --git a/lectures/04/game_of_life/LICENSE-APACHE b/lectures/04/game_of_life/LICENSE-APACHE new file mode 100644 index 0000000..11069ed --- /dev/null +++ b/lectures/04/game_of_life/LICENSE-APACHE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/lectures/04/game_of_life/LICENSE-MIT b/lectures/04/game_of_life/LICENSE-MIT new file mode 100644 index 0000000..2a56e58 --- /dev/null +++ b/lectures/04/game_of_life/LICENSE-MIT @@ -0,0 +1,25 @@ +Copyright (c) 2018 Braeden Sowinski + +Permission is hereby granted, free of charge, to any +person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without +limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/lectures/04/game_of_life/README.md b/lectures/04/game_of_life/README.md new file mode 100644 index 0000000..315bda9 --- /dev/null +++ b/lectures/04/game_of_life/README.md @@ -0,0 +1,78 @@ +
+ +

wasm-pack-template

+ + A template for kick starting a Rust and WebAssembly project using wasm-pack. + +

+ Tutorial + | + Chat +

+ + Built with Rust and WebAssembly by The Rust and WebAssembly Working Group +
+ +## About + +[Read this template tutorial][template-docs]. + +This template is designed for compiling Rust libraries into WebAssembly and +publishing the resulting package to NPM. + +Be sure to check out [other `wasm-pack` tutorials online][tutorials] for other +templates and usages of `wasm-pack`. + +[tutorials]: https://rustwasm.github.io/docs/wasm-pack/tutorials/index.html +[template-docs]: https://rustwasm.github.io/docs/wasm-pack/tutorials/npm-browser-packages/index.html + +## Usage + +### Use `wasm-pack new` to Clone this Template + +``` +wasm-pack new my-project +cd my-project +``` + +### Build with `wasm-pack build` + +``` +wasm-pack build +``` + +### Test in Headless Browsers with `wasm-pack test` + +``` +wasm-pack test --headless --firefox +``` + +### Publish to NPM with `wasm-pack publish` + +``` +wasm-pack publish +``` + +## Batteries Included + +* [`wasm-bindgen`](https://github.com/rustwasm/wasm-bindgen) for communicating + between WebAssembly and JavaScript. +* [`console_error_panic_hook`](https://github.com/rustwasm/console_error_panic_hook) + for logging panic messages to the developer console. +* `LICENSE-APACHE` and `LICENSE-MIT`: most Rust projects are licensed this way, so these are included for you. + +## License + +Licensed under either of + +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally +submitted for inclusion in the work by you, as defined in the Apache-2.0 +license, shall be dual licensed as above, without any additional terms or +conditions. diff --git a/lectures/04/game_of_life/index.html b/lectures/04/game_of_life/index.html new file mode 100644 index 0000000..51ad7c9 --- /dev/null +++ b/lectures/04/game_of_life/index.html @@ -0,0 +1,28 @@ + + + + + Game of Life + + + +
+ + +
+ + + + diff --git a/lectures/04/game_of_life/index.js b/lectures/04/game_of_life/index.js new file mode 100644 index 0000000..a412c95 --- /dev/null +++ b/lectures/04/game_of_life/index.js @@ -0,0 +1,200 @@ +import init, { Cell, Universe } from "./pkg/game_of_life.js"; + +const CELL_SIZE = 10; // px +const GRID_COLOR = "#CCCCCC"; +const DEAD_COLOR = "#FFFFFF"; +const ALIVE_COLOR = "#000000"; + +const { memory } = await init(); + +const universe = Universe.new(); +const width = universe.width(); +const height = universe.height(); + +const canvas = document.getElementById("game-of-life-canvas"); +canvas.height = (CELL_SIZE + 1) * height + 1; +canvas.width = (CELL_SIZE + 1) * width + 1; + +const ctx = canvas.getContext("2d"); + +const getIndex = (row, column) => row * width + column; + +const drawGrid = () => { + ctx.beginPath(); + ctx.strokeStyle = GRID_COLOR; + + for (let i = 0; i <= width; i++) { + ctx.moveTo(i * (CELL_SIZE + 1) + 1, 0); + ctx.lineTo(i * (CELL_SIZE + 1) + 1, (CELL_SIZE + 1) * height + 1); + } + + for (let j = 0; j <= height; j++) { + ctx.moveTo(0, j * (CELL_SIZE + 1) + 1); + ctx.lineTo((CELL_SIZE + 1) * width + 1, j * (CELL_SIZE + 1) + 1); + } + + ctx.stroke(); +}; + +const drawCells = () => { + const cellsPtr = universe.cells(); + const cells = new Uint8Array(memory.buffer, cellsPtr, width * height); + + ctx.beginPath(); + + for (let row = 0; row < height; row++) { + for (let col = 0; col < width; col++) { + const idx = getIndex(row, col); + + ctx.fillStyle = cells[idx] === Cell.Dead ? DEAD_COLOR : ALIVE_COLOR; + + ctx.fillRect( + col * (CELL_SIZE + 1) + 1, + row * (CELL_SIZE + 1) + 1, + CELL_SIZE, + CELL_SIZE, + ); + } + } + + ctx.stroke(); +}; + +let animationId = null; + +const isPaused = () => animationId === null; + +const renderLoop = () => { + universe.tick(); + + drawGrid(); + drawCells(); + + animationId = requestAnimationFrame(renderLoop); +}; + +const playPauseButton = document.getElementById("play-pause"); + +const play = () => { + playPauseButton.textContent = "⏸"; + renderLoop(); +}; + +const pause = () => { + playPauseButton.textContent = "▶"; + cancelAnimationFrame(animationId); + animationId = null; +}; + +playPauseButton.addEventListener("click", () => { + if (isPaused()) { + play(); + } else { + pause(); + } +}); + +const clearButton = document.getElementById("clear"); + +clearButton.addEventListener("click", () => { + universe.clear(); + + drawGrid(); + drawCells(); +}); + +const cellAtEvent = (event) => { + const boundingRect = canvas.getBoundingClientRect(); + + const scaleX = canvas.width / boundingRect.width; + const scaleY = canvas.height / boundingRect.height; + + const canvasLeft = (event.clientX - boundingRect.left) * scaleX; + const canvasTop = (event.clientY - boundingRect.top) * scaleY; + + const row = Math.min(Math.floor(canvasTop / (CELL_SIZE + 1)), height - 1); + const col = Math.min(Math.floor(canvasLeft / (CELL_SIZE + 1)), width - 1); + + return [row, col]; +}; + +// Bresenham's line algorithm, so fast drags don't leave gaps between cells. +const forEachCellOnLine = (row0, col0, row1, col1, callback) => { + let row = row0; + let col = col0; + + const dRow = Math.abs(row1 - row0); + const dCol = Math.abs(col1 - col0); + const stepRow = row1 > row0 ? 1 : -1; + const stepCol = col1 > col0 ? 1 : -1; + + let err = dRow - dCol; + + while (true) { + callback(row, col); + + if (row === row1 && col === col1) { + break; + } + + const err2 = err * 2; + + if (err2 > -dCol) { + err -= dCol; + row += stepRow; + } + + if (err2 < dRow) { + err += dRow; + col += stepCol; + } + } +}; + +let isDrawing = false; +let lastCell = null; + +canvas.addEventListener("mousedown", (event) => { + const [row, col] = cellAtEvent(event); + + isDrawing = true; + lastCell = [row, col]; + + universe.toggle_cell(row, col); + + drawGrid(); + drawCells(); +}); + +canvas.addEventListener("mousemove", (event) => { + if (!isDrawing) { + return; + } + + const [row, col] = cellAtEvent(event); + + if (row === lastCell[0] && col === lastCell[1]) { + return; + } + + forEachCellOnLine(lastCell[0], lastCell[1], row, col, (r, c) => { + universe.set_alive(r, c); + }); + + lastCell = [row, col]; + + drawGrid(); + drawCells(); +}); + +const stopDrawing = () => { + isDrawing = false; + lastCell = null; +}; + +window.addEventListener("mouseup", stopDrawing); +canvas.addEventListener("mouseleave", stopDrawing); + +drawGrid(); +drawCells(); +play(); diff --git a/lectures/04/game_of_life/src/lib.rs b/lectures/04/game_of_life/src/lib.rs new file mode 100644 index 0000000..fce6e99 --- /dev/null +++ b/lectures/04/game_of_life/src/lib.rs @@ -0,0 +1,132 @@ +use wasm_bindgen::prelude::*; + +#[wasm_bindgen] +#[derive(Clone, Copy, PartialEq, Eq)] +#[repr(u8)] +pub enum Cell { + Dead = 0, + Alive = 1, +} + +impl Cell { + pub fn toggle(&mut self) { + *self = if *self == Cell::Alive { + Cell::Dead + } else { + Cell::Alive + }; + } +} + +#[wasm_bindgen] +pub struct Universe { + width: u32, + height: u32, + cells: Vec, +} + +#[wasm_bindgen] +impl Universe { + pub fn new() -> Self { + let (width, height) = (64, 64); + let cells = (0..width * height) + .map(|i| { + if i % 2 == 0 || i % 7 == 0 { + Cell::Alive + } else { + Cell::Dead + } + }) + .collect(); + + Self { + width, + height, + cells, + } + } + + pub fn width(&self) -> u32 { + self.width + } + + pub fn height(&self) -> u32 { + self.height + } + + pub fn cells(&self) -> *const Cell { + self.cells.as_ptr() + } + + fn get_index(&self, row: u32, col: u32) -> usize { + (row * self.width + col) as usize + } + + fn count_live_neighbours(&self, row: u32, col: u32) -> u8 { + let mut count = 0; + for i in [self.height - 1, 0, 1] { + for j in [self.width - 1, 0, 1] { + if i == 0 && j == 0 { + continue; + } + let idx = self.get_index((row + i) % self.height, (col + j) % self.width); + count += self.cells[idx] as u8; + } + } + count + } + + pub fn tick(&mut self) { + let mut cells = self.cells.clone(); + for row in 0..self.height { + for col in 0..self.width { + let idx = self.get_index(row, col); + cells[idx] = match (self.cells[idx], self.count_live_neighbours(row, col)) { + (_, 3) | (Cell::Alive, 2) => Cell::Alive, + _ => Cell::Dead, + } + } + } + self.cells = cells; + } + + pub fn render(&self) -> String { + self.to_string() + } + + pub fn toggle_cell(&mut self, row: u32, col: u32) { + let idx = self.get_index(row, col); + self.cells[idx].toggle(); + } + + pub fn set_alive(&mut self, row: u32, col: u32) { + let idx = self.get_index(row, col); + self.cells[idx] = Cell::Alive; + } + + pub fn clear(&mut self) { + for cell in self.cells.iter_mut() { + *cell = Cell::Dead; + } + } +} + +use std::fmt; + +impl fmt::Display for Universe { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + for row in 0..self.height { + for col in 0..self.width { + let idx = self.get_index(row, col); + let glyph = if self.cells[idx] == Cell::Alive { + '⬛' + } else { + '🔳' + }; + write!(f, "{glyph}"); + } + write!(f, "\n"); + } + Ok(()) + } +} diff --git a/lectures/04/game_of_life/tests/web.rs b/lectures/04/game_of_life/tests/web.rs new file mode 100644 index 0000000..de5c1da --- /dev/null +++ b/lectures/04/game_of_life/tests/web.rs @@ -0,0 +1,13 @@ +//! Test suite for the Web and headless browsers. + +#![cfg(target_arch = "wasm32")] + +extern crate wasm_bindgen_test; +use wasm_bindgen_test::*; + +wasm_bindgen_test_configure!(run_in_browser); + +#[wasm_bindgen_test] +fn pass() { + assert_eq!(1 + 1, 2); +} diff --git a/lectures/04/hello/.gitignore b/lectures/04/hello/.gitignore new file mode 100644 index 0000000..4e30131 --- /dev/null +++ b/lectures/04/hello/.gitignore @@ -0,0 +1,6 @@ +/target +**/*.rs.bk +Cargo.lock +bin/ +pkg/ +wasm-pack.log diff --git a/lectures/04/hello/Cargo.toml b/lectures/04/hello/Cargo.toml new file mode 100644 index 0000000..3c5b8bb --- /dev/null +++ b/lectures/04/hello/Cargo.toml @@ -0,0 +1,27 @@ +[package] +name = "hello" +version = "0.1.0" +authors = ["Braeden Sowinski "] +edition = "2018" + +[lib] +crate-type = ["cdylib", "rlib"] + +[features] +default = ["console_error_panic_hook"] + +[dependencies] +wasm-bindgen = "0.2.84" + +# The `console_error_panic_hook` crate provides better debugging of panics by +# logging them with `console.error`. This is great for development, but requires +# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for +# code size when deploying. +console_error_panic_hook = { version = "0.1.7", optional = true } + +[dev-dependencies] +wasm-bindgen-test = "0.3.34" + +[profile.release] +# Tell `rustc` to optimize for small code size. +opt-level = "s" diff --git a/lectures/04/hello/LICENSE-APACHE b/lectures/04/hello/LICENSE-APACHE new file mode 100644 index 0000000..11069ed --- /dev/null +++ b/lectures/04/hello/LICENSE-APACHE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/lectures/04/hello/LICENSE-MIT b/lectures/04/hello/LICENSE-MIT new file mode 100644 index 0000000..2a56e58 --- /dev/null +++ b/lectures/04/hello/LICENSE-MIT @@ -0,0 +1,25 @@ +Copyright (c) 2018 Braeden Sowinski + +Permission is hereby granted, free of charge, to any +person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without +limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/lectures/04/hello/README.md b/lectures/04/hello/README.md new file mode 100644 index 0000000..315bda9 --- /dev/null +++ b/lectures/04/hello/README.md @@ -0,0 +1,78 @@ +
+ +

wasm-pack-template

+ + A template for kick starting a Rust and WebAssembly project using wasm-pack. + +

+ Tutorial + | + Chat +

+ + Built with Rust and WebAssembly by The Rust and WebAssembly Working Group +
+ +## About + +[Read this template tutorial][template-docs]. + +This template is designed for compiling Rust libraries into WebAssembly and +publishing the resulting package to NPM. + +Be sure to check out [other `wasm-pack` tutorials online][tutorials] for other +templates and usages of `wasm-pack`. + +[tutorials]: https://rustwasm.github.io/docs/wasm-pack/tutorials/index.html +[template-docs]: https://rustwasm.github.io/docs/wasm-pack/tutorials/npm-browser-packages/index.html + +## Usage + +### Use `wasm-pack new` to Clone this Template + +``` +wasm-pack new my-project +cd my-project +``` + +### Build with `wasm-pack build` + +``` +wasm-pack build +``` + +### Test in Headless Browsers with `wasm-pack test` + +``` +wasm-pack test --headless --firefox +``` + +### Publish to NPM with `wasm-pack publish` + +``` +wasm-pack publish +``` + +## Batteries Included + +* [`wasm-bindgen`](https://github.com/rustwasm/wasm-bindgen) for communicating + between WebAssembly and JavaScript. +* [`console_error_panic_hook`](https://github.com/rustwasm/console_error_panic_hook) + for logging panic messages to the developer console. +* `LICENSE-APACHE` and `LICENSE-MIT`: most Rust projects are licensed this way, so these are included for you. + +## License + +Licensed under either of + +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally +submitted for inclusion in the work by you, as defined in the Apache-2.0 +license, shall be dual licensed as above, without any additional terms or +conditions. diff --git a/lectures/04/hello/index.html b/lectures/04/hello/index.html new file mode 100644 index 0000000..d429428 --- /dev/null +++ b/lectures/04/hello/index.html @@ -0,0 +1,15 @@ + + + + + Hello + + + + + diff --git a/lectures/04/hello/src/lib.rs b/lectures/04/hello/src/lib.rs new file mode 100644 index 0000000..33d5f9e --- /dev/null +++ b/lectures/04/hello/src/lib.rs @@ -0,0 +1,13 @@ +mod utils; + +use wasm_bindgen::prelude::*; + +#[wasm_bindgen] +extern "C" { + fn alert(s: &str); +} + +#[wasm_bindgen] +pub fn greet(s: &str) { + alert(&format!("Hello, {s}!")); +} diff --git a/lectures/04/hello/src/utils.rs b/lectures/04/hello/src/utils.rs new file mode 100644 index 0000000..b1d7929 --- /dev/null +++ b/lectures/04/hello/src/utils.rs @@ -0,0 +1,10 @@ +pub fn set_panic_hook() { + // When the `console_error_panic_hook` feature is enabled, we can call the + // `set_panic_hook` function at least once during initialization, and then + // we will get better error messages if our code ever panics. + // + // For more details see + // https://github.com/rustwasm/console_error_panic_hook#readme + #[cfg(feature = "console_error_panic_hook")] + console_error_panic_hook::set_once(); +} diff --git a/lectures/04/hello/tests/web.rs b/lectures/04/hello/tests/web.rs new file mode 100644 index 0000000..de5c1da --- /dev/null +++ b/lectures/04/hello/tests/web.rs @@ -0,0 +1,13 @@ +//! Test suite for the Web and headless browsers. + +#![cfg(target_arch = "wasm32")] + +extern crate wasm_bindgen_test; +use wasm_bindgen_test::*; + +wasm_bindgen_test_configure!(run_in_browser); + +#[wasm_bindgen_test] +fn pass() { + assert_eq!(1 + 1, 2); +} diff --git a/useful.md b/useful.md index 5edacbd..37cddb3 100644 --- a/useful.md +++ b/useful.md @@ -32,3 +32,10 @@ cargo new lectures/03 --name lec03 cargo new labs/01 --name lab01 cargo new labs/02 --name lab02 ``` + +## wasm stuff +``` +cargo install wasm-pack +wasm-pack new {name} +wasm-pack build --target web +```