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

chore: Update cicd.yml file on flame_3d to match main, rollback color changes #3378

Merged
merged 6 commits into from
Dec 10, 2024

Conversation

luanpotter
Copy link
Member

@luanpotter luanpotter commented Dec 10, 2024

Description

Update cicd.yml file on flame_3d to match main.

Since we finally updated main, we should require no difference whatsoever on this file anymore.

This will require downgrading all the color changes, which is fine. This should never have been a part of flame_3d to begin with.

Files were "untouched" by checking out the exact version as they are in main right now (will need to rebase flame_3d to main later). I had to add a couple more files because the files on main had dependencies on changes that are not yet rebased on flame_3d. These extra diffs should disappear when I do the final rebase.

Checklist

  • I have followed the Contributor Guide when preparing my PR.
  • I have updated/added tests for ALL new/updated/fixed functionality.
  • I have updated/added relevant documentation in docs and added dartdoc comments with ///.
  • I have updated/added relevant examples in examples or docs.

Breaking Change?

  • Yes, this PR is a breaking change.
  • No, this PR is not a breaking change.

@luanpotter luanpotter changed the title chore: Update cicd.yml file on flame_3d to match main chore: Update cicd.yml file on flame_3d to match main, rollback color changes Dec 10, 2024
@luanpotter luanpotter marked this pull request as ready for review December 10, 2024 17:03
@luanpotter luanpotter requested a review from spydon December 10, 2024 17:03
Copy link
Member

@spydon spydon left a comment

Choose a reason for hiding this comment

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

Some comments aren't related to this PR

@@ -13,7 +13,7 @@ class RayCastExample extends FlameGame with HasCollisionDetection {
final velocity = 60;
double get resetPosition => -canvasSize.y;

Paint paint = BasicPalette.red.withOpacity(0.6).paint();
Paint paint = Paint()..color = Colors.red.withOpacity(0.6);
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Paint paint = Paint()..color = Colors.red.withOpacity(0.6);
final Paint paint = Paint()..color = Colors.red.withOpacity(0.6);

Copy link
Member Author

Choose a reason for hiding this comment

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

this is copied as is from main - you can fix on a separate PR!

@@ -10,7 +10,7 @@ import 'package:flutter/material.dart';

class RayTraceExample extends FlameGame
with HasCollisionDetection, TapDetector {
Paint paint = BasicPalette.red.withOpacity(0.6).paint();
Paint paint = Paint()..color = Colors.red.withOpacity(0.6);
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Paint paint = Paint()..color = Colors.red.withOpacity(0.6);
final Paint paint = Paint()..color = Colors.red.withOpacity(0.6);

Copy link
Member Author

Choose a reason for hiding this comment

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

this is copied as is from main - you can fix on a separate PR!

@@ -13,7 +13,7 @@ class ResizingRectangle extends RectangleComponent {
void onGameResize(Vector2 size) {
super.onGameResize(size);

this.size = size * 0.4;
this.size = size * .4;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
this.size = size * .4;
this.size = size * 0.4;

Copy link
Member Author

Choose a reason for hiding this comment

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

this is copied as is from main - you can fix on a separate PR!

getPaint(paintId).color.withValues(alpha: opacity),
paintId: paintId,
);
setColor(getPaint(paintId).color.withOpacity(opacity), paintId: paintId);
Copy link
Member

Choose a reason for hiding this comment

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

This was easier to read with the trailing comma

Copy link
Member Author

Choose a reason for hiding this comment

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

this is copied as is from main - you can fix on a separate PR!

Comment on lines +6 to +11
Float32List get storage => Float32List.fromList([
opacity,
red.toDouble() / 255,
green.toDouble() / 255,
blue.toDouble() / 255,
]);
Copy link
Member

Choose a reason for hiding this comment

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

How come this changed? 🤔

Copy link
Member Author

Choose a reason for hiding this comment

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

I am reverting the color changes to the old version

@@ -182,7 +182,6 @@ void main() {
test(
Copy link
Member

Choose a reason for hiding this comment

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

Only the skips should be changed in this file right?

Copy link
Member Author

Choose a reason for hiding this comment

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

I just copied whatever it is in main. it should disappear once I rebase

@@ -92,6 +92,7 @@ void main() {
expect(atlas.key, 'images/green.png');
Copy link
Member

Choose a reason for hiding this comment

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

Only the skips should be changed in this file right?

Copy link
Member Author

Choose a reason for hiding this comment

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

I just copied whatever it is in main. it should disappear once I rebase

@luanpotter luanpotter requested a review from spydon December 10, 2024 19:39
@spydon spydon merged commit 6ececca into flame_3d Dec 10, 2024
8 checks passed
@spydon spydon deleted the luan.update-cicd branch December 10, 2024 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants