X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcsqcmodel_settings.qh;h=9c4909671e1408e5695fd572f7fbb6211de8c41e;hb=5aec2ffb9528c6b6db21d0c09bdcac9038337fbd;hp=cfe012275cdeb6105f4009c6e76d79baf46beae4;hpb=e95cf471e2b4a66a099aff48cad52b3b37951518;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/csqcmodel_settings.qh b/qcsrc/common/csqcmodel_settings.qh index cfe012275..9c4909671 100644 --- a/qcsrc/common/csqcmodel_settings.qh +++ b/qcsrc/common/csqcmodel_settings.qh @@ -1,3 +1,5 @@ +#pragma once + // define this if svqc code wants to use .frame2 and .lerpfrac //#define CSQCMODEL_HAVE_TWO_FRAMES @@ -5,16 +7,23 @@ //#define CSQCMODEL_SUPPORT_GETTAGINFO_BEFORE_DRAW // server decides crouching, this lags, but so be it -#define CSQCMODEL_SERVERSIDE_CROUCH +//#define CSQCMODEL_SERVERSIDE_CROUCH // a hack for Xonotic #ifdef CSQC # define TAG_ENTITY_NAME tag_networkentity # define TAG_ENTITY_TYPE float .float tag_networkentity; + +# define TAG_VIEWLOC_NAME tag_networkviewloc +# define TAG_VIEWLOC_TYPE int +.float tag_networkviewloc; #else # define TAG_ENTITY_NAME tag_entity # define TAG_ENTITY_TYPE entity + +# define TAG_VIEWLOC_NAME viewloc +# define TAG_VIEWLOC_TYPE entity #endif // new fields @@ -22,47 +31,49 @@ // add properties you want networked to CSQC here #define CSQCMODEL_EXTRAPROPERTIES \ - CSQCMODEL_PROPERTY(1, float, ReadShort, WriteShort, colormap) \ - CSQCMODEL_PROPERTY(2, float, ReadInt24_t, WriteInt24_t, effects) \ - CSQCMODEL_PROPERTY(4, float, ReadByte, WriteByte, modelflags) \ - CSQCMODEL_PROPERTY_SCALED(8, float, ReadByte, WriteByte, alpha, 254, -1, 254) \ - CSQCMODEL_PROPERTY(16, float, ReadByte, WriteByte, skin) \ - CSQCMODEL_PROPERTY(32, float, ReadApproxPastTime, WriteApproxPastTime, death_time) \ - CSQCMODEL_PROPERTY(64, float, ReadByte, WriteByte, solid) \ + CSQCMODEL_PROPERTY(BIT(0), int, ReadShort, WriteShort, colormap) \ + CSQCMODEL_PROPERTY(BIT(1), int, ReadInt24_t, WriteInt24_t, effects) \ + CSQCMODEL_PROPERTY(BIT(2), int, ReadByte, WriteByte, modelflags) \ + CSQCMODEL_PROPERTY_SCALED(BIT(3), float, ReadByte, WriteByte, alpha, 254, -1, 254) \ + CSQCMODEL_PROPERTY(BIT(4), int, ReadByte, WriteByte, skin) \ + CSQCMODEL_PROPERTY(BIT(5), float, ReadApproxPastTime, WriteApproxPastTime, death_time) \ + CSQCMODEL_PROPERTY(BIT(6), float, ReadByte, WriteByte, solid) \ CSQCMODEL_IF(!isplayer) \ - CSQCMODEL_PROPERTY(128, TAG_ENTITY_TYPE, ReadShort, WriteEntity, TAG_ENTITY_NAME) \ - CSQCMODEL_PROPERTY_SCALED(256, float, ReadByte, WriteByte, glowmod_x, 255, 0, 255) \ - CSQCMODEL_PROPERTY_SCALED(256, float, ReadByte, WriteByte, glowmod_y, 255, 0, 255) \ - CSQCMODEL_PROPERTY_SCALED(256, float, ReadByte, WriteByte, glowmod_z, 255, 0, 255) \ - CSQCMODEL_PROPERTY_SCALED(256, float, ReadByte, WriteByte, colormod_x, 255, 0, 255) \ - CSQCMODEL_PROPERTY_SCALED(256, float, ReadByte, WriteByte, colormod_y, 255, 0, 255) \ - CSQCMODEL_PROPERTY_SCALED(256, float, ReadByte, WriteByte, colormod_z, 255, 0, 255) \ + CSQCMODEL_PROPERTY(BIT(7), TAG_ENTITY_TYPE, ReadShort, WriteEntity, TAG_ENTITY_NAME) \ + CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, glowmod_x, 254, -1, 254) \ + CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, glowmod_y, 254, -1, 254) \ + CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, glowmod_z, 254, -1, 254) \ + CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, colormod_x, 254, -1, 254) \ + CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, colormod_y, 254, -1, 254) \ + CSQCMODEL_PROPERTY_SCALED(BIT(8), float, ReadByte, WriteByte, colormod_z, 254, -1, 254) \ CSQCMODEL_ENDIF \ CSQCMODEL_IF(isplayer) \ - CSQCMODEL_PROPERTY(128, float, ReadByte, WriteByte, anim_state) \ - CSQCMODEL_PROPERTY(128, float, ReadApproxPastTime, WriteApproxPastTime, anim_time) \ + CSQCMODEL_PROPERTY(BIT(7), int, ReadByte, WriteByte, anim_state) \ + CSQCMODEL_PROPERTY(BIT(7), float, ReadApproxPastTime, WriteApproxPastTime, anim_time) \ CSQCMODEL_IF(!islocalplayer) \ - CSQCMODEL_PROPERTY(256, float, ReadChar, WriteChar, anim_lower_action) \ - CSQCMODEL_PROPERTY(256, float, ReadApproxPastTime, WriteApproxPastTime, anim_lower_time) \ + CSQCMODEL_PROPERTY(BIT(8), float, ReadChar, WriteChar, anim_lower_action) \ + CSQCMODEL_PROPERTY(BIT(8), float, ReadApproxPastTime, WriteApproxPastTime, anim_lower_time) \ CSQCMODEL_ENDIF \ - CSQCMODEL_PROPERTY(512, float, ReadChar, WriteChar, anim_upper_action) \ - CSQCMODEL_PROPERTY(512, float, ReadApproxPastTime, WriteApproxPastTime, anim_upper_time) \ + CSQCMODEL_PROPERTY(BIT(9), float, ReadChar, WriteChar, anim_upper_action) \ + CSQCMODEL_PROPERTY(BIT(9), float, ReadApproxPastTime, WriteApproxPastTime, anim_upper_time) \ CSQCMODEL_ENDIF \ - CSQCMODEL_PROPERTY(1024, float, ReadAngle, WriteAngle, v_angle_x) \ - CSQCMODEL_PROPERTY_SCALED(4096, float, ReadByte, WriteByte, scale, 16, 0, 255) -// TODO get rid of colormod/glowmod here, find good solution for nex charge glowmod hack; also get rid of some useless properties on non-players that only exist for CopyBody + CSQCMODEL_PROPERTY(BIT(10), float, ReadAngle, WriteAngle, v_angle_x) \ + CSQCMODEL_PROPERTY(BIT(11), int, ReadByte, WriteByte, traileffect) \ + CSQCMODEL_PROPERTY_SCALED(BIT(12), float, ReadByte, WriteByte, scale, 16, 0, 255) \ + CSQCMODEL_PROPERTY(BIT(13), int, ReadInt24_t, WriteInt24_t, dphitcontentsmask) \ + CSQCMODEL_PROPERTY(BIT(14), TAG_VIEWLOC_TYPE, ReadShort, WriteEntity, TAG_VIEWLOC_NAME) \ + CSQCMODEL_PROPERTY(BIT(15), int, ReadByte, WriteByte, multijump_count) \ + CSQCMODEL_PROPERTY(BIT(16), int, ReadByte, WriteByte, move_movetype) +// TODO get rid of colormod/glowmod here; also get rid of some useless properties on non-players that only exist for CopyBody // add hook function calls here -#define CSQCMODEL_HOOK_PREUPDATE \ - CSQCModel_Hook_PreUpdate(isnew, isplayer, islocalplayer); -#define CSQCMODEL_HOOK_POSTUPDATE \ - CSQCModel_Hook_PostUpdate(isnew, isplayer, islocalplayer); -#define CSQCMODEL_HOOK_PREDRAW \ - CSQCModel_Hook_PreDraw(isplayer); -#define CSQCPLAYER_HOOK_POSTCAMERASETUP +#define CSQCPLAYER_HOOK_POSTCAMERASETUP() \ + CSQCPlayer_SetViewLocation() -// force updates of player entities that often even if unchanged -#define CSQCPLAYER_FORCE_UPDATES 0.25 +// force updates of player entities this frequently (per second) even if unchanged +#ifndef CSQCPLAYER_FORCE_UPDATES +#define CSQCPLAYER_FORCE_UPDATES 4 +#endif // mod must define: //vector PL_MIN = ...; @@ -73,8 +84,8 @@ //vector PL_CROUCH_VIEW_OFS = ...; #ifdef SVQC -# define CSQCMODEL_AUTOINIT() CSQCModel_LinkEntity() -# define CSQCMODEL_AUTOUPDATE() CSQCModel_CheckUpdate() +# define CSQCMODEL_AUTOINIT(e) CSQCModel_LinkEntity(e) +# define CSQCMODEL_AUTOUPDATE(e) CSQCModel_CheckUpdate(e) #endif #define CSQCMODEL_EF_RESPAWNGHOST EF_SELECTABLE