Move most skeleton stuff to engine by VReaperV · Pull Request #1489 · DaemonEngine/Daemon

VReaperV · 2025-01-05T23:29:55Z

Cgame-side pr: Unvanquished/Unvanquished#3276.

A proper solution to the issue of highly inefficient IPC with skeletal models. Skeleton will now be built and blended in the engine instead of cgame, and it will no longer be transferred through IPC at all, +this will avoid a bunch of extraneous copies. An additional benefit is that this will skip doing anything with skeletons for entities that get culled away. Cgame will now only send the relevant frame numbers/lerp/etc through IPC as part refEntity_t.

The layout I'm using for testing is this: https://users.unvanquished.net/~reaper/maps/layouts/plat23/test.dat.

src/engine/client/cg_msgdef.h

illwieckz · 2025-01-06T23:51:07Z

Probably related to that problem reported by CodeQL:

Thread 1 "daemon" received signal SIGSEGV, Segmentation fault.
Util::SerializeTraits<refEntity_t, void>::Read (stream=...) at src/engine/client/cg_msgdef.h:127
127				ent.boneMods = stream.Read<std::vector<BoneMod>&>();

VReaperV · 2025-01-07T00:33:53Z

Oh yeah, that was an unfinished change.

illwieckz · 2025-01-07T18:03:53Z

So, this fixe dll. I now can get it run as exe too, but with nexe (PNaCl) I get:

Warn: IPC: Unexpected end of message

VReaperV · 2025-01-07T18:07:02Z

So, this fixe dll. I now can get it run as exe too, but with nexe (PNaCl) I get:

Warn: IPC: Unexpected end of message

I've added a few more fixes, can you check if you still get this error? Do note that I have pushed fixes both on this branch and on the Unvanquished one.

illwieckz · 2025-01-07T18:11:56Z

I get the same.

Anyway, can you rebase on latest for-0.56.0/sync so I can also test with Saigo? 🙂️

VReaperV · 2025-01-07T18:20:09Z

I get the same.

Hmm, that's weird. I'd need to look at it later, there are stil la few bugs that need to be fixed.

VReaperV · 2025-01-07T18:20:39Z

Anyway, can you rebase on latest for-0.56.0/sync so I can also test with Saigo? 🙂️

Done, although I haven't tested it yet after rebase.

illwieckz · 2025-01-07T18:29:11Z

Thanks, the rebase was successful (I can build the game with Saigo).

I get the same error with a nexe built with Saigo.

VReaperV · 2025-01-07T18:34:47Z

Maybe there's padding being inserted into BoneMod in either daemon or saigo/nacl game, but not the other... At least that's the only potential explanation I have right now.

VReaperV · 2025-01-07T20:38:29Z

This is mostly done now, I believe the only remaining issues are because trap_R_LerpTag() needs to be modified to just work from the engine instead, +fixing the legs skeletons. Well, and whatever the above error is.

VReaperV · 2025-01-08T00:46:02Z

So I've unfortunately run into another issue: CG_SetAttachmentTag() (which is used for particle systems and such) requires some of the skeletons to already be built.

There are 3 options I can see right now: add more IPC calls to get skeletons just for those entities (which is really ugly), go back to the implementation that simply batches skeletons, or move particle systems to engine. The latter might also solve some performance issues with particle systems that we have right now.

VReaperV · 2025-01-08T02:17:16Z

This version is, however, faster than #1386.

VReaperV · 2025-01-08T10:08:54Z

This fixes a few things. The problems still remaining are legs skeletons not being set to torso skeletons, some animations missing/incorrect, and the above problem about particle systems/trail systems attachments.

VReaperV · 2025-01-09T13:27:40Z

So I've unfortunately run into another issue: CG_SetAttachmentTag() (which is used for particle systems and such) requires some of the skeletons to already be built.

There are 3 options I can see right now: add more IPC calls to get skeletons just for those entities (which is really ugly), go back to the implementation that simply batches skeletons, or move particle systems to engine. The latter might also solve some performance issues with particle systems that we have right now.

