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

Various work for upstream #93

Merged
merged 86 commits into from
Feb 23, 2022

Conversation

madebr
Copy link
Collaborator

@madebr madebr commented Feb 22, 2022

brender changes:

  • Add a few function declarations to brender.h, such that dethrace may use it.
  • change the typedef for br_size_t from uint32_t to size_t.
  • sort the tokens in br_types.h by value, instead of by name.
  • implement all genclip functions (=clipping of rectangles with rectangles + points)
  • implement brender lexer, associative array, dbsetup, resource, resreg, pmnull functions
  • Fix the brender init string. It is different between the DOS executable and Windows
  • Use BR_ASIZE and COUNT_OF in various places instead of hardcoding magic values

dethrace changes:

  • implement all missing input functions
  • implement various edit mode callback functions
  • Add WARN_ONCE macro to avoid spam
  • implement dimmed rounded rectangled for the HUD background

various:

  • add option to select orderkey in tools/progress.py, by ordering on name it becomes easy to diff progress
  • add script to decode text files (tools/decode_datatxt.py)

plus many other changes

name                                          percent	completed / total
=======================================
total                                            46%	1609 / 3467

The big bump in percentage is due to implementing many little functions in powerup.c and pmnull.c + others.
TBH, this percentage says nothing about real progress.

Screenshot from 2022-02-22 20-32-35

Screenshot from 2022-02-22 22-01-59

Screenshot from 2022-02-22 22-02-08

src/BRSRC13/CORE/V1DB/dbsetup.c Outdated Show resolved Hide resolved
src/BRSRC13/CORE/V1DB/dbsetup.c Outdated Show resolved Hide resolved
src/BRSRC13/CORE/V1DB/dbsetup.c Outdated Show resolved Hide resolved
src/BRSRC13/CORE/V1DB/modrend.c Outdated Show resolved Hide resolved
src/DETHRACE/common/depth.c Outdated Show resolved Hide resolved
src/DETHRACE/common/loading.c Outdated Show resolved Hide resolved
@@ -178,6 +178,7 @@ int DRSceneRayPick2D(br_actor* world, br_vector3* pPosition, br_vector3* pDir, d
LOG_TRACE("(%p, %p, %p, %p)", world, pPosition, pDir, callback);

BrMatrix34Inverse(&gPick_model_to_view__finteray, &world->t.t.mat);
LOG_WARN_ONCE("Missing material and model pointers to ActorRayPick2D");
Copy link
Owner

Choose a reason for hiding this comment

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

Whats the purpose of the warning here? These params are used as defaults and are always deliberately set to null

Copy link
Collaborator Author

@madebr madebr Feb 22, 2022

Choose a reason for hiding this comment

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

I think this function is called with a material and model pointer, but I don't know what one and how it is used.
At least, it's not NULL.

@@ -608,6 +610,7 @@ void InitRace() {
InitPlayers();
if (gNet_mode) {
gProgram_state.credits_earned = gInitial_net_credits[gCurrent_net_game->options.starting_money_index];
InitNetGameplayStuff();
Copy link
Owner

Choose a reason for hiding this comment

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

👍

@dethrace-labs
Copy link
Owner

Amazing work!

@dethrace-labs dethrace-labs merged commit 26fd105 into dethrace-labs:main Feb 23, 2022
@madebr madebr deleted the various-work-for-upstream branch February 23, 2022 03:39
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.

None yet

2 participants