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

Fix examples using ron spritesheets #2036

Merged
merged 1 commit into from Nov 15, 2019
Merged

Conversation

@0x6273
Copy link
Contributor

0x6273 commented Nov 12, 2019

Description

#2023 changed the spritesheet struct, which broke some of the examples that tried to load the old struct from ron files. This pr updates those ron files to use the new Sprites struct.

Modifications

  • update some example ron files to use the new Sprites struct

PR Checklist

By placing an x in the boxes I certify that I have:

  • Updated the content of the book if this PR would make the book outdated.
  • Added a changelog entry if this will impact users, or modified more than 5 lines of Rust that wasn't a doc comment.
  • Added unit tests for new code added in this PR.
  • Acknowledged that by making this pull request I release this code under an MIT/Apache 2.0 dual licensing scheme.

If this modified or created any rs files:

  • Ran cargo +stable fmt --all
  • Ran cargo clippy --all --features "empty"
  • Ran cargo test --all --features "empty"
@0x6273 0x6273 force-pushed the 0x6273:fix_spritesheet_examples branch from 7f0d667 to 15dd8c9 Nov 12, 2019
@codecov

This comment has been minimized.

Copy link

codecov bot commented Nov 12, 2019

Codecov Report

Merging #2036 into master will increase coverage by 3.22%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #2036      +/-   ##
=========================================
+ Coverage   80.27%   83.5%   +3.22%     
=========================================
  Files          78      78              
  Lines        5791    5791              
=========================================
+ Hits         4649    4836     +187     
+ Misses       1142     955     -187
Impacted Files Coverage Δ
amethyst_core/src/timing.rs 98.58% <0%> (+2.83%) ⬆️
amethyst_rendy/src/camera.rs 93.85% <0%> (+7.12%) ⬆️
amethyst_utils/src/ortho_camera.rs 100% <0%> (+8.27%) ⬆️
amethyst_assets/src/dyn_format.rs 82.85% <0%> (+8.57%) ⬆️
amethyst_network/src/simulation/transport.rs 99.23% <0%> (+12.3%) ⬆️
amethyst_error/src/lib.rs 95.34% <0%> (+23.25%) ⬆️
amethyst_gltf/src/format/mesh.rs 94.44% <0%> (+24.07%) ⬆️
src/state.rs 71.29% <0%> (+71.29%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 38f04eb...15dd8c9. Read the comment docs.

Copy link
Member

azriel91 left a comment

Thank you very much 🙇

@azriel91

This comment has been minimized.

Copy link
Member

azriel91 commented Nov 15, 2019

bors r+

bors bot added a commit that referenced this pull request Nov 15, 2019
Merge #2036
2036: Fix examples using ron spritesheets r=azriel91 a=0x6273

## Description

#2023 changed the spritesheet struct, which broke some of the examples that tried to load the old struct from ron files. This pr updates those ron files to use the new `Sprites` struct. 

## Modifications

- update some example ron files to use the new `Sprites` struct

## PR Checklist

By placing an x in the boxes I certify that I have:

- [x] Updated the content of the book if this PR would make the book outdated.
- [x] Added a changelog entry if this will impact users, or modified more than 5 lines of Rust that wasn't a doc comment.
- [x] Added unit tests for new code added in this PR.
- [x] Acknowledged that by making this pull request I release this code under an MIT/Apache 2.0 dual licensing scheme.

If this modified or created any rs files:

- [x] Ran `cargo +stable fmt --all`
- [x] Ran `cargo clippy --all --features "empty"`
- [x] Ran `cargo test --all --features "empty"`

Co-authored-by: 0x40 <0x40@keemail.me>
@bors

This comment has been minimized.

Copy link
Contributor

bors bot commented Nov 15, 2019

@bors bors bot merged commit 15dd8c9 into amethyst:master Nov 15, 2019
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/jenkins/pr-merge This commit cannot be built
Details
bors Build succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.