Guide tests.

bevy_nannou_draw/src/lib.rs

@@ -4,7 +4,6 @@ use bevy::prelude::*;
 
 use crate::render::NannouRenderPlugin;
 
-mod changed;
 pub mod color;
 pub mod draw;
 pub mod render;

guide/book_tests/Cargo.toml

@@ -6,15 +6,15 @@ edition = '2018'
 description = 'For testing the nannou-guide, while including the nannou dependencies.'
 
 [build-dependencies]
-# Temporarily use git dependency until budziq/rust-skeptic#121 is merged and published.
-# https://github.com/budziq/rust-skeptic/pull/121
-skeptic = { git = "https://github.com/mitchmindtree/rust-skeptic", branch = "1.45-extern" }
+# Temporarily use git dependency until budziq/rust-skeptic#142 is merged and published.
+# https://github.com/budziq/rust-skeptic/pull/142
+skeptic = { git = "https://github.com/Erk-/rust-skeptic", branch = "fix-rust-1-77" }
 #skeptic = "0.13"
 
 [dev-dependencies]
-# Temporarily use git dependency until budziq/rust-skeptic#121 is merged and published.
-# https://github.com/budziq/rust-skeptic/pull/121
-skeptic = { git = "https://github.com/mitchmindtree/rust-skeptic", branch = "1.45-extern" }
+# Temporarily use git dependency until budziq/rust-skeptic#142 is merged and published.
+# https://github.com/budziq/rust-skeptic/pull/142
+skeptic = { git = "https://github.com/Erk-/rust-skeptic", branch = "fix-rust-1-77" }
 #skeptic = "0.13"
 nannou = { version ="0.19.0", path = "../../nannou" }
 nannou_osc = { version ="0.19.0", path = "../../nannou_osc" }

guide/src/getting_started/create_a_project.md

@@ -61,7 +61,8 @@ create a new project with just a few small steps:
    fn update(_app: &App, _model: &mut Model) {
    }
 
-   fn view(_app: &App, _model: &Model) {
+   fn view(app: &App, _model: &Model, _window: Entity) {
+       let draw = app.draw();
        draw.background().color(PURPLE);
    }
    ```

guide/src/tutorials/basics/anatomy-of-a-nannou-app.md

@@ -23,7 +23,6 @@ struct Model {}
 
 fn main() {
     nannou::app(model)
-        .event(event)
         .simple_window(view)
         .run();
 }
@@ -32,10 +31,7 @@ fn model(_app: &App) -> Model {
     Model {}
 }
 
-fn event(_app: &App, _model: &mut Model, _event: Event) {
-}
-
-fn view(_app: &App, _model: &Model, _frame: Frame) {
+fn view(_app: &App, _model: &Model, _window: Entity) {
 }
 ```
 
@@ -88,16 +84,13 @@ model can stay empty.
 # struct Model {}
 fn main() {
     nannou::app(model)
-        .event(event)
         .simple_window(view)
         .run();
 }
 # fn model(_app: &App) -> Model {
 #     Model {}
 # }
-# fn event(_app: &App, _model: &mut Model, _event: Event) {
-# }
-# fn view(_app: &App, _model: &Model, _frame: Frame) {
+# fn view(_app: &App, _model: &Model, _window: Entity) {
 # }
 ```
 
@@ -110,16 +103,13 @@ quite small. In short, we build a description of our app and then run it!
 # struct Model {}
 # fn main() {
     nannou::app(model)       // Start building the app and specify our `model`
-        .event(event)        // Specify that we want to handle app events with `event`
         .simple_window(view) // Request a simple window to which we'll draw with `view`
         .run();              // Run it!
 # }
 # fn model(_app: &App) -> Model {
 #     Model {}
 # }
-# fn event(_app: &App, _model: &mut Model, _event: Event) {
-# }
-# fn view(_app: &App, _model: &Model, _frame: Frame) {
+# fn view(_app: &App, _model: &Model, _window: Entity) {
 # }
 ```
 
@@ -195,8 +185,7 @@ will just return an instance of our empty **Model**.
 # #![allow(dead_code)]
 # use nannou::prelude::*;
 # struct Model {}
-fn event(_app: &App, _model: &mut Model, _event: Event) {
-}
+// TODO: Add an event function here!
 # fn main() {}
 ```
 
@@ -234,7 +223,7 @@ fn main() {
 # }
 # fn update(_app: &App, _model: &mut Model) {
 # }
-# fn view(_app: &App, _model: &Model, _frame: Frame) {
+# fn view(_app: &App, _model: &Model, _window: Entity) {
 # }
 ```
 
@@ -264,7 +253,7 @@ occurs.
 # #![allow(dead_code)]
 # use nannou::prelude::*;
 # struct Model {}
-fn view(_app: &App, _model: &Model, _frame: Frame) {
+fn view(_app: &App, _model: &Model, _window: Entity) {
 }
 # fn main() {}
 ```

guide/src/tutorials/basics/draw-a-sketch.md

@@ -55,7 +55,7 @@ After this import the actual sketching code starts. The `main()` functions is wh
 # fn main() {
     nannou::sketch(view).run();
 # }
-# fn view(_app: &App, _frame: Frame) {}
+# fn view(_app: &App) {}
 ```
 
 calls a function to draw on the single window (`view()` in this case). This
@@ -88,7 +88,7 @@ This function follows the same scheme. First some setup is done. The line
 # fn main() {
 #    nannou::sketch(view).run();
 # }
-# fn view(app: &App, _frame: Frame) {
+# fn view(app: &App) {
 let draw = app.draw();
 # }
 ```
@@ -102,7 +102,7 @@ We can now paint on the this canvas by setting the background to blue.
 # fn main() {
 #    nannou::sketch(view).run();
 # }
-# fn view(app: &App, _frame: Frame) {
+# fn view(app: &App) {
 # let draw = app.draw();
 draw.background().color(BLUE);
 # }

guide/src/tutorials/basics/sketch-vs-app.md

@@ -42,7 +42,7 @@ fn main() {
 fn view(app: &App) {
     let draw = app.draw();
     draw.background().color(PLUM);
-    draw.ellipse().color(STEELBLUE);
+    draw.ellipse().color(STEEL_BLUE);
     
 }
 ```
@@ -81,7 +81,7 @@ fn update(_app: &App, _model: &mut Model) {}
 fn view(app: &App, _model: &Model) {
     let draw = app.draw();
     draw.background().color(PLUM);
-    draw.ellipse().color(STEELBLUE);
+    draw.ellipse().color(STEEL_BLUE);
     
 }
 ```
@@ -119,7 +119,7 @@ flexibility, you can turn it into an app by following these steps:
    # fn main() {
    nannou::sketch(view).run()
    # }
-   # fn view(_: &App, _: Frame) {}
+   # fn view(_: &App) {}
    ```
 
    to
@@ -132,7 +132,7 @@ flexibility, you can turn it into an app by following these steps:
    # }
    # struct Model {}
    # fn model(_: &App) -> Model { Model {} }
-   # fn view(_: &App, _: &Model, _: Frame) {}
+   # fn view(_: &App, _: &Model, _: Entity) {}
    ```
 
 2. Add a `Model` for tracking state:
@@ -172,7 +172,7 @@ flexibility, you can turn it into an app by following these steps:
    # use nannou::prelude::*;
    # fn main() {}
    # struct Model {}
-   fn view(app: &App, _model: &Model) {
+   fn view(app: &App, _model: &Model, _window: Entity) {
    # }
    ```