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

Use BRender macro's + floats + move around code blocks #250

Merged
merged 59 commits into from
Jan 19, 2023

Conversation

madebr
Copy link
Collaborator

@madebr madebr commented Nov 21, 2022

The changes in this pr can be categorized in the following categories:

  • Use BRender macro's to modify the vector's
  • Use floats instead of doubles
  • Move around code blocks by inverting condentionals to decrease indentation levels
  • Use float functions instead of double ones (e.g. fabsf)
  • various fixes. (e.g. BoundsOverlapTest__finteray)

Functionally difference should be nil.

Co-authored-by: Dethrace Engineering Department <78985374+dethrace-labs@users.noreply.github.com>
v1 = fp->vertices[0];
a.v[0] = prepared->groups[group].vertices[v1].p.v[0] - bnds->box_centre.v[0];
Copy link
Owner

Choose a reason for hiding this comment

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

it breaks my brain looking at this bit, I'm going to skip past and assume its all good! :). Nice one!

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'm fixing the conflicts atm.
It's okay if you need more time to check everything.

Copy link
Owner

@dethrace-labs dethrace-labs Jan 15, 2023

Choose a reason for hiding this comment

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

all good, happy to merge as-is. I think these days we have enough history of functional behavior in PRs that it is relatively easy to step back in time if we see new unexpected behavior and tie it to a particular PR 👍

madebr and others added 2 commits January 16, 2023 00:10
Co-authored-by: Dethrace Engineering Department <78985374+dethrace-labs@users.noreply.github.com>
src/DETHRACE/common/car.c Outdated Show resolved Hide resolved
src/DETHRACE/common/car.c Outdated Show resolved Hide resolved
src/DETHRACE/common/car.c Outdated Show resolved Hide resolved
@dethrace-labs
Copy link
Owner

Are you ok to merge this now?

@madebr
Copy link
Collaborator Author

madebr commented Jan 16, 2023

Are you ok to merge this now?

Yes, but I would like to give it a last review tomorrow

@@ -48,7 +48,7 @@ void (*ControlCar[6])(tCar_spec*, br_scalar) = {
&ControlCar3,
&ControlCar4,
&ControlCar5,
NULL
NULL,
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

What is our convention about last comma in arrays?
Ancient compilers (gcc 3.x-era) do not support this.
My 2c is to don't care at the moment and do something about this when it's needed.

Copy link
Owner

Choose a reason for hiding this comment

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

Agree - I don't really mind either way. I don't generally add it myself.

src/DETHRACE/common/car.c Outdated Show resolved Hide resolved
src/DETHRACE/common/car.c Outdated Show resolved Hide resolved
src/DETHRACE/common/car.c Outdated Show resolved Hide resolved
src/DETHRACE/common/car.c Outdated Show resolved Hide resolved
@madebr madebr merged commit 83ba373 into dethrace-labs:main Jan 19, 2023
@madebr madebr deleted the ci-next-reworks branch January 19, 2023 17:00
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