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

Immediate Mode Line/Gizmo Drawing #6529

Merged
merged 72 commits into from
Mar 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
92bfe58
sordid
tim-blackbird Oct 29, 2022
1bffe97
Update API. Add basic shapes.
tim-blackbird Oct 30, 2022
ef56b4c
missing docs
tim-blackbird Nov 1, 2022
074a7ae
hmm
tim-blackbird Nov 8, 2022
5047dfa
gradients
tim-blackbird Nov 8, 2022
4ae28fa
aab no more
tim-blackbird Nov 8, 2022
0c96d1a
Move DebugDraw to a separate file
tim-blackbird Nov 9, 2022
71c6b7d
n
tim-blackbird Nov 9, 2022
ca36a25
deps
tim-blackbird Nov 9, 2022
b18958b
Add stress test
tim-blackbird Nov 10, 2022
5e59366
fancy
tim-blackbird Nov 10, 2022
ca5b5d0
disable v-sync, add warning, appease clippy
tim-blackbird Nov 10, 2022
f779073
No depth in 2D
tim-blackbird Nov 11, 2022
6caacf4
docs + added ray_gradient_2d
tim-blackbird Nov 11, 2022
ad38f88
inline
tim-blackbird Nov 11, 2022
037f6f7
ghwhitespaac
tim-blackbird Nov 11, 2022
bd52664
No RenderApp? No problem.
tim-blackbird Nov 11, 2022
2ece922
cleanup
tim-blackbird Nov 14, 2022
cde2c97
visibility
tim-blackbird Nov 14, 2022
ce449c9
LineStrip!
tim-blackbird Nov 14, 2022
93c110c
linestrip
tim-blackbird Nov 14, 2022
d22c300
gizmo wip
tim-blackbird Dec 5, 2022
1ed7e50
ugh
tim-blackbird Dec 5, 2022
1063787
don't use `VisibleEntities`
tim-blackbird Dec 5, 2022
10de985
fiddle
tim-blackbird Dec 5, 2022
9531eb4
ogo
tim-blackbird Dec 5, 2022
afac8bf
re-add uniforms
tim-blackbird Dec 5, 2022
5d32462
bop
tim-blackbird Dec 5, 2022
98a529a
wip
tim-blackbird Dec 6, 2022
f7b2d7d
w
tim-blackbird Dec 6, 2022
01eee7c
hmm
tim-blackbird Dec 6, 2022
9505b6a
`Buffer` is neat
tim-blackbird Dec 6, 2022
b817b97
debug_draw > gizmos
tim-blackbird Jan 22, 2023
2f7da70
fire
tim-blackbird Feb 6, 2023
98a3362
Merge branch 'main' into debug-draw
tim-blackbird Feb 6, 2023
456a3eb
Fixes
tim-blackbird Feb 6, 2023
c516022
More fixes
tim-blackbird Feb 7, 2023
e6eb1e5
stress test example fix
tim-blackbird Feb 7, 2023
7923101
Remove comment
tim-blackbird Feb 7, 2023
7a79b6f
clippy and example metadata
tim-blackbird Feb 7, 2023
de66229
Renames and docs
tim-blackbird Feb 7, 2023
caa504e
Make `GizmoConfig::enabled` do somehing
tim-blackbird Feb 7, 2023
2885258
Support bloom
tim-blackbird Feb 7, 2023
703039d
`cargo fmt`
tim-blackbird Feb 7, 2023
c5db40c
SHADER_HANDLE > LINE_SHADER_HANDLE
tim-blackbird Feb 7, 2023
14b1ca0
More descriptive system names
tim-blackbird Feb 7, 2023
95ebbde
missed rename
tim-blackbird Feb 7, 2023
4b2b826
wip 3d
IceSentry Feb 24, 2023
60aa2b2
clean up
IceSentry Feb 24, 2023
192c329
2d
IceSentry Feb 24, 2023
92cba1e
clean up
IceSentry Feb 24, 2023
1230d2b
extract node 2d to core_pipeline
IceSentry Feb 24, 2023
ef546ce
extract node 3d to core pipeline
IceSentry Feb 25, 2023
2f1a35d
Merge pull request #1 from IceSentry/gizmo-node
tim-blackbird Feb 26, 2023
56aef46
Merge branch 'main' into debug-draw
tim-blackbird Feb 26, 2023
5654d3c
Fix merge issues
tim-blackbird Feb 26, 2023
f6500f5
Allow wiresphere to be rotated
tim-blackbird Feb 26, 2023
62cfa9e
Enable alpha blending for gimzos in 3d
tim-blackbird Feb 26, 2023
645a2a6
Use `Default::default()` where possible in `RenderPipelineDescriptor`
tim-blackbird Feb 26, 2023
2512479
Revert "extract node 3d to core pipeline"
tim-blackbird Feb 27, 2023
ee04648
Revert "extract node 2d to core_pipeline"
tim-blackbird Feb 27, 2023
923bdd2
Revert "wip 3d"
tim-blackbird Feb 27, 2023
f0d8826
Disable alpha blending in 3D.
tim-blackbird Feb 27, 2023
2319cc8
Add `on_top` setting toggle to the 3d_gizmos example
tim-blackbird Feb 27, 2023
1b513dc
Merge branch 'main' into debug-draw
tim-blackbird Mar 11, 2023
9e01850
Update to `0.11.0-dev`
tim-blackbird Mar 11, 2023
0afc506
clippy
tim-blackbird Mar 11, 2023
7d5d8dc
:U
tim-blackbird Mar 11, 2023
854ed62
Document `bevy_gizmos` feature
tim-blackbird Mar 11, 2023
068c278
Merge branch 'main' into debug-draw
tim-blackbird Mar 18, 2023
675eee5
Merge remote-tracking branch 'origin/main' into pr/devil-ira/6529
cart Mar 20, 2023
d81680a
Add gizmos to publish script
cart Mar 20, 2023
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
34 changes: 34 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ default = [
"vorbis",
"x11",
"filesystem_watcher",
"bevy_gizmos",
"android_shared_stdcxx",
"tonemapping_luts",
]
Expand Down Expand Up @@ -98,6 +99,9 @@ bevy_ui = ["bevy_internal/bevy_ui", "bevy_core_pipeline", "bevy_text", "bevy_spr
# winit window and input backend
bevy_winit = ["bevy_internal/bevy_winit"]

# Adds support for rendering gizmos
bevy_gizmos = ["bevy_internal/bevy_gizmos"]

# Tracing support, saving a file in Chrome Tracing format
trace_chrome = ["trace", "bevy_internal/trace_chrome"]

Expand Down Expand Up @@ -309,6 +313,16 @@ description = "Renders a rectangle, circle, and hexagon"
category = "2D Rendering"
wasm = true

[[example]]
name = "2d_gizmos"
path = "examples/2d/2d_gizmos.rs"

[package.metadata.example.2d_gizmos]
name = "2D Gizmos"
description = "A scene showcasing 2D gizmos"
category = "2D Rendering"
wasm = true

[[example]]
name = "sprite"
path = "examples/2d/sprite.rs"
Expand Down Expand Up @@ -400,6 +414,16 @@ description = "A scene showcasing the built-in 3D shapes"
category = "3D Rendering"
wasm = true

[[example]]
name = "3d_gizmos"
path = "examples/3d/3d_gizmos.rs"

[package.metadata.example.3d_gizmos]
name = "3D Gizmos"
description = "A scene showcasing 3D gizmos"
category = "3D Rendering"
wasm = true

[[example]]
name = "atmospheric_fog"
path = "examples/3d/atmospheric_fog.rs"
Expand Down Expand Up @@ -1553,6 +1577,16 @@ description = "Simple benchmark to test per-entity draw overhead. Run with the `
category = "Stress Tests"
wasm = true

[[example]]
name = "many_gizmos"
path = "examples/stress_tests/many_gizmos.rs"

[package.metadata.example.many_gizmos]
name = "Many Gizmos"
description = "Test rendering of many gizmos"
category = "Stress Tests"
wasm = true

[[example]]
name = "many_foxes"
path = "examples/stress_tests/many_foxes.rs"
Expand Down
23 changes: 23 additions & 0 deletions crates/bevy_gizmos/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[package]
name = "bevy_gizmos"
version = "0.11.0-dev"
edition = "2021"
description = "Provides gizmos for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
license = "MIT OR Apache-2.0"
keywords = ["bevy"]

[dependencies]
# Bevy
bevy_pbr = { path = "../bevy_pbr", version = "0.11.0-dev", optional = true }
bevy_sprite = { path = "../bevy_sprite", version = "0.11.0-dev", optional = true }
bevy_app = { path = "../bevy_app", version = "0.11.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.11.0-dev" }
bevy_math = { path = "../bevy_math", version = "0.11.0-dev" }
bevy_asset = { path = "../bevy_asset", version = "0.11.0-dev" }
bevy_render = { path = "../bevy_render", version = "0.11.0-dev" }
bevy_utils = { path = "../bevy_utils", version = "0.11.0-dev" }
bevy_core = { path = "../bevy_core", version = "0.11.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.11.0-dev" }
bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.11.0-dev" }
Loading