Numerous E3 bug fixes.

This commit is contained in:
Justin Marshall
2026-05-20 18:05:40 -07:00
parent c1b9836965
commit 031adca949
54 changed files with 2250 additions and 931 deletions
+12 -2
View File
@@ -2,12 +2,17 @@ MD5Version 10
commandline "anim maps/fred/bathroom/SCENE4.mb -dest maps/fred/bathroom/cam9a.md5anim -game Doom -keep camera1 camera2 camera3 -nomesh -range 50 213"
numFrames 164
numJoints 1
numJoints 6
frameRate 24
numAnimatedComponents 6
hierarchy {
"camera1" -1 63 0 //
"camera5" -1 0 0 //
"camera4" 0 0 0 // camera5
"camera3" 0 0 0 // camera5
"camera2" 0 0 0 // camera5
"camera1a" 0 0 0 // camera5
"camera1" 0 63 0 // camera5
}
bounds {
@@ -178,6 +183,11 @@ bounds {
}
baseframe {
( 0.000000 0.000000 0.000000 ) ( 0.000000 0.000000 -0.707107 )
( 0.000000 0.000000 0.000000 ) ( 0.000000 0.000000 0.000000 )
( 0.000000 0.000000 0.000000 ) ( 0.000000 0.000000 0.000000 )
( 0.000000 0.000000 0.000000 ) ( 0.000000 0.000000 0.000000 )
( 0.000000 0.000000 0.000000 ) ( 0.000000 0.000000 0.000000 )
( -2985.593800 -1313.187500 24.718800 ) ( -0.040039 -0.175436 0.982942 )
}
+3 -3
View File
@@ -72,7 +72,7 @@ joints {
mesh {
// legacy mesh 0
shader "P:/Doom/base/models/monsters/pinky/pinky.tga"
shader "models/monsters/pinky/pinky"
numverts 1028
vert 0 ( 0.648707 0.116358 ) 0 1
@@ -4415,7 +4415,7 @@ mesh {
mesh {
// legacy mesh 1
shader "P:/Doom/base/models/monsters/pinky/teeth.tga"
shader "models/monsters/pinky/teeth"
numverts 22
vert 0 ( 0.572845 0.005017 ) 0 1
@@ -4488,7 +4488,7 @@ mesh {
mesh {
// legacy mesh 2
shader "P:/Doom/base/models/monsters/pinky/film.tga"
shader "models/monsters/pinky/film"
numverts 10
vert 0 ( 0.004951 0.067088 ) 0 1
+1 -1
View File
@@ -85,7 +85,7 @@ joints {
mesh {
// legacy mesh 0
shader "P:/Doom/base/models/monsters/zombie/fatty/fatty.tga"
shader "models/monsters/zombie/fatty/fatty"
numverts 874
vert 0 ( 0.636396 0.345697 ) 0 2
@@ -72,7 +72,7 @@ joints {
mesh {
// legacy mesh 0
shader "P:/Doom/base/models/monsters/pinky/pinky.tga"
shader "models/monsters/pinky/pinky"
numverts 1028
vert 0 ( 0.648707 0.116358 ) 0 1
@@ -4415,7 +4415,7 @@ mesh {
mesh {
// legacy mesh 1
shader "P:/Doom/base/models/monsters/pinky/teeth.tga"
shader "models/monsters/pinky/teeth"
numverts 22
vert 0 ( 0.572845 0.005017 ) 0 1
@@ -4488,7 +4488,7 @@ mesh {
mesh {
// legacy mesh 2
shader "P:/Doom/base/models/monsters/pinky/film.tga"
shader "models/monsters/pinky/film"
numverts 10
vert 0 ( 0.004951 0.067088 ) 0 1
+10 -10
View File
@@ -97,7 +97,7 @@ joints {
mesh {
// legacy mesh 0
shader "P:/Doom/base/models/weapons/pistol/pistol.tga"
shader "models/weapons/pistol/pistol"
numverts 512
vert 0 ( 0.945386 0.509442 ) 9 1
@@ -1829,7 +1829,7 @@ mesh {
mesh {
// legacy mesh 1
shader "P:/Doom/base/models/weapons/machinegun/machinegun.tga"
shader "models/weapons/machinegun/machinegun"
numverts 552
vert 0 ( 0.418084 0.451208 ) 5 1
@@ -3597,7 +3597,7 @@ mesh {
mesh {
// legacy mesh 2
shader "P:/Doom/base/models/weapons/machinegun/m_gui.tga"
shader "models/weapons/machinegun/m_gui"
numverts 4
vert 0 ( 1.000000 1.000000 ) 0 1
@@ -3618,7 +3618,7 @@ mesh {
mesh {
// legacy mesh 3
shader "P:/Doom/base/models/monsters/zombie/zombie01/ztorso02.tga"
shader "models/monsters/zombie/zombie01/ztorso02"
numverts 29
vert 0 ( 0.241231 0.089256 ) 0 1
@@ -3729,7 +3729,7 @@ mesh {
mesh {
// legacy mesh 4
shader "P:/Doom/base/models/characters/player/body.tga"
shader "models/characters/player/body"
numverts 1575
vert 0 ( 0.771985 0.173949 ) 406 3
@@ -10802,7 +10802,7 @@ mesh {
mesh {
// legacy mesh 5
shader "P:/Doom/base/models/characters/player/arm1.tga"
shader "models/characters/player/arm1"
numverts 802
vert 0 ( 0.610163 0.980192 ) 555 2
@@ -14586,7 +14586,7 @@ mesh {
mesh {
// legacy mesh 6
shader "P:/Doom/base/models/characters/player/helmet.tga"
shader "models/characters/player/helmet"
numverts 167
vert 0 ( 0.506151 0.266933 ) 7 1
@@ -15253,7 +15253,7 @@ mesh {
mesh {
// legacy mesh 7
shader "P:/Doom/base/models/characters/player/playerhead.tga"
shader "models/characters/player/playerhead"
numverts 256
vert 0 ( 0.465513 0.983807 ) 0 1
@@ -16309,7 +16309,7 @@ mesh {
mesh {
// legacy mesh 8
shader "P:/Doom/base/models/characters/sarge2/teeth/teeth.tga"
shader "models/characters/sarge2/teeth/teeth"
numverts 28
vert 0 ( 0.318154 0.517163 ) 0 1
@@ -16400,7 +16400,7 @@ mesh {
mesh {
// legacy mesh 9
shader "P:/Doom/base/models/characters/player/eyes.tga"
shader "models/characters/player/eyes"
numverts 30
vert 0 ( 0.791276 0.533895 ) 0 1
+12 -2
View File
@@ -2,12 +2,17 @@ MD5Version 10
commandline "anim maps/fred/bathroom/SCENE2.mb -dest maps/fred/bathroom/scene2cam.md5anim -game Doom -keep camera1 -nomesh -range 515 552"
numFrames 38
numJoints 1
numJoints 6
frameRate 24
numAnimatedComponents 0
hierarchy {
"camera1" -1 0 0 //
"camera5" -1 0 0 //
"camera4" 0 0 0 // camera5
"camera3" 0 0 0 // camera5
"camera2" 0 0 0 // camera5
"camera1a" 0 0 0 // camera5
"camera1" 0 0 0 // camera5
}
bounds {
@@ -52,6 +57,11 @@ bounds {
}
baseframe {
( 0.000000 0.000000 0.000000 ) ( 0.000000 0.000000 -0.707107 )
( 0.000000 0.000000 0.000000 ) ( 0.000000 0.000000 0.000000 )
( 0.000000 0.000000 0.000000 ) ( 0.000000 0.000000 0.000000 )
( 0.000000 0.000000 0.000000 ) ( 0.000000 0.000000 0.000000 )
( 0.000000 0.000000 0.000000 ) ( 0.000000 0.000000 0.000000 )
( -2933.921900 -1392.039100 8.953100 ) ( -0.087711 0.028354 -0.947468 )
}
+10 -4
View File
@@ -2,14 +2,17 @@ MD5Version 10
commandline "anim maps/fred/bathroom/SCENE3.mb -dest maps/fred/bathroom/scene3cams.md5anim -game Doom -keep camera1 camera2 camera3 -nomesh -range 553 900"
numFrames 348
numJoints 3
numJoints 6
frameRate 24
numAnimatedComponents 8
hierarchy {
"camera3" -1 62 0 //
"camera2" 0 56 5 // camera3
"camera1" 0 0 0 // camera3
"camera5" -1 0 0 //
"camera4" 0 0 0 // camera5
"camera3" 0 62 0 // camera5
"camera2" 0 56 5 // camera5
"camera1a" 0 0 0 // camera5
"camera1" 0 0 0 // camera5
}
bounds {
@@ -364,8 +367,11 @@ bounds {
}
baseframe {
( 0.000000 0.000000 0.000000 ) ( 0.000000 0.000000 -0.707107 )
( 0.000000 0.000000 0.000000 ) ( 0.000000 0.000000 0.000000 )
( -3039.601600 -1340.898400 68.734400 ) ( 0.350211 -0.332656 -0.634857 )
( -3008.765600 -1282.062500 92.085900 ) ( -0.228779 -0.074697 0.922673 )
( 0.000000 0.000000 0.000000 ) ( 0.000000 0.000000 0.000000 )
( -3100.226600 -1400.273400 147.726600 ) ( 0.258246 -0.311974 -0.583021 )
}
@@ -116,7 +116,7 @@ joints {
mesh {
// legacy mesh 0
shader "P:/Doom/base/models/monsters/zombie/fatty/bloodyfatty.tga"
shader "models/monsters/zombie/fatty/bloodyfatty"
numverts 1002
vert 0 ( 0.636396 0.345697 ) 0 2
@@ -4241,7 +4241,7 @@ mesh {
mesh {
// legacy mesh 1
shader "P:/Doom/base/models/gibs/meat_strand.tga"
shader "models/gibs/meat_strand"
numverts 54
vert 0 ( 0.000000 1.000000 ) 0 2
@@ -72,7 +72,7 @@ joints {
mesh {
// legacy mesh 0
shader "P:/Doom/base/models/monsters/pinky/pinkyns.tga"
shader "models/monsters/pinky/pinkyns"
numverts 1028
vert 0 ( 0.648707 0.116358 ) 0 1
@@ -4391,7 +4391,7 @@ mesh {
mesh {
// legacy mesh 1
shader "P:/Doom/base/models/monsters/pinky/teeth.tga"
shader "models/monsters/pinky/teeth"
numverts 22
vert 0 ( 0.572845 0.005017 ) 0 1
@@ -4464,7 +4464,7 @@ mesh {
mesh {
// legacy mesh 2
shader "P:/Doom/base/models/monsters/pinky/film.tga"
shader "models/monsters/pinky/film"
numverts 10
vert 0 ( 0.004951 0.067088 ) 0 1
@@ -94,7 +94,7 @@ joints {
mesh {
// legacy mesh 0
shader "P:/Doom/base/models/monsters/zombie/fatty/bloodyfatty.tga"
shader "models/monsters/zombie/fatty/bloodyfatty"
numverts 976
vert 0 ( 0.636396 0.345697 ) 0 2
@@ -4109,7 +4109,7 @@ mesh {
mesh {
// legacy mesh 1
shader "P:/Doom/base/models/gibs/meat_strand.tga"
shader "models/gibs/meat_strand"
numverts 36
vert 0 ( 0.000000 1.000000 ) 0 1
@@ -79,7 +79,7 @@ joints {
mesh {
// legacy mesh 0
shader "P:/Doom/base/models/monsters/pinky/film.tga"
shader "models/monsters/pinky/film"
numverts 10
vert 0 ( 0.004951 0.067088 ) 0 1
@@ -118,7 +118,7 @@ mesh {
mesh {
// legacy mesh 1
shader "P:/Doom/base/models/monsters/pinky/teeth.tga"
shader "models/monsters/pinky/teeth"
numverts 22
vert 0 ( 0.572845 0.005017 ) 0 1
@@ -191,7 +191,7 @@ mesh {
mesh {
// legacy mesh 2
shader "P:/Doom/base/models/monsters/pinky/pinkyns.tga"
shader "models/monsters/pinky/pinkyns"
numverts 1028
vert 0 ( 0.145448 0.825589 ) 0 2
@@ -4519,7 +4519,7 @@ mesh {
mesh {
// legacy mesh 3
shader "P:/Doom/base/models/gibs/meat_strand.tga"
shader "models/gibs/meat_strand"
numverts 36
vert 0 ( 0.000000 1.000000 ) 0 2
@@ -4658,7 +4658,7 @@ mesh {
mesh {
// legacy mesh 4
shader "P:/Doom/base/models/monsters/zombie/fatty/fatty.tga"
shader "models/monsters/zombie/fatty/fatty"
numverts 23
vert 0 ( 0.636396 0.345697 ) 0 1
File diff suppressed because it is too large Load Diff
+76 -62
View File
@@ -2,74 +2,81 @@ MD5Version 10
commandline "anim maps/fred/bathroom/SCENE4.mb -dest maps/fred/bathroom/scene9a_pinky.md5anim -game Doom -prefix PINKY_ -range 50 213"
numFrames 164
numJoints 63
numJoints 70
frameRate 24
numAnimatedComponents 73
hierarchy {
"origin" -1 3 0 //
"M1" 0 0 0 // origin
"M7" 1 0 0 // M1
"M6" 1 0 0 // M1
"M5" 1 0 0 // M1
"M2" 1 0 0 // M1
"M4" 5 0 0 // M2
"M3" 5 0 0 // M2
"Body" 0 58 2 // origin
"Chest" 1 63 6 // Body
"Abdomen" 2 0 0 // Chest
"Belly" 3 0 0 // Abdomen
"Neck_Flesh" 4 0 0 // Belly
"Rshldr" 2 15 12 // Chest
"Ruparm" 6 56 16 // Rshldr
"Rloarm" 7 56 19 // Ruparm
"Rhand_r" 8 56 22 // Rloarm
"Rpalm_r" 9 0 0 // Rhand_r
"Rpinky1" 10 56 25 // Rpalm_r
"Rpinky2" 11 8 28 // Rpinky1
"Rpinky3" 12 0 0 // Rpinky2
"Rmid1" 10 0 0 // Rpalm_r
"Rmid2" 14 8 29 // Rmid1
"Rmid3" 15 0 0 // Rmid2
"Rindex1" 10 56 30 // Rpalm_r
"Rindex2" 17 8 33 // Rindex1
"Rindex3" 18 0 0 // Rindex2
"Rthumb1" 10 0 0 // Rpalm_r
"Rthumb2" 20 0 0 // Rthumb1
"Rthumb3" 21 0 0 // Rthumb2
"LShldr" 2 0 0 // Chest
"Luparm" 23 56 34 // LShldr
"Lloarm" 24 56 37 // Luparm
"Lhand_r" 25 56 40 // Lloarm
"Lpalm_r" 26 0 0 // Lhand_r
"Lthumb1" 27 0 0 // Lpalm_r
"Lthumb2" 28 0 0 // Lthumb1
"Lthumb3" 29 0 0 // Lthumb2
"Lindex1" 27 0 0 // Lpalm_r
"Lindex2" 31 0 0 // Lindex1
"Lindex3" 32 0 0 // Lindex2
"Lmid1" 27 0 0 // Lpalm_r
"Lmid2" 34 0 0 // Lmid1
"Lmid3" 35 0 0 // Lmid2
"Lpinky1" 27 0 0 // Lpalm_r
"Lpinky2" 37 0 0 // Lpinky1
"Lpinky3" 38 0 0 // Lpinky2
"LoNeck" 2 56 43 // Chest
"Head" 40 56 46 // LoNeck
"Head2" 41 0 0 // Head
"Mouth_Piece" 42 0 0 // Head2
"Jaw" 43 56 49 // Mouth_Piece
"Chin" 44 0 0 // Jaw
"Chin_Flesh" 42 0 0 // Head2
"Forehead_Flesh" 42 0 0 // Head2
"Waist" 1 56 52 // Body
"waist2" 48 0 0 // Waist
"Waist3" 49 0 0 // waist2
"Hips" 50 0 0 // Waist3
"Hips2" 51 0 0 // Hips
"Rupleg" 52 56 55 // Hips2
"Rloleg" 53 56 58 // Rupleg
"Rankle_r" 54 56 61 // Rloleg
"Rfoot_r" 55 0 0 // Rankle_r
"Rtoe_r" 56 0 0 // Rfoot_r
"Lupleg" 52 56 64 // Hips2
"Lloleg" 58 56 67 // Lupleg
"Lankle_r" 59 56 70 // Lloleg
"Lfoot_r" 60 0 0 // Lankle_r
"Ltoe_r" 61 0 0 // Lfoot_r
"Chest" 8 63 6 // Body
"Abdomen" 9 0 0 // Chest
"Belly" 10 0 0 // Abdomen
"Neck_Flesh" 11 0 0 // Belly
"Rshldr" 9 15 12 // Chest
"Ruparm" 13 56 16 // Rshldr
"Rloarm" 14 56 19 // Ruparm
"Rhand_r" 15 56 22 // Rloarm
"Rpalm_r" 16 0 0 // Rhand_r
"Rpinky1" 17 56 25 // Rpalm_r
"Rpinky2" 18 8 28 // Rpinky1
"Rpinky3" 19 0 0 // Rpinky2
"Rmid1" 17 0 0 // Rpalm_r
"Rmid2" 21 8 29 // Rmid1
"Rmid3" 22 0 0 // Rmid2
"Rindex1" 17 56 30 // Rpalm_r
"Rindex2" 24 8 33 // Rindex1
"Rindex3" 25 0 0 // Rindex2
"Rthumb1" 17 0 0 // Rpalm_r
"Rthumb2" 27 0 0 // Rthumb1
"Rthumb3" 28 0 0 // Rthumb2
"LShldr" 9 0 0 // Chest
"Luparm" 30 56 34 // LShldr
"Lloarm" 31 56 37 // Luparm
"Lhand_r" 32 56 40 // Lloarm
"Lpalm_r" 33 0 0 // Lhand_r
"Lthumb1" 34 0 0 // Lpalm_r
"Lthumb2" 35 0 0 // Lthumb1
"Lthumb3" 36 0 0 // Lthumb2
"Lindex1" 34 0 0 // Lpalm_r
"Lindex2" 38 0 0 // Lindex1
"Lindex3" 39 0 0 // Lindex2
"Lmid1" 34 0 0 // Lpalm_r
"Lmid2" 41 0 0 // Lmid1
"Lmid3" 42 0 0 // Lmid2
"Lpinky1" 34 0 0 // Lpalm_r
"Lpinky2" 44 0 0 // Lpinky1
"Lpinky3" 45 0 0 // Lpinky2
"LoNeck" 9 56 43 // Chest
"Head" 47 56 46 // LoNeck
"Head2" 48 0 0 // Head
"Mouth_Piece" 49 0 0 // Head2
"Jaw" 50 56 49 // Mouth_Piece
"Chin" 51 0 0 // Jaw
"Chin_Flesh" 49 0 0 // Head2
"Forehead_Flesh" 49 0 0 // Head2
"Waist" 8 56 52 // Body
"waist2" 55 0 0 // Waist
"Waist3" 56 0 0 // waist2
"Hips" 57 0 0 // Waist3
"Hips2" 58 0 0 // Hips
"Rupleg" 59 56 55 // Hips2
"Rloleg" 60 56 58 // Rupleg
"Rankle_r" 61 56 61 // Rloleg
"Rfoot_r" 62 0 0 // Rankle_r
"Rtoe_r" 63 0 0 // Rfoot_r
"Lupleg" 59 56 64 // Hips2
"Lloleg" 65 56 67 // Lupleg
"Lankle_r" 66 56 70 // Lloleg
"Lfoot_r" 67 0 0 // Lankle_r
"Ltoe_r" 68 0 0 // Lfoot_r
}
bounds {
@@ -241,6 +248,13 @@ bounds {
baseframe {
( 0.000000 0.000000 0.000000 ) ( -0.707107 0.000000 0.000000 )
( -3019.046875 -1303.082886 28.268885 ) ( 0.000000 0.000000 -0.035646 )
( 5.855202 -5.386911 -4.762694 ) ( 0.000000 0.000000 0.000000 )
( 7.099198 5.559482 0.000000 ) ( 0.000000 0.000000 0.000000 )
( 8.339117 1.888814 4.148153 ) ( 0.000000 0.000000 0.000000 )
( 6.471038 0.000018 0.000000 ) ( 0.000000 0.000000 -0.278375 )
( 7.756072 -8.513586 0.000000 ) ( 0.000000 0.000000 0.000000 )
( 10.097025 0.000070 0.000000 ) ( -0.671708 0.220925 0.220925 )
( 0.000000 74.476600 0.000000 ) ( -0.007991 0.000270 -0.034494 )
( 0.000000 -2.796900 -0.164100 ) ( 0.017793 0.000361 -0.001085 )
( 0.000000 -20.945300 -3.835900 ) ( 0.000000 0.000000 0.000000 )