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 Examples into Single Crate #554

Merged
merged 2 commits into from
Dec 31, 2023
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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ cargo-timing*
Cargo.lock

/profile.json
/examples/scene-viewer/resources/default-scene/
/examples/scene-viewer/resources/rend3-default-scene.tar
/examples/src/scene_viewer/resources/default-scene/
/examples/src/scene_viewer/resources/rend3-default-scene.tar

*-diff.png
*-success.png
Expand Down
9 changes: 1 addition & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
[workspace]
resolver = "2"
members = [
"examples/animation",
"examples/cube",
"examples/cube-no-framework",
"examples/egui",
"examples/scene-viewer",
"examples/skinning",
"examples/static-gltf",
"examples/textured-quad",
"examples/",
"rend3",
"rend3-anim",
"rend3-egui",
Expand Down
86 changes: 86 additions & 0 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
[package]
name = "rend3-examples"
license = "MIT OR Apache-2.0 OR Zlib"
version = "0.3.0"
authors = ["The rend3 Developers"]
edition = "2021"
publish = false
rust-version = "1.71"

[lib]
crate-type = ["lib", "cdylib"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
# error handling
anyhow = "1"
# The egui immediate mode gui library
egui = {git = "https://github.com/emilk/egui.git", branch="master"}
# Winit integration with egui (turn off the clipboard feature)
egui-winit = { git = "https://github.com/emilk/egui.git", branch="master", default-features = false, features = ["links", "wayland"] }
# logging
env_logger = { version = "0.10", default-features = false, features = ["auto-color", "humantime"] }
# Linear algebra library
glam = "0.24"
# gltf model loading
gltf = "1.4"
# 0.7 is a completely unrelated library
histogram = "0.6"
# Logging infrastructure
log = "0.4"
# Inline string
indoc = "1"
# Importing images
image = { version = "0.24", default-features = false, features = [
"png",
"jpeg",
"tiff",
] }
# profiling
profiling = "1"
# argument parsing
pico-args = "0.5"
# block on async functions
pollster = "0.3"
# Renderer core
rend3 = { version = "^0.3.0", path = "../rend3" }
# Play animations on imported gltf models
rend3-anim = { version = "^0.3.0", path = "../rend3-anim" }
# Egui integration with rend3
rend3-egui = { version = "^0.3.0", path = "../rend3-egui" }
# Programmable render list that dictates how the scene renders
rend3-routine = { version = "^0.3.0", path = "../rend3-routine" }
# Framework that deals with the event loop, setting up the renderer, and platform differences.
rend3-framework = { version = "^0.3.0", path = "../rend3-framework" }
# Import gltf models
rend3-gltf = { version = "^0.3.0", path = "../rend3-gltf" }
# Opening URL's
webbrowser = "0.8.2"
# Instant but portable to the web
web-time = "0.2"
# windowing
winit = "0.29.4"
# Integration with wgpu
wgpu = "0.18"
# Profiling with wgpu
wgpu-profiler = "0.15"

[target.'cfg(target_arch = "wasm32")'.dependencies]
console_log = "1"
console_error_panic_hook = "0.1"
js-sys = "0.3"
web-sys = "0.3"
wasm-bindgen = "0.2.83"
wasm-bindgen-futures = "0.4"

[target.'cfg(target_os = "android")'.dependencies]
ndk-glue = { version = "0.7", features = ["logger"] }

[package.metadata.android]
build_targets = ["aarch64-linux-android"]

[package.metadata.android.sdk]
min_sdk_version = 28
target_sdk_version = 28
compile_sdk_version = 28
2 changes: 1 addition & 1 deletion examples/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# rend3 Examples

The examples are separate crates, so to run an example run `cargo run --bin <name>`.
The examples are separate crates, so to run an example run `cargo run <name>`.

If you want to demo running rend3, [`scene-viewer`](scene-viewer) is what you should use. It is a full fledged gltf viewer.

Expand Down
57 changes: 0 additions & 57 deletions examples/animation/Cargo.toml

This file was deleted.

3 changes: 0 additions & 3 deletions examples/animation/src/main.rs

This file was deleted.

50 changes: 0 additions & 50 deletions examples/cube/Cargo.toml

This file was deleted.

3 changes: 0 additions & 3 deletions examples/cube/src/main.rs

This file was deleted.

42 changes: 0 additions & 42 deletions examples/egui/Cargo.toml

This file was deleted.

85 changes: 0 additions & 85 deletions examples/scene-viewer/Cargo.toml

This file was deleted.

3 changes: 0 additions & 3 deletions examples/scene-viewer/src/main.rs

This file was deleted.

Loading
Loading