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

Add morph targets #8158

Merged
merged 39 commits into from
Jun 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
85634b3
Add morph targets to bevy_pbr
nicopap Mar 10, 2023
e14d164
Replace GltfMeshExtras by MorphTragetNames
nicopap Apr 30, 2023
0317470
Apply doc suggestion
nicopap May 3, 2023
603956d
Rename loader.rs
nicopap May 3, 2023
e817b44
Use a simpler morph model; Do not bind to same wgsl variable
nicopap May 9, 2023
7baf474
Also fix prepass shader
nicopap May 9, 2023
fe79752
Be less gnomic in SetMeshBindGroup::render error messages
nicopap May 10, 2023
d9c62ca
Remove unused link in CREDITS.md
nicopap May 10, 2023
faa9e9a
Clear up match in queue_mesh_bind_group
nicopap May 10, 2023
0934898
Re-use common bind groups in queue_mesh_bind_group
nicopap May 10, 2023
d338d61
Update crates/bevy_pbr/src/render/mesh/morph.rs
nicopap May 10, 2023
b17c345
Clarify panic in add_to_alignment
nicopap May 10, 2023
0386f56
Fix animations
nicopap May 10, 2023
5f44424
Use resource to store mesh bind groups
nicopap May 26, 2023
11567bc
Make meshes queue_mesh_bind_group param immutable
nicopap May 26, 2023
b7c9051
Rename joint to skin for consistency
nicopap May 26, 2023
d1d9c2b
Keep naming consistent
nicopap May 26, 2023
5063b86
Remove has_skin method
nicopap May 26, 2023
2de9951
Remove HARDCODED_ATTRIBUTES
nicopap May 31, 2023
d40a694
Revert mesh module restructure
nicopap Jun 14, 2023
c48c36c
Fix doc error
nicopap Jun 16, 2023
62e4b68
Fix scene viewer
nicopap Jun 16, 2023
80b85a8
Rename function to setup morph shader defs
nicopap Jun 17, 2023
4e115a5
Add changes from #8581
nicopap Jun 17, 2023
14718bc
More minor fixups
nicopap Jun 17, 2023
68542f8
Remove extra ! in morph_targets example
nicopap Jun 17, 2023
719413a
Add morph targets caveats to TAA
nicopap Jun 17, 2023
ea1ebb1
Significantly simplify morph target construction
cart Jun 19, 2023
c21ed92
Fix typo
cart Jun 19, 2023
8a91994
Dont allocate morph target label when unnecessary
cart Jun 19, 2023
2720a52
Simply and optimize queue_mesh_bind_group
cart Jun 20, 2023
3b9755d
Move morph target names to Mesh
cart Jun 20, 2023
09437d6
Rename items of the 'morph' module
nicopap Jun 20, 2023
e0918a4
Spread clips across primitives. Give primitives unique / addressable …
cart Jun 21, 2023
4d08449
Simplify example
cart Jun 21, 2023
615de1a
Update morph_viewer_plugin to flat weigths
nicopap Jun 21, 2023
edb4b56
Split MorphWeights and MeshMorphWeights and re-add "morph inheritance…
cart Jun 21, 2023
1e8eba1
Merge remote-tracking branch 'origin/main' into pr/nicopap/8158
cart Jun 21, 2023
573d0ca
Swap out deprecated add_plugin
cart Jun 21, 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
13 changes: 10 additions & 3 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,15 @@
* Ground tile from [Kenney's Tower Defense Kit](https://www.kenney.nl/assets/tower-defense-kit) (CC0 1.0 Universal)
* Game icons from [Kenney's Game Icons](https://www.kenney.nl/assets/game-icons) (CC0 1.0 Universal)
* Space ships from [Kenny's Simple Space Kit](https://www.kenney.nl/assets/simple-space) (CC0 1.0 Universal)
* glTF animated fox from [glTF Sample Models](https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/Fox)
* Low poly fox [by PixelMannen](https://opengameart.org/content/fox-and-shiba) (CC0 1.0 Universal)
* Rigging and animation [by @tomkranis on Sketchfab](https://sketchfab.com/models/371dea88d7e04a76af5763f2a36866bc) ([CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/))
* glTF animated fox from [glTF Sample Models][fox]
* Low poly fox [by PixelMannen] (CC0 1.0 Universal)
* Rigging and animation [by @tomkranis on Sketchfab] ([CC-BY 4.0])
* FiraMono by The Mozilla Foundation and Telefonica S.A (SIL Open Font License, Version 1.1: assets/fonts/FiraMono-LICENSE)
* Barycentric from [mk_bary_gltf](https://github.com/komadori/mk_bary_gltf) (MIT OR Apache-2.0)
* `MorphStressTest.gltf`, [MorphStressTest] ([CC-BY 4.0] by Analytical Graphics, Inc, Model and textures by Ed Mackey)

[MorphStressTest]: https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/MorphStressTest
[fox]: https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0/Fox
[by PixelMannen]: https://opengameart.org/content/fox-and-shiba
[by @tomkranis on Sketchfab]: https://sketchfab.com/models/371dea88d7e04a76af5763f2a36866bc
[CC-BY 4.0]: https://creativecommons.org/licenses/by/4.0/
10 changes: 10 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,16 @@ description = "Plays an animation from a skinned glTF"
category = "Animation"
wasm = true

[[example]]
name = "morph_targets"
path = "examples/animation/morph_targets.rs"

[package.metadata.example.morph_targets]
name = "Morph Targets"
description = "Plays an animation from a glTF file with meshes with morph targets"
category = "Animation"
wasm = true

[[example]]
name = "animated_transform"
path = "examples/animation/animated_transform.rs"
Expand Down
Loading