Added cl_show_server_triggers_* cvars (related to plugin PR) #183

SmileyAG · 2023-12-06T23:09:18Z

I recently remembered and rebased my old request for plugin a few days ago and at the same time reminded about it to naz in discord, he said that would approve later, so I’m sending a pull request in advance, it’s not necessary to merge it now (since the PR plugin isn't merged yet), but you shouldn’t close it either

tmp64 · 2023-12-08T03:47:31Z

Maybe check for gEngfuncs.GetMaxClients() > 1 when hiding singleplayer triggers?

SmileyAG · 2023-12-08T04:05:25Z

Maybe check for gEngfuncs.GetMaxClients() > 1 when hiding singleplayer triggers?

Well, I'd say it might require a separate cvar at that point then, since even when I'm playing at own listenserver with maxplayers 1 and loaded amxmodx+metamod-p+hlkreedz combo, still don't want to see those SP triggers because they wouldn't action normally in deathmatch mode, example:

OpenAG/dlls/triggers.cpp

Lines 1466 to 1475 in 27e7143

    
           void CChangeLevel :: ChangeLevelNow( CBaseEntity *pActivator ) 
        
           { 
        
           	edict_t	*pentLandmark; 
        
           	LEVELLIST	levels[16]; 
        
           	ASSERT(!FStrEq(m_szMapName, "")); 
        
           	// Don't work in deathmatch 
        
           	if ( g_pGameRules->IsDeathmatch() ) 
        
           		return;

SmileyAG · 2023-12-14T07:09:11Z

Please review this code again, because now I have fully changed it to display triggers with TriAPI

Let me first explain why this was done, because if being unenlightened in that question, then you would have a fair reason to ask: why the hell was it needed to go this way?

In short, modern map compilers cut off unused planes due to optimization (such as from triggers), but trigger entities from plugin is still transmitted from the server to the client, which means we can try to take their mins, maxs, origin and draw them separately (e.g. with TriAPI)

Showcase (value 1 = new triggers, value 2 = old triggers):

new_triggers.mp4

tmp64 · 2023-12-14T07:11:50Z

What about trigger brushes of forms other than a box? They would be rendered incorrectly

cl_dll/tri.cpp

SmileyAG · 2023-12-14T07:35:18Z

What about trigger brushes of forms other than a box? They would be rendered incorrectly

Probably, but have you ever seen a map in which the trigger is not a box? I've looked before through a lot of maps in the bspguy or directly in map sources with J.A.C.K, and I've never seen a brush trigger that wasn't in a box shape

tmp64 · 2023-12-14T07:53:32Z

Probably, but have you ever seen a map in which the trigger is not a box? I've looked before through a lot of maps in the bspguy or directly in map sources with J.A.C.K, and I've never seen a brush trigger that wasn't in a box shape

You can try rendering the 0-th hull of the brush entity model. It should be the exact one used for collision detection with point entities.
https://github.com/dreamstalker/rehlds/blob/93f5775ac26240782981f47ee8e052fb53d30877/rehlds/engine/world.cpp#L193

YaLTeR · 2023-12-14T08:27:39Z

Note that I'm not sure if we can use GPL code in OpenAG.

YaLTeR · 2023-12-14T08:29:10Z

I think rendering boxes only is fine if the alternative complicates things a lot.

tmp64 · 2023-12-14T08:33:29Z

Note that I'm not sure if we can use GPL code in OpenAG.

It's a reference to collision detection code and it's not intended to be added to OpenAG

… unused in multiplayer

…/absmax

…value above 0

…e initialization to fix crash

…as unnecessary

To not cost performance due of iterating through entities in cases when triggers are definitely not transmitted by plugin/server

cl_dll/cl_util.h

YaLTeR · 2023-12-30T07:47:25Z

cl_dll/entity.cpp

@@ -50,6 +59,12 @@ int CL_DLLEXPORT HUD_AddEntity( int type, struct cl_entity_s *ent, const char *m
 		break;
 	}

+	// show triggers that would be transferred from server-side with specific value in renderfx to differ it from other entities
+	// update: there is a new implementation of displaying triggers that allows you to display even when planes is stripped due to optimizations in updated map compiler
+	// so this code will only work if the value 2 is specified in the cvar, but it should not be deleted imo


but it should not be deleted imo

Why not? Is it preserved server-side too?

Eeeh, well, absmin/absmax triggers seems to be draw as should for the most of maps, but I had noticed that on some specific map (dyd_axn_plant) in a specific place it draw not the right size as should, so I'd keep that second mode for a reserve case, like if the main mode is would having some issues

Correct draw:

Wrong draw:

cl_dll/hud.cpp

cl_dll/hudgl.cpp

cl_dll/tri.cpp

YaLTeR · 2023-12-30T07:54:30Z

common/com_model.h

@@ -16,7 +16,7 @@
 #define STUDIO_EVENTS 2

 #define MAX_CLIENTS			32
-#define	MAX_EDICTS			900
+#define	MAX_EDICTS			2048


Is this related?

Of course! That depending through how many entities we want to iterate to find triggers!

if ((gHUD.m_pShowServerTriggers->value > 0) && (gHUD.m_pShowServerTriggers->value != 2.0f)) { for (int e = 0; e < MAX_EDICTS; ++e) { cl_entity_t* ent = gEngfuncs.GetEntityByIndex(e); if (ent) {

According to the investigate from Solokiller, max edicts can be no more than 2047, anything higher than this will have cause crash: ValveSoftware/halflife#1777

I'd also started to think might be it should controllable instead? Like if the map have a not much entities, then you don't want to do extra iterations and it will boost some performance, right? Since that code would run the each frame for updating triggers

Making some cvar like cl_show_server_triggers_entities_limit 2048

CVar is definitely not the right solution here

Let's just leave it as is for now, since it doesn't run with showtriggers 0

…function That done for versatility, since there is not much cases to check validity for

SmileyAG · 2023-12-30T21:19:48Z

@YaLTeR @tmp64 Well I haven't contacted with naz for recent time, but at least exec approved that and updated plugin for all SourceRuns HLKZ servers, so pull requests in those both clients (OpenAG and BugfixedHL-Rebased) can be merged now:

cl_dll/tri.cpp

cl_dll/entity.cpp

YaLTeR · 2023-12-31T06:37:41Z

Thanks!

…ble with both engine versions from a while

YaLTeR approved these changes Dec 7, 2023

View reviewed changes

tmp64 reviewed Dec 14, 2023

View reviewed changes

cl_dll/tri.cpp Outdated Show resolved Hide resolved

cl_dll/tri.cpp Outdated Show resolved Hide resolved

cl_dll/tri.cpp Outdated Show resolved Hide resolved

SmileyAG mentioned this pull request Dec 14, 2023

Changed visual properties of triggers to make them be shown on the clientside YaLTeR/hlkreedz#37

Open

SmileyAG force-pushed the show_triggers branch from 8faaea1 to a546abf Compare December 14, 2023 12:38

SmileyAG mentioned this pull request Dec 25, 2023

Added cl_show_server_triggers_* cvars (related to plugin PR) tmp64/BugfixedHL-Rebased#204

Draft

SmileyAG and others added 12 commits December 30, 2023 11:34

Added cl_show_server_triggers_* cvars (related to plugin PR)

490b311

Added IsTriggerForSinglePlayer function to rid from the triggers that…

6a73219

… unused in multiplayer

Added a new mode for displaying triggers via TriAPI which uses absmin…

f1b21e1

…/absmax

Replaced multiple vectors with vector of structs for flexibility

546173c

TriAPI triggers is only available for hardware mode

5220f00

Fixed encoding issue in file

50bb16b

Allow to draw triggers in software engine with HUD_AddEntity if cvar …

1cd0f44

…value above 0

Supported TriAPI triggers for software engine too

2eb7a3f

Loading white sprite now with each call of HUD_VidInit instead of onc…

f366884

…e initialization to fix crash

SetMapName: added option to disable forcing to lowercase for RPC

f772927

Removed debug messages, map name and entities storing to std::vector …

e900160

…as unnecessary

cl_show_server_triggers should be always 0 by default

16b37db

To not cost performance due of iterating through entities in cases when triggers are definitely not transmitted by plugin/server

SmileyAG force-pushed the show_triggers branch from b93fca8 to 16b37db Compare December 30, 2023 07:38

YaLTeR reviewed Dec 30, 2023

View reviewed changes

SmileyAG added 2 commits December 30, 2023 14:58

get_map_name: removed memset as extra code

74bb50f

Use boolean expression to check for the valid 'white_sprite'

7d1b778

Use nested if statements for PR code in HUD_DrawTransparentTriangles …

a48b8a5

…function That done for versatility, since there is not much cases to check validity for

Replaced nested if statements with guard clauses for YaLTeR preferences

32e5385

YaLTeR reviewed Dec 31, 2023

View reviewed changes

cl_dll/tri.cpp Outdated Show resolved Hide resolved

cl_dll/entity.cpp Outdated Show resolved Hide resolved

YaLTeR merged commit 7c35c77 into YaLTeR:master Dec 31, 2023
13 checks passed

Don't need IEngineStudio for hardware check since the code is compati…

8e3cf45

…ble with both engine versions from a while

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added cl_show_server_triggers_* cvars (related to plugin PR) #183

Added cl_show_server_triggers_* cvars (related to plugin PR) #183

SmileyAG commented Dec 6, 2023 •

edited

Loading

tmp64 commented Dec 8, 2023

SmileyAG commented Dec 8, 2023

SmileyAG commented Dec 14, 2023 •

edited

Loading

tmp64 commented Dec 14, 2023

SmileyAG commented Dec 14, 2023

tmp64 commented Dec 14, 2023

YaLTeR commented Dec 14, 2023

YaLTeR commented Dec 14, 2023

tmp64 commented Dec 14, 2023

YaLTeR Dec 30, 2023

SmileyAG Dec 30, 2023

YaLTeR Dec 30, 2023

SmileyAG Dec 30, 2023

SmileyAG Dec 30, 2023 •

edited

Loading

YaLTeR Dec 30, 2023

YaLTeR Dec 30, 2023

SmileyAG commented Dec 30, 2023 •

edited

Loading

YaLTeR commented Dec 31, 2023

Added cl_show_server_triggers_* cvars (related to plugin PR) #183

Added cl_show_server_triggers_* cvars (related to plugin PR) #183

Conversation

SmileyAG commented Dec 6, 2023 • edited Loading

tmp64 commented Dec 8, 2023

SmileyAG commented Dec 8, 2023

SmileyAG commented Dec 14, 2023 • edited Loading

tmp64 commented Dec 14, 2023

SmileyAG commented Dec 14, 2023

tmp64 commented Dec 14, 2023

YaLTeR commented Dec 14, 2023

YaLTeR commented Dec 14, 2023

tmp64 commented Dec 14, 2023

YaLTeR Dec 30, 2023

Choose a reason for hiding this comment

SmileyAG Dec 30, 2023

Choose a reason for hiding this comment

YaLTeR Dec 30, 2023

Choose a reason for hiding this comment

SmileyAG Dec 30, 2023

Choose a reason for hiding this comment

SmileyAG Dec 30, 2023 • edited Loading

Choose a reason for hiding this comment

YaLTeR Dec 30, 2023

Choose a reason for hiding this comment

YaLTeR Dec 30, 2023

Choose a reason for hiding this comment

SmileyAG commented Dec 30, 2023 • edited Loading

YaLTeR commented Dec 31, 2023

SmileyAG commented Dec 6, 2023 •

edited

Loading

SmileyAG commented Dec 14, 2023 •

edited

Loading

SmileyAG Dec 30, 2023 •

edited

Loading

SmileyAG commented Dec 30, 2023 •

edited

Loading