Skip to content

Commit

Permalink
fix bad merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@illwieckz
illwieckz committed Jun 11, 2024
1 parent f5c2c4c commit fae9bbd
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 118 deletions.
117 changes: 0 additions & 117 deletions src/engine/client/cg_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,121 +90,4 @@ using markMsgOutput_t = std::pair<
std::vector<markFragment_t>
>;

void trap_SendClientCommand( const char *s );
void trap_UpdateScreen();
int trap_CM_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projection, int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer );

void trap_CM_BatchMarkFragments(
unsigned maxPoints,
unsigned maxFragments,
const std::vector<markMsgInput_t> &markMsgInput,
std::vector<markMsgOutput_t> &markMsgOutput );

void trap_S_StartSound( vec3_t origin, int entityNum, soundChannel_t entchannel, sfxHandle_t sfx );
void trap_S_StartLocalSound( sfxHandle_t sfx, soundChannel_t channelNum );
void trap_S_ClearLoopingSounds( bool killall );
void trap_S_AddLoopingSound( int entityNum, const vec3_t origin, const vec3_t velocity, sfxHandle_t sfx );
void trap_S_AddRealLoopingSound( int entityNum, const vec3_t origin, const vec3_t velocity, sfxHandle_t sfx );
void trap_S_StopLoopingSound( int entityNum );
void trap_S_UpdateEntityPosition( int entityNum, const vec3_t origin );
int trap_S_GetCurrentSoundTime();

void trap_S_Respatialize( int entityNum, const vec3_t origin, vec3_t axis[ 3 ], int inwater );
sfxHandle_t trap_S_RegisterSound( const char *sample, bool compressed );
void trap_S_StartBackgroundTrack( const char *intro, const char *loop );
void trap_R_LoadWorldMap( const char *mapname );
qhandle_t trap_R_RegisterModel( const char *name );
qhandle_t trap_R_RegisterSkin( const char *name );
qhandle_t trap_R_RegisterShader( const char *name, int flags );

void trap_R_ClearScene();
void trap_R_AddRefEntityToScene( const refEntity_t *re );
void trap_R_AddPolyToScene( qhandle_t hShader, int numVerts, const polyVert_t *verts );
void trap_R_AddPolysToScene( qhandle_t hShader, int numVerts, const polyVert_t *verts, int numPolys );
void trap_R_AddLightToScene( const vec3_t org, float radius, float intensity, float r, float g, float b, qhandle_t hShader, int flags );
void trap_R_AddAdditiveLightToScene( const vec3_t org, float intensity, float r, float g, float b );
void trap_R_Add2dPolysIndexedToScene( polyVert_t *polys, int numVerts, int *indexes, int numIndexes, int trans_x, int trans_y, qhandle_t shader );
void trap_R_SetMatrixTransform( const matrix_t matrix );
void trap_R_ResetMatrixTransform();
void trap_R_RenderScene( const refdef_t *fd );
void trap_R_ClearColor();
void trap_R_SetColor( const Color::Color &rgba );
void trap_R_SetClipRegion( const float *region );
void trap_R_ResetClipRegion();
void trap_R_DrawStretchPic( float x, float y, float w, float h, float s1, float t1, float s2, float t2, qhandle_t hShader );
void trap_R_DrawRotatedPic( float x, float y, float w, float h, float s1, float t1, float s2, float t2, qhandle_t hShader, float angle );
void trap_R_ModelBounds( clipHandle_t model, vec3_t mins, vec3_t maxs );
int trap_R_LerpTag( orientation_t *tag, const refEntity_t *refent, const char *tagName, int startIndex );
void trap_R_GetTextureSize( qhandle_t handle, int *x, int *y );
qhandle_t trap_R_GenerateTexture( const byte *data, int x, int y );
void trap_GetCurrentSnapshotNumber( int *snapshotNumber, int *serverTime );
bool trap_GetSnapshot( int snapshotNumber, snapshot_t *snapshot );
int trap_GetCurrentCmdNumber();
bool trap_GetUserCmd( int cmdNumber, usercmd_t *ucmd );
void trap_SetUserCmdValue( int stateValue, int flags, float sensitivityScale );
int trap_Key_GetCatcher();
void trap_Key_SetCatcher( int catcher );
void trap_Key_SetBinding( Keyboard::Key key, int team, const char *cmd );
std::vector<Keyboard::Key> trap_Key_GetConsoleKeys();
void trap_Key_SetConsoleKeys(const std::vector<Keyboard::Key>& keys);
void trap_Key_ClearCmdButtons();
void trap_Key_ClearStates();
std::vector<bool> trap_Key_KeysDown( const std::vector<Keyboard::Key>& keys );
void trap_SetMouseMode( MouseMode mode );
void trap_S_StopBackgroundTrack();
void trap_R_RemapShader( const char *oldShader, const char *newShader, const char *timeOffset );
bool trap_GetEntityToken( char *buffer, int bufferSize );
std::vector<std::vector<Keyboard::Key>> trap_Key_GetKeysForBinds(int team, const std::vector<std::string>& binds);
int trap_Key_GetCharForScancode( int scancode );
bool trap_R_inPVS( const vec3_t p1, const vec3_t p2 );

std::vector<bool> trap_R_BatchInPVS(
const vec3_t origin,
const std::vector<std::array<float, 3>>& posEntities );

