/amethyst

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

feat: Deferred start animation #644

Merged
merged 1 commit into from Apr 22, 2018

Conversation

Reviewers

@jojolepro jojolepro

@Xaeroxe Xaeroxe

Assignees
No one assigned
Labels
Projects
None yet
Milestone
No milestone
3 participants
@Rhuagh @jojolepro @Xaeroxe
@Rhuagh
Member

Rhuagh commented Apr 15, 2018 •
edited by torkleyy
Edited 1 time
  • @torkleyy torkleyy edited Apr 15, 2018 (most recent)

Depends on #641.

This change is Reviewable

@Rhuagh Rhuagh added status: working project: animation labels Apr 15, 2018

@Xaeroxe Xaeroxe referenced this pull request Apr 17, 2018

Merged

Feature/634/sprite rendering and animation #638

@Rhuagh Rhuagh added type: improvement status: ready and removed status: working labels Apr 18, 2018

@Xaeroxe

Xaeroxe approved these changes Apr 20, 2018
View changes

LGTM!

examples/animation/main.rs
-const POINT_LIGHT_COLOUR: Rgba = Rgba(1.0, 1.0, 1.0, 1.0); // white
-const BACKGROUND_COLOUR: [f32; 4] = [0.0, 0.0, 0.0, 0.0]; // black
+const SPHERE_COLOUR: [f32; 4] = [0.0, 0.0, 1.0, 1.0];
+// blue

This comment has been minimized.

Show comment
Hide comment
@jojolepro

jojolepro Apr 20, 2018

Collaborator

Comments should be on top, not after
@jojolepro

jojolepro Apr 20, 2018

Collaborator

Comments should be on top, not after

This comment has been minimized.

Show comment
Hide comment
@Rhuagh

Rhuagh Apr 21, 2018

Member

rustfmt ftl
@Rhuagh

Rhuagh Apr 21, 2018

Member

rustfmt ftl

This comment has been minimized.

Show comment
Hide comment
@Rhuagh

Rhuagh Apr 21, 2018

Member

they used to be after the line, it moved it down ..
@Rhuagh

Rhuagh Apr 21, 2018

Member

they used to be after the line, it moved it down ..

This comment has been minimized.

Show comment
Hide comment
@Rhuagh

Rhuagh Apr 21, 2018

Member

Done
@Rhuagh

Rhuagh Apr 21, 2018

Member

Done
examples/animation/main.rs
+ );
+ }
+ {
+ let animation = world

This comment has been minimized.

Show comment
Hide comment
@jojolepro

jojolepro Apr 20, 2018

Collaborator

Any way to reuse this? The code duplication is getting out of control.
@jojolepro

jojolepro Apr 20, 2018

Collaborator

Any way to reuse this? The code duplication is getting out of control.

This comment has been minimized.

Show comment
Hide comment
@Rhuagh

Rhuagh Apr 21, 2018

Member

Done.
@Rhuagh

Rhuagh Apr 21, 2018

Member

Done.
examples/animation/main.rs
- loader.load_from_data(animation, (), &world.read_resource())
+ let animation_storage = world.read_resource();
+ let mut set = AnimationSet::<AnimationId, Transform>::new();
+ set.insert(

This comment has been minimized.

Show comment
Hide comment
@jojolepro

jojolepro Apr 20, 2018

Collaborator

Can you make a function please?
@jojolepro

jojolepro Apr 20, 2018

Collaborator

Can you make a function please?

This comment has been minimized.

Show comment
Hide comment
@Rhuagh

Rhuagh Apr 21, 2018

Member

Not sure it made it better, but there you go.
@Rhuagh

Rhuagh Apr 21, 2018

Member

Not sure it made it better, but there you go.
@jojolepro

jojolepro approved these changes Apr 21, 2018
View changes

Thanks!

@Rhuagh

This comment has been minimized.

Show comment
Hide comment
@Rhuagh

Rhuagh Apr 22, 2018

Member

bors r=Xaeroxe,jojolepro
Member

Rhuagh commented Apr 22, 2018

bors r=Xaeroxe,jojolepro

bors bot added a commit that referenced this pull request Apr 22, 2018

@bors[bot] @Rhuagh
Merge #644 
644: feat: Deferred start animation r=Xaeroxe,jojolepro a=Rhuagh

Depends on #641.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/amethyst/amethyst/644)
<!-- Reviewable:end -->


Co-authored-by: Simon Rönnberg <seamonr@gmail.com>
Loading status checks…
ba66d1d
@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors bot Apr 22, 2018

Contributor

Build succeeded
Contributor

bors bot commented Apr 22, 2018

Build succeeded

@bors bors bot merged commit 370e5df into amethyst:develop Apr 22, 2018
3 checks passed

3 checks passed

bors Build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@Rhuagh Rhuagh deleted the Rhuagh:feature/deferred-start-animation branch Apr 22, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment