Skip to content

Commit 8630c00

Browse files
committed
Move nannou_conrod and nannou_timeline into separate repository
Both crates have been deprecated in favour of `nannou_egui` and have moved into a separate repository: https://github.com/nannou-org/nannou_conrod See the following issue for some context on the motivations behind switching to nannou_egui: PistonDevelopers/conrod#1454 See the following PR for the merge of `nannou_egui` into the main nannou repository: nannou-org#854 Conrod-specific examples have been moved to the separate `nannou_conrod` repo, while other examples that used `nannou_conrod` have been transitioned use `nannou_egui`.
1 parent 70fa9c1 commit 8630c00

38 files changed

+8
-6161
lines changed

.github/workflows/nannou.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,8 @@ jobs:
177177
- name: Cargo publish nannou_osc
178178
continue-on-error: true
179179
run: cargo publish --token $CRATESIO_TOKEN --manifest-path nannou_osc/Cargo.toml
180-
- name: Cargo publish nannou_timeline
181-
continue-on-error: true
182-
run: cargo publish --token $CRATESIO_TOKEN --manifest-path nannou_timeline/Cargo.toml
183180
- name: Wait for crates.io
184181
run: sleep 15
185-
- name: Cargo publish nannou_conrod
186-
continue-on-error: true
187-
run: cargo publish --token $CRATESIO_TOKEN --manifest-path nannou_conrod/Cargo.toml
188182
- name: Cargo publish nannou_egui
189183
continue-on-error: true
190184
run: cargo publish --token $CRATESIO_TOKEN --manifest-path nannou_egui/Cargo.toml
@@ -201,6 +195,7 @@ jobs:
201195
profile: minimal
202196
toolchain: stable
203197
override: true
198+
- uses: Swatinem/rust-cache@v1
204199
- name: Install mdbook
205200
uses: actions-rs/cargo@v1
206201
with:
@@ -225,6 +220,7 @@ jobs:
225220
profile: minimal
226221
toolchain: stable
227222
override: true
223+
- uses: Swatinem/rust-cache@v1
228224
- name: Run guide tests
229225
uses: actions-rs/cargo@v1
230226
with:

Cargo.toml

-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ members = [
55
"guide/book_tests",
66
"nannou",
77
"nannou_audio",
8-
"nannou_conrod",
98
"nannou_core",
109
"nannou_egui",
1110
"nannou_egui_demo_app",
@@ -15,7 +14,6 @@ members = [
1514
"nannou_new",
1615
"nannou_osc",
1716
"nannou_package",
18-
"nannou_timeline",
1917
"nannou_wgpu",
2018
"nature_of_code",
2119
"scripts/run_all_examples",

README.md

-2
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,12 @@ The following nannou **libraries** are included within this repository.
7272
| --- | --- | --- |
7373
| [**`nannou`**](./nannou) | [![Crates.io](https://img.shields.io/crates/v/nannou.svg)](https://crates.io/crates/nannou) [![docs.rs](https://docs.rs/nannou/badge.svg)](https://docs.rs/nannou/) | App, sketching, graphics, windowing and UI. |
7474
| [**`nannou_audio`**](./nannou_audio) | [![Crates.io](https://img.shields.io/crates/v/nannou_audio.svg)](https://crates.io/crates/nannou_audio) [![docs.rs](https://docs.rs/nannou_audio/badge.svg)](https://docs.rs/nannou_audio/) | Audio hosts, devices and streams. |
75-
| [**`nannou_conrod`**](./nannou_conrod) | [![Crates.io](https://img.shields.io/crates/v/nannou_conrod.svg)](https://crates.io/crates/nannou_conrod) [![docs.rs](https://docs.rs/nannou_conrod/badge.svg)](https://docs.rs/nannou_conrod/) | For creating conrod UIs in nannou apps. |
7675
| [**`nannou_core`**](./nannou_core) | [![Crates.io](https://img.shields.io/crates/v/nannou_core.svg)](https://crates.io/crates/nannou_core) [![docs.rs](https://docs.rs/nannou_core/badge.svg)](https://docs.rs/nannou_core/) | Just-the-core for headless, embedded and libraries. |
7776
| [**`nannou_egui`**](./nannou_egui) | [![Crates.io](https://img.shields.io/crates/v/nannou_egui.svg)](https://crates.io/crates/nannou_egui) [![docs.rs](https://docs.rs/nannou_egui/badge.svg)](https://docs.rs/nannou_egui/) | For creating egui UIs in nannou apps. |
7877
| [**`nannou_isf`**](./nannou_isf) | [![Crates.io](https://img.shields.io/crates/v/nannou_isf.svg)](https://crates.io/crates/nannou_isf) [![docs.rs](https://docs.rs/nannou_isf/badge.svg)](https://docs.rs/nannou_isf/) | An Interactive Shader Format pipeline. |
7978
| [**`nannou_laser`**](./nannou_laser) | [![Crates.io](https://img.shields.io/crates/v/nannou_laser.svg)](https://crates.io/crates/nannou_laser) [![docs.rs](https://docs.rs/nannou_laser/badge.svg)](https://docs.rs/nannou_laser/) | LASER devices, streams and path optimisation. |
8079
| [**`nannou_mesh`**](./nannou_mesh) | [![Crates.io](https://img.shields.io/crates/v/nannou_mesh.svg)](https://crates.io/crates/nannou_mesh) [![docs.rs](https://docs.rs/nannou_mesh/badge.svg)](https://docs.rs/nannou_mesh/) | API for composing meshes from channels. |
8180
| [**`nannou_osc`**](./nannou_osc) | [![Crates.io](https://img.shields.io/crates/v/nannou_osc.svg)](https://crates.io/crates/nannou_osc) [![docs.rs](https://docs.rs/nannou_osc/badge.svg)](https://docs.rs/nannou_osc/) | Simple OSC sender and receiver. |
82-
| [**`nannou_timeline`**](./nannou_timeline) | [![Crates.io](https://img.shields.io/crates/v/nannou_timeline.svg)](https://crates.io/crates/nannou_timeline) [![docs.rs](https://docs.rs/nannou_timeline/badge.svg)](https://docs.rs/nannou_timeline/) | A timeline widget for nannou GUIs. |
8381
| [**`nannou_wgpu`**](./nannou_wgpu) | [![Crates.io](https://img.shields.io/crates/v/nannou_wgpu.svg)](https://crates.io/crates/nannou_wgpu) [![docs.rs](https://docs.rs/nannou_wgpu/badge.svg)](https://docs.rs/nannou_wgpu/) | WGPU helpers and extensions. |
8482

8583
## Tools

examples/Cargo.toml

-11
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ hotglsl = { git = "https://github.com/nannou-org/hotglsl", branch = "master" }
2020
hrtf = "0.2"
2121
nannou = { version ="0.18.0", path = "../nannou" }
2222
nannou_audio = { version ="0.18.0", path = "../nannou_audio" }
23-
nannou_conrod = { version ="0.18.0", path = "../nannou_conrod" }
2423
nannou_egui = { version = "0.5.0", path = "../nannou_egui" }
2524
nannou_isf = { version = "0.1.0", path = "../nannou_isf" }
2625
nannou_laser = { version ="0.18.0", features = ["ffi", "ilda-idtf"], path = "../nannou_laser" }
2726
nannou_osc = { version ="0.18.0", path = "../nannou_osc" }
28-
nannou_timeline = { version ="0.18.0", features = ["serde1"], path = "../nannou_timeline" }
2927
pitch_calc = { version = "0.12", features = ["serde"] }
3028
time_calc = { version= "0.13", features = ["serde"] }
3129
walkdir = "2"
@@ -190,15 +188,6 @@ path = "templates/template_sketch.rs"
190188

191189
# User Interface
192190
[[example]]
193-
name = "named_color_reference"
194-
path = "ui/conrod/named_color_reference.rs"
195-
[[example]]
196-
name = "simple_ui"
197-
path = "ui/conrod/simple_ui.rs"
198-
[[example]]
199-
name = "timeline_demo"
200-
path = "ui/conrod/timeline_demo.rs"
201-
[[example]]
202191
name = "circle_packing"
203192
path = "ui/egui/circle_packing.rs"
204193
[[example]]

0 commit comments

Comments
 (0)