skel_build: normalize the per-bone matrices

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index c7541f5239a4c4820b89d585436743694ea642e2..da20b908f475fad8e64784369984b546b408f6d5 100644 (file)
--- a/client.h
+++ b/client.h
@@ -393,32 +393,22 @@ typedef struct entity_render_s
        double last_trace_visibility;
 
        // user wavefunc parameters (from csqc)
-       float userwavefunc_param[Q3WAVEFUNC_USER_COUNT];
+       vec_t userwavefunc_param[Q3WAVEFUNC_USER_COUNT];
 }
 entity_render_t;
 
 typedef struct entity_persistent_s
 {
-       vec3_t trail_origin;
-
-       // particle trail
-       float trail_time;
+       vec3_t trail_origin; // previous position for particle trail spawning
+       vec3_t oldorigin; // lerp
+       vec3_t oldangles; // lerp
+       vec3_t neworigin; // lerp
+       vec3_t newangles; // lerp
+       vec_t lerpstarttime; // lerp
+       vec_t lerpdeltatime; // lerp
+       float muzzleflash; // muzzleflash intensity, fades over time
+       float trail_time; // residual error accumulation for particle trail spawning (to keep spacing across frames)
        qboolean trail_allowed; // set to false by teleports, true by update code, prevents bad lerps
-
-       // muzzleflash fading
-       float muzzleflash;
-
-       // interpolated movement
-
-       // start time of move
-       float lerpstarttime;
-       // time difference from start to end of move
-       float lerpdeltatime;
-       // the move itself, start and end
-       float oldorigin[3];
-       float oldangles[3];
-       float neworigin[3];
-       float newangles[3];
 }
 entity_persistent_t;
 
@@ -728,6 +718,10 @@ typedef struct client_static_s
        int proquake_servermod; // 0 = not proquake, 1 = proquake
        int proquake_serverversion; // actual proquake server version * 10 (3.40 = 34, etc)
        int proquake_serverflags; // 0 (PQF_CHEATFREE not supported)
+
+       // don't write-then-read csprogs.dat (useful for demo playback)
+       unsigned char *caughtcsprogsdata;
+       fs_offset_t caughtcsprogsdatasize;
 }
 client_static_t;
 
@@ -1850,6 +1844,8 @@ waterlevel_t;
 
 typedef struct cl_clientmovement_state_s
 {
+       // entity to be ignored for movement
+       struct prvm_edict_s *self;
        // position
        vec3_t origin;
        vec3_t velocity;