bool trap_R_inPVVS( const vec3_t p1, const vec3_t p2 );
bool trap_R_LoadDynamicShader( const char *shadername, const char *shadertext );
int trap_R_LightForPoint( vec3_t point, vec3_t ambientLight, vec3_t directedLight, vec3_t lightDir );

qhandle_t trap_R_RegisterAnimation( const char *name );
int trap_R_BuildSkeleton( refSkeleton_t *skel, qhandle_t anim, int startFrame, int endFrame, float frac, bool clearOrigin );
int trap_R_BlendSkeleton( refSkeleton_t *skel, const refSkeleton_t *blend, float frac );
int trap_R_BoneIndex( qhandle_t hModel, const char *boneName );
int trap_R_AnimNumFrames( qhandle_t hAnim );
int trap_R_AnimFrameRate( qhandle_t hAnim );

void trap_CompleteCallback( const char *complete );

void trap_RegisterButtonCommands( const char *cmds );

void trap_GetClipboardData( char *, int);
void trap_QuoteString( const char *, char*, int );

void trap_notify_onTeamChange( int newTeam );

qhandle_t trap_RegisterVisTest();
void trap_AddVisTestToScene( qhandle_t hTest, const vec3_t pos,
float depthAdjust, float area );
float trap_CheckVisibility( qhandle_t hTest );
void trap_UnregisterVisTest( qhandle_t hTest );
void trap_SetColorGrading( int slot, qhandle_t hShader );
void trap_R_ScissorEnable( bool enable );
void trap_R_ScissorSet( int x, int y, int w, int h );
int trap_LAN_GetServerCount( int source );
void trap_LAN_GetServerInfo( int source, int n, char *buf, int buflen );
int trap_LAN_GetServerPing( int source, int n );
void trap_LAN_MarkServerVisible( int source, int n, bool visible );
int trap_LAN_ServerIsVisible( int source, int n );
bool trap_LAN_UpdateVisiblePings( int source );
void trap_LAN_ResetPings( int n );
int trap_LAN_ServerStatus( const char *serverAddress, char *serverStatus, int maxLen );
void trap_LAN_ResetServerStatus();
void trap_R_GetShaderNameFromHandle( const qhandle_t shader, char *out, int len );
void trap_PrepareKeyUp();
void trap_R_SetAltShaderTokens( const char * );
void trap_S_UpdateEntityVelocity( int entityNum, const vec3_t velocity );
void trap_S_UpdateEntityPositionVelocity( int entityNum, const vec3_t position, const vec3_t velocity );
void trap_S_SetReverb( int slotNum, const char* presetName, float ratio );
void trap_S_BeginRegistration();
void trap_S_EndRegistration();
#endif
15 changes: 14 additions & 1 deletion src/shared/client/cg_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ extern IPC::CommandBufferClient cmdBuffer;
void trap_SendClientCommand( const char *s );
void trap_UpdateScreen();
int trap_CM_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projection, int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer );

void trap_CM_BatchMarkFragments(
unsigned maxPoints,
unsigned maxFragments,
const std::vector<markMsgInput_t> &markMsgInput,
std::vector<markMsgOutput_t> &markMsgOutput );

void trap_S_StartSound( vec3_t origin, int entityNum, soundChannel_t entchannel, sfxHandle_t sfx );
void trap_S_StartLocalSound( sfxHandle_t sfx, soundChannel_t channelNum );
void trap_S_ClearLoopingSounds( bool killall );
Expand All @@ -57,7 +64,7 @@ void trap_S_StartBackgroundTrack( const char *intro, const char *loop
void trap_R_LoadWorldMap( const char *mapname );
qhandle_t trap_R_RegisterModel( const char *name );
qhandle_t trap_R_RegisterSkin( const char *name );
qhandle_t trap_R_RegisterShader( const char *name, RegisterShaderFlags_t flags );
qhandle_t trap_R_RegisterShader( const char *name, int flags );
void trap_R_ClearScene();
void trap_R_AddRefEntityToScene( const refEntity_t *re );
void trap_R_AddPolyToScene( qhandle_t hShader, int numVerts, const polyVert_t *verts );
Expand Down Expand Up @@ -98,6 +105,11 @@ bool trap_GetEntityToken( char *buffer, int bufferSize );
std::vector<std::vector<Keyboard::Key>> trap_Key_GetKeysForBinds(int team, const std::vector<std::string>& binds);
int trap_Key_GetCharForScancode( int scancode );
bool trap_R_inPVS( const vec3_t p1, const vec3_t p2 );

std::vector<bool> trap_R_BatchInPVS(
const vec3_t origin,
const std::vector<std::array<float, 3>>& posEntities );

bool trap_R_inPVVS( const vec3_t p1, const vec3_t p2 );
int trap_R_LightForPoint( vec3_t point, vec3_t ambientLight, vec3_t directedLight, vec3_t lightDir );
qhandle_t trap_R_RegisterAnimation( const char *name );
Expand Down Expand Up @@ -130,6 +142,7 @@ void trap_R_GetShaderNameFromHandle( const qhandle_t shader, char *ou
void trap_PrepareKeyUp();
void trap_R_SetAltShaderTokens( const char * );
void trap_S_UpdateEntityVelocity( int entityNum, const vec3_t velocity );
void trap_S_UpdateEntityPositionVelocity( int entityNum, const vec3_t position, const vec3_t velocity );
void trap_S_SetReverb( int slotNum, const char* presetName, float ratio );
void trap_S_BeginRegistration();
void trap_S_EndRegistration();
Expand Down

0 comments on commit fae9bbd

Please sign in to comment.