Animations: register

diff --git a/qcsrc/common/animdecide.qc b/qcsrc/common/animdecide.qc
index 23f43b9e94a74535614eb5919480d1a2db41236c..84e395aa24c35c8883664e666ee29f9e7e3c0b81 100644 (file)
--- a/qcsrc/common/animdecide.qc
+++ b/qcsrc/common/animdecide.qc
@@ -56,9 +56,9 @@ bool monsters_animoverride(entity e)
 
 void animdecide_load_if_needed(entity e)
 {
-       if(e.modelindex == e.animdecide_modelindex)
-               return;
-       e.animdecide_modelindex = e.modelindex;
+       int mdlidx = e.modelindex;
+       if (mdlidx == e.animdecide_modelindex) return;
+       e.animdecide_modelindex = mdlidx;
 
        if(substring(e.model, 0, 16) == "models/monsters/")
        {
@@ -67,34 +67,34 @@ void animdecide_load_if_needed(entity e)
        }
 
        vector none = '0 0 0';
-       e.anim_die1 = animfixfps(e, '0 1 0.5', none); // 2 seconds
-       e.anim_die2 = animfixfps(e, '1 1 0.5', none); // 2 seconds
-       e.anim_draw = animfixfps(e, '2 1 3', none);
-       e.anim_duckwalk = animfixfps(e, '4 1 1', none);
-       e.anim_duckjump = animfixfps(e, '5 1 10', none);
-       e.anim_duckidle = animfixfps(e, '6 1 1', none);
-       e.anim_idle = animfixfps(e, '7 1 1', none);
-       e.anim_jump = animfixfps(e, '8 1 10', none);
-       e.anim_pain1 = animfixfps(e, '9 1 2', none); // 0.5 seconds
-       e.anim_pain2 = animfixfps(e, '10 1 2', none); // 0.5 seconds
-       e.anim_shoot = animfixfps(e, '11 1 5', none); // analyze models and set framerate
-       e.anim_taunt = animfixfps(e, '12 1 0.33', none);
-       e.anim_run = animfixfps(e, '13 1 1', none);
-       e.anim_runbackwards = animfixfps(e, '14 1 1', none);
-       e.anim_strafeleft = animfixfps(e, '15 1 1', none);
-       e.anim_straferight = animfixfps(e, '16 1 1', none);
-       e.anim_forwardright = animfixfps(e, '19 1 1', '16 1 1');
-       e.anim_forwardleft = animfixfps(e, '20 1 1', '15 1 1');
-       e.anim_backright = animfixfps(e, '21 1 1', '16 1 1');
-       e.anim_backleft  = animfixfps(e, '22 1 1', '15 1 1');
-       e.anim_melee = animfixfps(e, '23 1 1', '11 1 1');
-       e.anim_duckwalkbackwards = animfixfps(e, '24 1 1', '4 1 1');
-       e.anim_duckwalkstrafeleft = animfixfps(e, '25 1 1', '4 1 1');
-       e.anim_duckwalkstraferight = animfixfps(e, '26 1 1', '4 1 1');
-       e.anim_duckwalkforwardright = animfixfps(e, '27 1 1', '4 1 1');
-       e.anim_duckwalkforwardleft = animfixfps(e, '28 1 1', '4 1 1');
-       e.anim_duckwalkbackright = animfixfps(e, '29 1 1', '4 1 1');
-       e.anim_duckwalkbackleft  = animfixfps(e, '30 1 1', '4 1 1');
+       e.anim_die1 = animfixfps(e, ANIM_VEC(die1, 1, 0.5), none); // 2 seconds
+       e.anim_die2 = animfixfps(e, ANIM_VEC(die2, 1, 0.5), none); // 2 seconds
+       e.anim_draw = animfixfps(e, ANIM_VEC(draw, 1, 3), none);
+       e.anim_duckwalk = animfixfps(e, ANIM_VEC(duckwalk, 1, 1), none);
+       e.anim_duckjump = animfixfps(e, ANIM_VEC(duckjump, 1, 10), none);
+       e.anim_duckidle = animfixfps(e, ANIM_VEC(duckidle, 1, 1), none);
+       e.anim_idle = animfixfps(e, ANIM_VEC(idle, 1, 1), none);
+       e.anim_jump = animfixfps(e, ANIM_VEC(jump, 1, 10), none);
+       e.anim_pain1 = animfixfps(e, ANIM_VEC(pain1, 1, 2), none); // 0.5 seconds
+       e.anim_pain2 = animfixfps(e, ANIM_VEC(pain2, 1, 2), none); // 0.5 seconds
+       e.anim_shoot = animfixfps(e, ANIM_VEC(shoot, 1, 5), none); // analyze models and set framerate
+       e.anim_taunt = animfixfps(e, ANIM_VEC(taunt, 1, 0.33), none);
+       e.anim_run = animfixfps(e, ANIM_VEC(run, 1, 1), none);
+       e.anim_runbackwards = animfixfps(e, ANIM_VEC(runbackwards, 1, 1), none);
+       e.anim_strafeleft = animfixfps(e, ANIM_VEC(strafeleft, 1, 1), none);
+       e.anim_straferight = animfixfps(e, ANIM_VEC(straferight, 1, 1), none);
+       e.anim_forwardright = animfixfps(e, ANIM_VEC(forwardright, 1, 1), ANIM_VEC(straferight, 1, 1));
+       e.anim_forwardleft = animfixfps(e, ANIM_VEC(forwardleft, 1, 1), ANIM_VEC(strafeleft, 1, 1));
+       e.anim_backright = animfixfps(e, ANIM_VEC(backright, 1, 1), ANIM_VEC(straferight, 1, 1));
+       e.anim_backleft  = animfixfps(e, ANIM_VEC(backleft , 1, 1), ANIM_VEC(strafeleft, 1, 1));
+       e.anim_melee = animfixfps(e, ANIM_VEC(melee, 1, 1), ANIM_VEC(shoot, 1, 1));
+       e.anim_duckwalkbackwards = animfixfps(e, ANIM_VEC(duckwalkbackwards, 1, 1), ANIM_VEC(duckwalk, 1, 1));
+       e.anim_duckwalkstrafeleft = animfixfps(e, ANIM_VEC(duckwalkstrafeleft, 1, 1), ANIM_VEC(duckwalk, 1, 1));
+       e.anim_duckwalkstraferight = animfixfps(e, ANIM_VEC(duckwalkstraferight, 1, 1), ANIM_VEC(duckwalk, 1, 1));
+       e.anim_duckwalkforwardright = animfixfps(e, ANIM_VEC(duckwalkforwardright, 1, 1), ANIM_VEC(duckwalk, 1, 1));
+       e.anim_duckwalkforwardleft = animfixfps(e, ANIM_VEC(duckwalkforwardleft, 1, 1), ANIM_VEC(duckwalk, 1, 1));
+       e.anim_duckwalkbackright = animfixfps(e, ANIM_VEC(duckwalkbackright, 1,  1), ANIM_VEC(duckwalk, 1, 1));
+       e.anim_duckwalkbackleft  = animfixfps(e, ANIM_VEC(duckwalkbackleft , 1,  1), ANIM_VEC(duckwalk, 1, 1));
 
        // these anims ought to stay until stopped explicitly by weaponsystem
        e.anim_shoot_z = 0.001;

diff --git a/qcsrc/common/animdecide.qh b/qcsrc/common/animdecide.qh
index 521c6ab989b906649bf774b55ca840cb8416de1b..7cf7ee45509d530d4fee3c2002c266179be2f755 100644 (file)
--- a/qcsrc/common/animdecide.qh
+++ b/qcsrc/common/animdecide.qh
@@ -8,40 +8,99 @@ void animdecide_load_if_needed(entity e);
 void animdecide_setimplicitstate(entity e, float onground);
 void animdecide_setframes(entity e, bool support_blending, .int fld_frame, .int fld_frame1time, .int fld_frame2, .int fld_frame2time);
 
+CLASS(Animation, Object)
+       ATTRIB(Animation, m_framenames, string, string_null)
+       METHOD(Animation, anim_getframe, int(Animation this, int mdlidx))
+       {
+               FOREACH_WORD(this.m_framenames, true, {
+                       int f = frameforname(mdlidx, it);
+                       if (f != -1) return f;
+               });
+#ifdef CSQC
+               LOG_WARNINGF("Missing animation for %s: %s\n", modelnameforindex(mdlidx), this.registered_id);
+#endif
+               return -1;
+       }
+ENDCLASS(Animation)
+
+REGISTRY(Animations, BITS(8))
+REGISTER_REGISTRY(Animations)
+#define REGISTER_ANIMATION(id, framenames) \
+       .vector anim_##id; \
+       REGISTER(Animations, ANIM_##id, m_id, NEW(Animation)) { \
+               this.m_framenames = framenames; \
+       }
+
+vector _ANIM_VEC_v;
+Animation _ANIM_VEC_a;
+#define ANIM_VEC(anim, numframes, framerate) \
+( \
+       _ANIM_VEC_v.y = numframes, \
+       _ANIM_VEC_v.z = framerate, \
+       _ANIM_VEC_a = ANIM_##anim, \
+       _ANIM_VEC_v.x = _ANIM_VEC_a.anim_getframe(_ANIM_VEC_a, mdlidx), \
+       _ANIM_VEC_v \
+)
+
 // player animation data for this model
 // each vector is as follows:
 // _x = startframe
 // _y = numframes
 // _z = framerate
-.vector anim_die1; // player dies
-.vector anim_die2; // player dies differently
-.vector anim_draw; // player pulls out a weapon
-.vector anim_duckwalk; // player walking while crouching
-.vector anim_duckjump; // player jumping from a crouch
-.vector anim_duckidle; // player idling while crouching
-.vector anim_idle; // player standing
-.vector anim_jump; // player jump
-.vector anim_pain1; // player flinches from pain
-.vector anim_pain2; // player flinches from pain, differently
-.vector anim_shoot; // player shoots
-.vector anim_taunt; // player taunts others (FIXME: no code references this)
-.vector anim_run; // player running forward
-.vector anim_runbackwards; // player running backward
-.vector anim_strafeleft; // player shuffling left quickly
-.vector anim_straferight; // player shuffling right quickly
-.vector anim_forwardright; // player running forward and right
-.vector anim_forwardleft; // player running forward and left
-.vector anim_backright; // player running backward and right
-.vector anim_backleft; // player running back and left
-.vector anim_melee; // player doing the melee action
-.vector anim_duck; // player doing the melee action
-.vector anim_duckwalkbackwards;
-.vector anim_duckwalkstrafeleft;
-.vector anim_duckwalkstraferight;
-.vector anim_duckwalkforwardright;
-.vector anim_duckwalkforwardleft;
-.vector anim_duckwalkbackright;
-.vector anim_duckwalkbackleft;
+/** player dies */
+REGISTER_ANIMATION(die1, "dieone groupified_0_anim");
+/** player dies differently */
+REGISTER_ANIMATION(die2, "dietwo groupified_1_anim");
+/**  */
+REGISTER_ANIMATION(dead1, "deadone groupified_17_anim");
+/**  */
+REGISTER_ANIMATION(dead2, "deadtwo groupified_18_anim");
+/** player pulls out a weapon */
+REGISTER_ANIMATION(draw, "draw groupified_2_anim");
+/** player walking while crouching */
+REGISTER_ANIMATION(duckwalk, "duckwalk groupified_4_anim");
+/** player jumping from a crouch */
+REGISTER_ANIMATION(duckjump, "duckjump groupified_5_anim");
+/** player idling while crouching */
+REGISTER_ANIMATION(duckidle, "duckidle groupified_6_anim");
+/** player standing */
+REGISTER_ANIMATION(idle, "idle groupified_7_anim");
+/** player jump */
+REGISTER_ANIMATION(jump, "jump groupified_8_anim");
+/** player flinches from pain */
+REGISTER_ANIMATION(pain1, "painone groupified_9_anim");
+/** player flinches from pain, differently */
+REGISTER_ANIMATION(pain2, "paintwo groupified_10_anim");
+/** player shoots */
+REGISTER_ANIMATION(shoot, "shoot groupified_11_anim");
+/** player taunts others (FIXME: no code references this) */
+REGISTER_ANIMATION(taunt, "taunt groupified_12_anim");
+/** player running forward */
+REGISTER_ANIMATION(run, "run groupified_13_anim");
+/** player running backward */
+REGISTER_ANIMATION(runbackwards, "runbackwards groupified_14_anim");
+/** player shuffling left quickly */
+REGISTER_ANIMATION(strafeleft, "strafeleft groupified_15_anim");
+/** player shuffling right quickly */
+REGISTER_ANIMATION(straferight, "straferight groupified_16_anim");
+/** player running forward and right */
+REGISTER_ANIMATION(forwardright, "forwardright groupified_19_anim");
+/** player running forward and left */
+REGISTER_ANIMATION(forwardleft, "forwardleft groupified_20_anim");
+/** player running backward and right */
+REGISTER_ANIMATION(backright, "backright groupified_21_anim");
+/** player running back and left */
+REGISTER_ANIMATION(backleft, "backleft groupified_22_anim");
+/** player doing the melee action */
+REGISTER_ANIMATION(melee, "melee groupified_23_anim");
+REGISTER_ANIMATION(duck, "duck groupified_3_anim");
+REGISTER_ANIMATION(duckwalkbackwards, "duckwalkbackwards groupified_24_anim");
+REGISTER_ANIMATION(duckwalkstrafeleft, "duckwalkstrafeleft duckstrafeleft groupified_25_anim");
+REGISTER_ANIMATION(duckwalkstraferight, "duckwalkstraferight duckstraferight groupified_26_anim");
+REGISTER_ANIMATION(duckwalkforwardright, "duckwalkforwardright duckforwardright groupified_27_anim");
+REGISTER_ANIMATION(duckwalkforwardleft, "duckwalkforwardleft groupified_28_anim");
+REGISTER_ANIMATION(duckwalkbackright, "duckwalkbackright duckbackwardright groupified_29_anim");
+REGISTER_ANIMATION(duckwalkbackleft, "duckwalkbackleft duckbackwardleft groupified_30_anim");
 .float animdecide_modelindex;
 
 // please network this one

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index b322741f29d5a6fd60ed670cd8fff51af58452e4..c81b1a5769942860beb7702b747d1ca01a4c53bf 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -1431,14 +1431,13 @@ vector animfixfps(entity e, vector a, vector b)
        // multi-frame anim: keep as-is
        if(a.y == 1)
        {
-               float dur;
-               dur = frameduration(e.modelindex, a.x);
-               if(dur <= 0 && b.y)
+               float dur = frameduration(e.modelindex, a.x);
+               if (dur <= 0 && b.y)
                {
                        a = b;
                        dur = frameduration(e.modelindex, a.x);
                }
-               if(dur > 0)
+               if (dur > 0)
                        a.z = 1.0 / dur;
        }
        return a;