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

[Merged by Bors] - Make the iter_combinators examples more pretty #3075

Closed
wants to merge 4 commits into from

Conversation

DJMcNab
Copy link
Member

@DJMcNab DJMcNab commented Nov 5, 2021

Objective

  • More colours

Solution

  • Various changes
  • Would have a video here, but don't have an easy way to record one before I go to sleep
  • I intend to additionally change the distribution of the satellites, to be more uniform in space.

@github-actions github-actions bot added the S-Needs-Triage This issue needs to be labelled label Nov 5, 2021
@alice-i-cecile alice-i-cecile added C-Code-Quality A section of code that is hard to understand or change C-Examples An addition or correction to our examples S-Needs-Review and removed S-Needs-Triage This issue needs to be labelled labels Nov 5, 2021
@mockersf
Copy link
Member

mockersf commented Nov 5, 2021

Screen.Recording.2021-11-06.at.00.37.45.mov

@cart
Copy link
Member

cart commented Jan 6, 2022

bors r+

bors bot pushed a commit that referenced this pull request Jan 6, 2022
# Objective

- More colours

## Solution

- Various changes
- Would have a video here, but don't have an easy way to record one before I go to sleep
- I intend to additionally change the distribution of the satellites, to be more uniform in space.
@bors
Copy link
Contributor

bors bot commented Jan 6, 2022

Build failed:

@alice-i-cecile
Copy link
Member

bors try

bors bot added a commit that referenced this pull request Jan 6, 2022
@bors
Copy link
Contributor

bors bot commented Jan 6, 2022

try

Build failed:

Copy link
Member

@mockersf mockersf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried running on rebased main, the light doesn't work anymore as it needs other components from the PointLightBundle

Could you apply this change to your PR branch?

--- a/examples/ecs/iter_combinations.rs
+++ b/examples/ecs/iter_combinations.rs
@@ -127,14 +127,19 @@ fn generate_bodies(
             mass: Mass(500.0),
             ..Default::default()
         })
-        .insert(PointLight {
-            color: Color::WHITE,
-            intensity: 400.,
-            range: 100.,
-            radius: star_radius,
-            ..Default::default()
-        })
-        .insert(Star);
+        .insert(Star)
+        .with_children(|p| {
+            p.spawn_bundle(PointLightBundle {
+                point_light: PointLight {
+                    color: Color::WHITE,
+                    intensity: 400.0,
+                    range: 100.0,
+                    radius: star_radius,
+                    ..Default::default()
+                },
+                ..Default::default()
+            });
+        });
     commands.spawn_bundle(PerspectiveCameraBundle {
         transform: Transform::from_xyz(0.0, 10.5, -30.0).looking_at(Vec3::ZERO, Vec3::Y),
         ..Default::default()

DJMcNab and others added 4 commits January 6, 2022 09:29
Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
Co-authored-by: François <mockersf@gmail.com>
Co-authored-by: François <mockersf@gmail.com>
@DJMcNab DJMcNab force-pushed the combinators-pretty branch from 65d6342 to 4f1b2df Compare January 6, 2022 09:37
@alice-i-cecile
Copy link
Member

bors r+

bors bot pushed a commit that referenced this pull request Jan 6, 2022
# Objective

- More colours

## Solution

- Various changes
- Would have a video here, but don't have an easy way to record one before I go to sleep
- I intend to additionally change the distribution of the satellites, to be more uniform in space.
@bors bors bot changed the title Make the iter_combinators examples more pretty [Merged by Bors] - Make the iter_combinators examples more pretty Jan 6, 2022
@bors bors bot closed this Jan 6, 2022
@DJMcNab DJMcNab deleted the combinators-pretty branch January 6, 2022 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-Code-Quality A section of code that is hard to understand or change C-Examples An addition or correction to our examples
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants