Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move nannou_conrod and nannou_timeline into separate repository #855

Merged
merged 2 commits into from
May 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/nannou.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,8 @@ jobs:
- name: Cargo publish nannou_osc
continue-on-error: true
run: cargo publish --token $CRATESIO_TOKEN --manifest-path nannou_osc/Cargo.toml
- name: Cargo publish nannou_timeline
continue-on-error: true
run: cargo publish --token $CRATESIO_TOKEN --manifest-path nannou_timeline/Cargo.toml
- name: Wait for crates.io
run: sleep 15
- name: Cargo publish nannou_conrod
continue-on-error: true
run: cargo publish --token $CRATESIO_TOKEN --manifest-path nannou_conrod/Cargo.toml
- name: Cargo publish nannou_egui
continue-on-error: true
run: cargo publish --token $CRATESIO_TOKEN --manifest-path nannou_egui/Cargo.toml
Expand All @@ -201,6 +195,7 @@ jobs:
profile: minimal
toolchain: stable
override: true
- uses: Swatinem/rust-cache@v1
- name: Install mdbook
uses: actions-rs/cargo@v1
with:
Expand All @@ -225,6 +220,7 @@ jobs:
profile: minimal
toolchain: stable
override: true
- uses: Swatinem/rust-cache@v1
- name: Run guide tests
uses: actions-rs/cargo@v1
with:
Expand Down
2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ members = [
"guide/book_tests",
"nannou",
"nannou_audio",
"nannou_conrod",
"nannou_core",
"nannou_egui",
"nannou_egui_demo_app",
Expand All @@ -15,7 +14,6 @@ members = [
"nannou_new",
"nannou_osc",
"nannou_package",
"nannou_timeline",
"nannou_wgpu",
"nature_of_code",
"scripts/run_all_examples",
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,12 @@ The following nannou **libraries** are included within this repository.
| --- | --- | --- |
| [**`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. |
| [**`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. |
| [**`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. |
| [**`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. |
| [**`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. |
| [**`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. |
| [**`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. |
| [**`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. |
| [**`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. |
| [**`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. |
| [**`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. |

## Tools
Expand Down
11 changes: 0 additions & 11 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@ hotglsl = { git = "https://github.com/nannou-org/hotglsl", branch = "master" }
hrtf = "0.2"
nannou = { version ="0.18.0", path = "../nannou" }
nannou_audio = { version ="0.18.0", path = "../nannou_audio" }
nannou_conrod = { version ="0.18.0", path = "../nannou_conrod" }
nannou_egui = { version = "0.5.0", path = "../nannou_egui" }
nannou_isf = { version = "0.1.0", path = "../nannou_isf" }
nannou_laser = { version ="0.18.0", features = ["ffi", "ilda-idtf"], path = "../nannou_laser" }
nannou_osc = { version ="0.18.0", path = "../nannou_osc" }
nannou_timeline = { version ="0.18.0", features = ["serde1"], path = "../nannou_timeline" }
pitch_calc = { version = "0.12", features = ["serde"] }
time_calc = { version= "0.13", features = ["serde"] }
walkdir = "2"
Expand Down Expand Up @@ -190,15 +188,6 @@ path = "templates/template_sketch.rs"

# User Interface
[[example]]
name = "named_color_reference"
path = "ui/conrod/named_color_reference.rs"
[[example]]
name = "simple_ui"
path = "ui/conrod/simple_ui.rs"
[[example]]
name = "timeline_demo"
path = "ui/conrod/timeline_demo.rs"
[[example]]
name = "circle_packing"
path = "ui/egui/circle_packing.rs"
[[example]]
Expand Down
Loading