Skip to content

Commit

Permalink
utils: pxstudiomdl: removed unused model activities
Browse files Browse the repository at this point in the history
  • Loading branch information
SNMetamorph committed Jan 2, 2024
1 parent 2145f93 commit 1fc93cb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 119 deletions.
66 changes: 1 addition & 65 deletions utils/pxstudiomdl/activity.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,71 +94,7 @@ typedef enum
ACT_FLINCH_LEFTARM,
ACT_FLINCH_RIGHTARM,
ACT_FLINCH_LEFTLEG,
ACT_FLINCH_RIGHTLEG,

// acts for viewmodel
ACT_VM_NONE, // weapon viewmodel animations
ACT_VM_DEPLOY, // deploy
ACT_VM_DEPLOY_EMPTY, // deploy empty weapon
ACT_VM_HOLSTER, // holster empty weapon
ACT_VM_HOLSTER_EMPTY,
ACT_VM_IDLE,
ACT_VM_IDLE_IS, // IronSight animations
ACT_VM_RANGE_ATTACK,
ACT_VM_RANGE_ATTACK_IS, // IronSight animations
ACT_VM_MELEE_ATTACK,
ACT_VM_MELEE_ATTACK_IS, // IronSight animations
ACT_VM_SHOOT_LAST,
ACT_VM_SHOOT_LAST_IS, // IronSight animations
ACT_VM_LAST_MELEE_ATTACK,
ACT_VM_LAST_MELEE_ATTACK_IS, // IronSight animations
ACT_VM_START_RELOAD,
ACT_VM_START_RELOAD_IS,
ACT_VM_RELOAD,
ACT_VM_RELOAD_IS,
ACT_VM_RELOAD_EMPTY,
ACT_VM_RELOAD_EMPTY_IS,
ACT_VM_TURNON, // switch firemode on
ACT_VM_TURNOFF, // switch firemode off
ACT_VM_PUMP, // user animations
ACT_VM_PUMP_IS,
ACT_VM_PUMP_EMPTY,
ACT_VM_PUMP_EMPTY_IS,
ACT_VM_START_CHARGE,
ACT_VM_CHARGE,
ACT_VM_OVERLOAD,
ACT_VM_IDLE_EMPTY,
ACT_VM_IDLE_EMPTY_IS,
ACT_VM_IRONSIGHT_ON,
ACT_VM_IRONSIGHT_OFF,
ACT_VM_SHOOT_EMPTY,
ACT_VM_SHOOT_EMPTY_IS,
ACT_VM_IRONSIGHT_ON_EMPTY,
ACT_VM_IRONSIGHT_OFF_EMPTY,
ACT_VM_RESERVED0, // reserved acts for future expansions
ACT_VM_RESERVED1,
ACT_VM_RESERVED2,
ACT_VM_RESERVED3,
ACT_VM_RESERVED4,

// continue enumerate acts for monsters
ACT_FLASHLIGHT,
ACT_WALKBACK_FIRE,

ACT_FIRINGWALK,
ACT_FIRINGRUN,
ACT_DIERAGDOLL,
ACT_180_LEFT, // 180 degree left turn
ACT_180_RIGHT,
ACT_90_LEFT, // 90 degree turns
ACT_90_RIGHT,

// Sometimes, you just want to set an NPC's sequence to a sequence that doesn't actually
// have an activity. The AI will reset the NPC's sequence to whatever its IDEAL activity
// is, though. So if you set ideal activity to DO_NOT_DISTURB, the AI will not interfere
// with the NPC's current sequence. (SJB)
ACT_DO_NOT_DISTURB,
ACT_TRANSITION,
ACT_FLINCH_RIGHTLEG
} Activity;

typedef struct
Expand Down
54 changes: 0 additions & 54 deletions utils/pxstudiomdl/activitymap.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,59 +93,5 @@ activity_map_t activity_map[] =
_A( ACT_FLINCH_RIGHTARM ),
_A( ACT_FLINCH_LEFTLEG ),
_A( ACT_FLINCH_RIGHTLEG ),
_A( ACT_VM_NONE ),
_A( ACT_VM_DEPLOY ),
_A( ACT_VM_DEPLOY_EMPTY ),
_A( ACT_VM_HOLSTER ),
_A( ACT_VM_HOLSTER_EMPTY ),
_A( ACT_VM_IDLE ),
_A( ACT_VM_IDLE_IS ),
_A( ACT_VM_RANGE_ATTACK ),
_A( ACT_VM_RANGE_ATTACK_IS ),
_A( ACT_VM_MELEE_ATTACK ),
_A( ACT_VM_MELEE_ATTACK_IS ),
_A( ACT_VM_SHOOT_LAST ),
_A( ACT_VM_SHOOT_LAST_IS ),
_A( ACT_VM_LAST_MELEE_ATTACK ),
_A( ACT_VM_LAST_MELEE_ATTACK_IS ),
_A( ACT_VM_START_RELOAD ),
_A( ACT_VM_START_RELOAD_IS ),
_A( ACT_VM_RELOAD ),
_A( ACT_VM_RELOAD_IS ),
_A( ACT_VM_RELOAD_EMPTY ),
_A( ACT_VM_RELOAD_EMPTY_IS ),
_A( ACT_VM_TURNON ),
_A( ACT_VM_TURNOFF ),
_A( ACT_VM_PUMP ),
_A( ACT_VM_PUMP_IS ),
_A( ACT_VM_PUMP_EMPTY ),
_A( ACT_VM_PUMP_EMPTY_IS ),
_A( ACT_VM_START_CHARGE ),
_A( ACT_VM_CHARGE ),
_A( ACT_VM_OVERLOAD ),
_A( ACT_VM_IDLE_EMPTY ),
_A( ACT_VM_IDLE_EMPTY_IS ),
_A( ACT_VM_IRONSIGHT_ON ),
_A( ACT_VM_IRONSIGHT_OFF ),
_A( ACT_VM_SHOOT_EMPTY ),
_A( ACT_VM_SHOOT_EMPTY_IS ),
_A( ACT_VM_IRONSIGHT_ON_EMPTY ),
_A( ACT_VM_IRONSIGHT_OFF_EMPTY ),
_A( ACT_VM_RESERVED0 ),
_A( ACT_VM_RESERVED1 ),
_A( ACT_VM_RESERVED2 ),
_A( ACT_VM_RESERVED3 ),
_A( ACT_VM_RESERVED4 ),
_A( ACT_FLASHLIGHT ),
_A( ACT_WALKBACK_FIRE ),
_A( ACT_FIRINGWALK ),
_A( ACT_FIRINGRUN ),
_A( ACT_DIERAGDOLL ),
_A( ACT_180_LEFT ),
_A( ACT_180_RIGHT ),
_A( ACT_90_LEFT ),
_A( ACT_90_RIGHT ),
_A( ACT_DO_NOT_DISTURB ),
_A( ACT_TRANSITION ),
0, NULL
};

0 comments on commit 1fc93cb

Please sign in to comment.