I figured out another solution for this:

Add all non-particle and non-trail entities.
Update their positions/skeletons etc. with an IPC call, but don't render them yet.
Write the positions of bones (for tag attachments) that we're interested in with the command buffer.
Read it on cgame side, and use those positions to spawn particles/trails.
Add the particle and trail entities and render everything as normal.

VReaperV · 2025-12-29T00:10:18Z

I've fixed all the issues I could find, just need to clean-up the code now.

illwieckz · 2026-02-23T06:04:54Z

I would like to get this merged for 0.56.0 RC2, so basically within the week.

slipher · 2026-02-23T06:06:38Z

I would like to get this merged for 0.56.0 RC2, so basically within the week.

Note that I have found a bug, reported on the engine-side PR.

illwieckz · 2026-02-23T06:16:29Z

I would like to get this merged for 0.56.0 RC2, so basically within the week.

Note that I have found a bug, reported on the engine-side PR.

Yes, I have mentioned it on the ~~engine~~game-side PR.

If not possible to fix and merge this before RC2, I do remind that the release is expected for being released in one month. It would be good to still have an RC with this before releasing, so this gives about 3 weeks to give enough time between the last RC and the release.

illwieckz · 2026-03-19T23:25:15Z

Finally, we're doing it! 🎉️

illwieckz

LGTM.

Remaining bugs spotted.

slipher · 2026-03-21T22:40:56Z

src/engine/renderer/tr_types.h

+}

-#define RF_SWAPCULL      0x000040 // swap CT_FRONT_SIDED and CT_BACK_SIDED
+inline RenderFx operator|=( const RenderFx& lhs, const RenderFx& rhs ) {


This stuff gives me compiler warnings:

/unv/Unvanquished/src/cgame/cg_weapons.cpp: In function ‘void CG_AddViewWeapon(playerState_t*)’: /unv/Unvanquished/src/cgame/cg_weapons.cpp:1773:34: warning: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: 1773 | hand.renderfx |= RF_SWAPCULL; | ^~~~~~~~~~~ In file included from /unv/Unvanquished/src/cgame/cg_local.h:36, from /unv/Unvanquished/src/cgame/cg_weapons.cpp:31: /unv/Unvanquished/daemon/src/engine/renderer/tr_types.h:72:17: note: candidate 1: ‘RenderFx operator|=(const RenderFx&, const RenderFx&)’ 72 | inline RenderFx operator|=( const RenderFx& lhs, const RenderFx& rhs ) { | ^~~~~~~~ /unv/Unvanquished/src/cgame/cg_weapons.cpp:1773:34: note: candidate 2: ‘operator|=(RenderFx&, int)’ (built-in) 1773 | hand.renderfx |= RF_SWAPCULL;

Should work now I think.

I now get errors instead of warnings:

src/cgame/cg_players.cpp: In function ‘void CG_PlayerFloatSprite(centity_t*, qhandle_t, std::vector<refEntity_t>&)’: src/cgame/cg_players.cpp:2534:24: error: invalid conversion from ‘int’ to ‘RenderFx’ [-fpermissive] 2534 | ent.renderfx = rf; | ^~ | | | int src/cgame/cg_players.cpp: In function ‘void CG_PlayerSkeletal(centity_t*, int, vec_t*, int)’: src/cgame/cg_players.cpp:2750:25: error: invalid conversion from ‘int’ to ‘RenderFx’ [-fpermissive] 2750 | legs.renderfx = renderfx; | ^~~~~~~~ | | | int src/cgame/cg_players.cpp: In function ‘void CG_Player(centity_t*)’: src/cgame/cg_players.cpp:2988:33: error: invalid conversion from ‘int’ to ‘RenderFx’ [-fpermissive] 2988 | legs.renderfx = renderfx; | ^~~~~~~~ | | | int src/cgame/cg_players.cpp:3058:42: error: invalid conversion from ‘int’ to ‘RenderFx’ [-fpermissive] 3058 | torso.renderfx = renderfx; | ^~~~~~~~ | | | int src/cgame/cg_players.cpp:3074:41: error: invalid conversion from ‘int’ to ‘RenderFx’ [-fpermissive] 3074 | head.renderfx = renderfx; | ^~~~~~~~ | | | int

src/cgame/cg_ents.cpp: In function ‘void CG_General(centity_t*)’: src/cgame/cg_ents.cpp:313:33: warning: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: 313 | ent.renderfx |= RF_THIRD_PERSON; // only draw from mirrors | ^~~~~~~~~~~~~~~ In file included from src/cgame/cg_local.h:36, from src/cgame/cg_ents.cpp:30: daemon/src/engine/renderer/tr_types.h:72:17: note: candidate 1: ‘RenderFx operator|=(const RenderFx&, const RenderFx&)’ 72 | inline RenderFx operator|=( const RenderFx& lhs, const RenderFx& rhs ) { | ^~~~~~~~ src/cgame/cg_ents.cpp:313:33: note: candidate 2: ‘operator|=(RenderFx&, int)’ (built-in) 313 | ent.renderfx |= RF_THIRD_PERSON; // only draw from mirrors | ^~~~~~~~~~~~~~~ src/cgame/cg_ents.cpp: In function ‘void CG_Missile(centity_t*)’: src/cgame/cg_ents.cpp:403:45: error: invalid conversion from ‘int’ to ‘RenderFx’ [-fpermissive] 403 | ent.renderfx = ma->renderfx | RF_NOSHADOW; | ~~~~~~~~~~~~~^~~~~~~~~~~~~ | | | int src/cgame/cg_ents.cpp: In function ‘void CG_LightFlare(centity_t*)’: src/cgame/cg_ents.cpp:661:27: warning: ISO C++ says that these are ambiguous, even though the worst conversion for the first is better than the worst conversion for the second: 661 | flare.renderfx |= RF_DEPTHHACK; | ^~~~~~~~~~~~ daemon/src/engine/renderer/tr_types.h:72:17: note: candidate 1: ‘RenderFx operator|=(const RenderFx&, const RenderFx&)’ 72 | inline RenderFx operator|=( const RenderFx& lhs, const RenderFx& rhs ) { | ^~~~~~~~ src/cgame/cg_ents.cpp:661:27: note: candidate 2: ‘operator|=(RenderFx&, int)’ (built-in) 661 | flare.renderfx |= RF_DEPTHHACK; | ^~~~~~~~~~~~

Ah, I forgot to push the commit.

Now it works! Thanks a lot!

illwieckz

LGTM, for real.

VReaperV added T-Improvement Improvement for an existing feature A-Renderer T-Cleanup T-Performance labels Jan 5, 2025

VReaperV changed the base branch from master to for-0.56.0/sync January 5, 2025 23:30

VReaperV mentioned this pull request Jan 5, 2025

Move most skeleton stuff to engine Unvanquished/Unvanquished#3276

Merged

github-advanced-security bot found potential problems Jan 6, 2025

View reviewed changes

src/engine/client/cg_msgdef.h Fixed Show fixed Hide fixed

VReaperV force-pushed the reaper/engine-skeleton/sync branch from 5ae3f4d to dc1a501 Compare January 7, 2025 09:44

VReaperV force-pushed the reaper/engine-skeleton/sync branch from de64f25 to 926b067 Compare January 7, 2025 18:04

VReaperV force-pushed the reaper/engine-skeleton/sync branch from 926b067 to 99c6824 Compare January 7, 2025 18:19

VReaperV mentioned this pull request Jan 7, 2025

Inefficient IPC calls Unvanquished/Unvanquished#3157

Open

VReaperV force-pushed the reaper/engine-skeleton/sync branch from dc61fec to cf47328 Compare January 7, 2025 20:37

VReaperV force-pushed the reaper/engine-skeleton/sync branch from cf47328 to 06b3c18 Compare January 8, 2025 10:04

VReaperV mentioned this pull request Jan 10, 2025

0.56.0 pre-release thread (stuff to do to be shipped in the release) Unvanquished/Unvanquished#3168

Open

VReaperV mentioned this pull request Sep 11, 2025

Bounds (for culling) are wrong for all 1st-person weapon models Unvanquished/Unvanquished#3418

Open

VReaperV force-pushed the reaper/engine-skeleton/sync branch from 06b3c18 to 8c4e69a Compare September 15, 2025 20:18

VReaperV force-pushed the reaper/engine-skeleton/sync branch 2 times, most recently from 1640110 to 88c50b0 Compare December 29, 2025 00:04

VReaperV changed the title ~~WIP: Move most skeleton stuff to engine~~ Move most skeleton stuff to engine Dec 29, 2025

VReaperV marked this pull request as ready for review December 29, 2025 00:09

VReaperV force-pushed the reaper/engine-skeleton/sync branch 4 times, most recently from a70fcfd to e058114 Compare December 29, 2025 19:48

VReaperV force-pushed the reaper/engine-skeleton/sync branch 3 times, most recently from e863ba9 to f4a57b0 Compare March 19, 2026 07:05

NUKE unused refEntity_t fields, improve packing

2345c19

VReaperV force-pushed the reaper/engine-skeleton/sync branch 3 times, most recently from 8e02b16 to 1890d0a Compare March 19, 2026 09:01

illwieckz previously approved these changes Mar 19, 2026

View reviewed changes

Fix alien movement-attack animation blending

5b15272

slipher reviewed Mar 21, 2026

View reviewed changes

BuildSkeleton(): apply boneMod.translation

a700306

illwieckz approved these changes Mar 22, 2026

View reviewed changes

VReaperV force-pushed the reaper/engine-skeleton/sync branch 2 times, most recently from 3f602f4 to 72b2d17 Compare March 22, 2026 07:38

illwieckz force-pushed the reaper/engine-skeleton/sync branch from 72b2d17 to a700306 Compare March 22, 2026 22:35

illwieckz merged commit a700306 into for-0.56.0/sync Mar 22, 2026
9 checks passed

Conversation

VReaperV commented Jan 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

illwieckz commented Jan 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

VReaperV commented Jan 7, 2025

Uh oh!

illwieckz commented Jan 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

VReaperV commented Jan 7, 2025

Uh oh!

illwieckz commented Jan 7, 2025

Uh oh!

VReaperV commented Jan 7, 2025

Uh oh!

VReaperV commented Jan 7, 2025

Uh oh!

illwieckz commented Jan 7, 2025

Uh oh!

VReaperV commented Jan 7, 2025

Uh oh!

VReaperV commented Jan 7, 2025

Uh oh!

VReaperV commented Jan 8, 2025

Uh oh!

VReaperV commented Jan 8, 2025

Uh oh!

VReaperV commented Jan 8, 2025

Uh oh!

VReaperV commented Jan 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

VReaperV commented Dec 29, 2025

Uh oh!

illwieckz commented Feb 23, 2026

Uh oh!

slipher commented Feb 23, 2026

Uh oh!

illwieckz commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

illwieckz commented Mar 19, 2026

Uh oh!

illwieckz left a comment

Choose a reason for hiding this comment

Uh oh!

slipher Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

VReaperV Mar 22, 2026

Choose a reason for hiding this comment

Uh oh!

illwieckz Mar 22, 2026

Choose a reason for hiding this comment

Uh oh!

VReaperV Mar 22, 2026

Choose a reason for hiding this comment

Uh oh!

illwieckz Mar 22, 2026

Choose a reason for hiding this comment

Uh oh!

illwieckz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

VReaperV commented Jan 5, 2025 •

edited

Loading

illwieckz commented Jan 6, 2025 •

edited

Loading

illwieckz commented Jan 7, 2025 •

edited

Loading

VReaperV commented Jan 9, 2025 •

edited

Loading

illwieckz commented Feb 23, 2026 •

edited

Loading