Merge pull request #137 from malortie/model-w_tripmine

Add shared LD/HD world tripmine model.
twhl-community · Oct 3, 2023 · 4aa135f · 4aa135f
2 parents 2a5ba15 + f7ef135
commit 4aa135f
Show file tree

Hide file tree

Showing 26 changed files with 1,069 additions and 8,181 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -521,6 +521,7 @@ Table of contents:
 
 * Use LD HL1 sequence `fidget` for LD Blue Shift sequence `fidget`
 * Removed loop option on HD sequence `arm1`
+* Moved LD/HD world tripmine to separate models
 
 #### World models
 
@@ -582,6 +583,12 @@ Table of contents:
 
 * Uses Op4 model mesh as a base
 
+##### Tripmine world model
+
+* Removed unneeded frames in world and ground sequences
+* Fixed tripmine clipping through floor in ground sequences
+* Added missing polygons to LD variant
+
 ## Sprites
 
 ### General

diff --git a/modelsrc/models/v_tripmine/animations/ld/ground.smd b/modelsrc/models/v_tripmine/animations/ld/ground.smd
diff --git a/modelsrc/models/v_tripmine/animations/ld/world.smd b/modelsrc/models/v_tripmine/animations/ld/world.smd
diff --git a/modelsrc/models/v_tripmine/meshes/ld/tripmine_boned_world.smd b/modelsrc/models/v_tripmine/meshes/ld/tripmine_boned_world.smd
diff --git a/modelsrc/models/v_tripmine/v_tripmine_guard_hd.qc b/modelsrc/models/v_tripmine/v_tripmine_guard_hd.qc
@@ -15,7 +15,7 @@ Original internal name:
 $modelname "v_tripmine_guard_hd.mdl"
 $cd "./"
 $cdtexture "../../textures/viewmodel/hands/guard"
-$cdtexture "../../textures/viewmodel/v_tripmine"
+$cdtexture "../../textures/w_tripmine"
 $scale 1.0
 
 
@@ -28,13 +28,11 @@ $eyeposition 0.000000 0.000000 0.000000
 $bodygroup "hands"
 {
 studio "meshes/hd/v_barney_hands_reference"
-blank
 }
 
 $bodygroup "mine"
 {
 studio "meshes/hd/V_tripmine_reference"
-studio "meshes/hd/w_tripmine_Reference"
 }
 
 
@@ -45,7 +43,6 @@ $hbox 0 "L_Arm_bone" -1.850000 -2.510000 -3.310000 2.570000 2.480000 9.180000
 $hbox 0 "Bip01 R Hand" 0.000000 -1.060000 -1.720000 3.900000 0.800000 1.830000
 $hbox 0 "Bip01 R Finger0" 0.000000 -0.850000 -0.920000 2.373626 0.370000 0.450000
 $hbox 0 "R_Arm_bone" -2.430000 -2.520000 -3.290000 1.980000 2.530000 9.200000
-$hbox 0 "tripmine" -11.140000 -3.790000 -8.170000 11.190000 7.180000 1.980000
 
 // 9 animation sequence(s)
 $sequence "idle1" "animations/hd/idle1" fps 15 loop 
@@ -55,7 +52,5 @@ $sequence "place" "animations/hd/place" fps 30
 $sequence "fidget" "animations/hd/fidget" fps 30 loop 
 $sequence "holster" "animations/hd/holster" fps 30 
 $sequence "draw" "animations/hd/draw" fps 30 
-$sequence "world" "animations/hd/world" fps 30 loop 
-$sequence "ground" "animations/hd/ground" fps 30 loop 
 
 // End of QC script.
diff --git a/modelsrc/models/v_tripmine/v_tripmine_guard_ld.qc b/modelsrc/models/v_tripmine/v_tripmine_guard_ld.qc
@@ -15,7 +15,7 @@ Original internal name:
 $modelname "v_tripmine_guard_ld.mdl"
 $cd "./"
 $cdtexture "../../textures/viewmodel/hands/guard"
-$cdtexture "../../textures/viewmodel/v_tripmine"
+$cdtexture "../../textures/w_tripmine"
 $scale 1.0
 
 
@@ -28,13 +28,11 @@ $eyeposition 0.000000 0.000000 0.000000
 $bodygroup "hands"
 {
 studio "meshes/ld/v_barney_hands_reference"
-blank
 }
 
 $bodygroup "mine"
 {
 studio "meshes/ld/tripmine_mine"
-studio "meshes/ld/tripmine_boned_world"
 }
 
 
@@ -45,7 +43,6 @@ $hbox 0 "Bip01 L Finger0" 0.000000 -0.900000 -0.460000 2.480000 0.330000 0.91000
 $hbox 0 "Bip01 R Arm2" -0.690000 -2.150000 -2.460000 11.368418 2.820000 1.950000
 $hbox 0 "Bip01 R Hand" -0.560000 -1.560000 -2.450000 3.910000 1.200000 1.880000
 $hbox 0 "Bip01 R Finger0" 0.000000 -0.890000 -0.930000 2.480000 0.330000 0.440000
-$hbox 0 "Dummy22" -11.440000 -3.910000 -4.220000 11.460000 7.320000 5.430000
 
 // 9 animation sequence(s)
 $sequence "idle1" "animations/ld/idle1" fps 30 loop 
@@ -55,7 +52,5 @@ $sequence "place" "animations/ld/place" fps 30
 $sequence "fidget" "animations/ld/fidget" fps 30 loop 
 $sequence "holster" "animations/ld/holster" fps 30 
 $sequence "draw" "animations/ld/draw" fps 30 
-$sequence "world" "animations/ld/world" fps 30 loop 
-$sequence "ground" "animations/ld/ground" fps 30 loop 
 
 // End of QC script.
diff --git a/modelsrc/models/v_tripmine/v_tripmine_hev_hd.qc b/modelsrc/models/v_tripmine/v_tripmine_hev_hd.qc
@@ -15,7 +15,7 @@ Original internal name:
 $modelname "v_tripmine_hev_hd.mdl"
 $cd "./"
 $cdtexture "../../textures/viewmodel/hands/hev"
-$cdtexture "../../textures/viewmodel/v_tripmine"
+$cdtexture "../../textures/w_tripmine"
 $scale 1.0
 
 
@@ -28,13 +28,11 @@ $eyeposition 0.000000 0.000000 0.000000
 $bodygroup "hands"
 {
 studio "meshes/hd/v_gordon_hands_reference"
-blank
 }
 
 $bodygroup "mine"
 {
 studio "meshes/hd/V_tripmine_reference"
-studio "meshes/hd/w_tripmine_Reference"
 }
 
 
@@ -45,7 +43,6 @@ $hbox 0 "L_Arm_bone" -1.920000 -2.640000 -2.300000 2.760000 2.490000 7.980000
 $hbox 0 "Bip01 R Hand" 0.000000 -0.990000 -1.710000 3.920000 0.870000 1.820000
 $hbox 0 "Bip01 R Finger0" 0.000000 -0.940000 -1.000000 2.450000 0.390000 0.540000
 $hbox 0 "R_Arm_bone" -2.620000 -2.640000 -2.290000 2.060000 2.490000 7.990000
-$hbox 0 "tripmine" -11.140000 -3.790000 -8.170000 11.190000 7.180000 1.980000
 
 // 9 animation sequence(s)
 $sequence "idle1" "animations/hd/idle1" fps 15 loop 
@@ -55,7 +52,5 @@ $sequence "place" "animations/hd/place" fps 30
 $sequence "fidget" "animations/hd/fidget" fps 30 loop 
 $sequence "holster" "animations/hd/holster" fps 30 
 $sequence "draw" "animations/hd/draw" fps 30 
-$sequence "world" "animations/hd/world" fps 30 loop 
-$sequence "ground" "animations/hd/ground" fps 30 loop 
 
 // End of QC script.
diff --git a/modelsrc/models/v_tripmine/v_tripmine_hev_ld.qc b/modelsrc/models/v_tripmine/v_tripmine_hev_ld.qc
@@ -16,7 +16,7 @@ $modelname "v_tripmine_hev_ld.mdl"
 $cd "./"
 $cdtexture "meshes/ld"
 $cdtexture "../../textures/viewmodel/hands/hev"
-$cdtexture "../../textures/viewmodel/v_tripmine"
+$cdtexture "../../textures/w_tripmine"
 $scale 1.0
 
 
@@ -29,13 +29,11 @@ $eyeposition 0.000000 0.000000 0.000000
 $bodygroup "hands"
 {
 studio "meshes/ld/v_gordon_hands_reference"
-blank
 }
 
 $bodygroup "mine"
 {
 studio "meshes/ld/tripmine_mine"
-studio "meshes/ld/tripmine_boned_world"
 }
 
 
@@ -44,7 +42,6 @@ $hbox 0 "Bip01 L Arm2" 0.000000 -1.770000 -1.570000 11.680000 1.030000 2.620000
 $hbox 0 "Bip01 L Hand" -0.070000 -0.870000 -1.950000 3.890000 1.030000 1.700000
 $hbox 0 "Bip01 R Arm2" 0.000000 -1.770000 -2.590000 11.368423 1.000000 1.570000
 $hbox 0 "Bip01 R Hand" -0.070000 -0.870000 -1.790000 3.890000 1.030000 1.950000
-$hbox 0 "Dummy22" -11.440000 -3.910000 -4.220000 11.460000 7.320000 5.430000
 
 // 9 animation sequence(s)
 $sequence "idle1" "animations/ld/idle1" fps 30 loop 
@@ -54,7 +51,5 @@ $sequence "place" "animations/ld/place" fps 30
 $sequence "fidget" "animations/ld/fidget" fps 30 loop 
 $sequence "holster" "animations/ld/holster" fps 30 
 $sequence "draw" "animations/ld/draw" fps 30 
-$sequence "world" "animations/ld/world" fps 30 loop 
-$sequence "ground" "animations/ld/ground" fps 30 loop 
 
 // End of QC script.
diff --git a/modelsrc/models/v_tripmine/v_tripmine_soldier_hd.qc b/modelsrc/models/v_tripmine/v_tripmine_soldier_hd.qc
@@ -16,7 +16,7 @@ $modelname "v_tripmine_soldier_hd.mdl"
 $cd "./"
 $cdtexture "meshes/hd"
 $cdtexture "../../textures/viewmodel/hands/soldier"
-$cdtexture "../../textures/viewmodel/v_tripmine"
+$cdtexture "../../textures/w_tripmine"
 $scale 1.0
 
 
@@ -29,13 +29,11 @@ $eyeposition 0.000000 0.000000 0.000000
 $bodygroup "hands"
 {
 studio "meshes/hd/v_soldier_hands_reference"
-blank
 }
 
 $bodygroup "mine"
 {
 studio "meshes/hd/V_tripmine_reference"
-studio "meshes/hd/w_tripmine_Reference"
 }
 
 
@@ -50,7 +48,6 @@ $hbox 0 "Bip01 R Hand" 0.000000 -1.100000 -1.850000 3.800000 0.780000 1.930000
 $hbox 0 "Bip01 R Finger0" 0.000000 -0.830000 -1.260000 2.540000 0.460000 0.450000
 $hbox 0 "Bip01 R Finger31" 0.000000 -0.800000 -0.520000 1.136842 0.350000 0.490000
 $hbox 0 "R_Arm_bone" -1.450000 -1.610000 -2.760000 1.010000 1.600000 0.000000
-$hbox 0 "tripmine" -11.140000 -3.790000 -8.170000 11.190000 7.180000 1.980000
 
 // 9 animation sequence(s)
 $sequence "idle1" "animations/hd/idle1" fps 15 loop 
@@ -60,7 +57,5 @@ $sequence "place" "animations/hd/place" fps 30
 $sequence "fidget" "animations/hd/fidget" fps 30 loop 
 $sequence "holster" "animations/hd/holster" fps 30 
 $sequence "draw" "animations/hd/draw" fps 30 
-$sequence "world" "animations/hd/world" fps 30 loop 
-$sequence "ground" "animations/hd/ground" fps 30 loop 
 
 // End of QC script.
diff --git a/modelsrc/models/v_tripmine/v_tripmine_soldier_ld.qc b/modelsrc/models/v_tripmine/v_tripmine_soldier_ld.qc
@@ -15,7 +15,7 @@ Original internal name:
 $modelname "v_tripmine_soldier_ld.mdl"
 $cd "./"
 $cdtexture "../../textures/viewmodel/hands/soldier"
-$cdtexture "../../textures/viewmodel/v_tripmine"
+$cdtexture "../../textures/w_tripmine"
 $scale 1.0
 
 
@@ -28,13 +28,11 @@ $eyeposition 0.000000 0.000000 0.000000
 $bodygroup "hands"
 {
 studio "meshes/ld/v_soldier_hands_reference"
-blank
 }
 
 $bodygroup "mine"
 {
 studio "meshes/ld/tripmine_mine"
-studio "meshes/ld/tripmine_boned_world"
 }
 
 
@@ -47,7 +45,6 @@ $hbox 0 "Bip01 R Arm2" -0.440000 -2.230000 -2.020000 11.380000 2.470000 1.120000
 $hbox 0 "Bip01 R Hand" 0.000000 -1.100000 -1.760000 3.830000 0.820000 2.230000
 $hbox 0 "Bip01 R Finger0" 0.000000 -0.810000 -1.220000 2.600000 0.490000 0.340000
 $hbox 0 "Bip01 R Finger31" 0.000000 -0.820000 -0.450000 1.260000 0.320000 0.680000
-$hbox 0 "Dummy22" -11.440000 -3.910000 -4.220000 11.460000 7.320000 5.430000
 
 // 9 animation sequence(s)
 $sequence "idle1" "animations/ld/idle1" fps 30 loop 
@@ -57,7 +54,5 @@ $sequence "place" "animations/ld/place" fps 30
 $sequence "fidget" "animations/ld/fidget" fps 30 loop 
 $sequence "holster" "animations/ld/holster" fps 30 
 $sequence "draw" "animations/ld/draw" fps 30 
-$sequence "world" "animations/ld/world" fps 30 loop 
-$sequence "ground" "animations/ld/ground" fps 30 loop 
 
 // End of QC script.
diff --git a/...odels/v_tripmine/animations/hd/ground.smd → ...odels/w_tripmine/animations/hd/ground.smd b/...odels/v_tripmine/animations/hd/ground.smd → ...odels/w_tripmine/animations/hd/ground.smd
@@ -98,54 +98,5 @@ time 0
  44   0.947368 0.000000 0.000000 0.000000 0.000000 0.000000
  45   0.947369 0.000000 0.000000 0.000000 0.000000 0.000000
  46   8.551309 0.194140 -0.071740 1.257627 -1.547274 -1.282471
- 47   -0.001296 4.328257 7.348128 0.000025 0.000000 -3.141565
-time 1
-  0   3.724260 -0.000000 39.395706 0.000000 0.000000 -3.141592
-  1   0.000000 0.000000 0.000000 -1.570795 -1.570451 0.000000
-  2   1.326317 -0.003921 0.000002 -0.000004 -0.000001 0.000796
-  3   4.926312 -0.003923 0.000000 0.000000 0.000000 0.000000
-  4   4.926314 -0.003923 0.000000 0.000000 0.000000 0.000000
-  5   4.926313 -0.003923 0.000000 0.000000 0.000000 0.000000
-  6   4.926363 -0.001508 0.000000 0.000000 0.000000 0.030000
-  7   0.000002 0.001504 1.894737 -0.000014 -1.370796 3.110810
-  8   4.926316 0.000000 0.000002 0.000000 1.270796 0.000000
-  9   11.368427 0.000000 -0.000001 0.000000 0.000000 -0.200000
- 10   11.368419 -0.000001 0.000001 -1.570000 0.000000 0.000000
- 11   1.126229 0.104084 -1.358370 1.823541 0.487125 0.071487
- 12   2.373625 0.000000 0.000000 0.000000 0.000000 0.113389
- 13   1.071903 0.000000 -0.000001 0.000000 0.000000 0.017444
- 14   3.789472 -0.000905 -1.136842 0.011610 0.156576 0.079348
- 15   1.136843 0.000001 0.000001 0.000000 0.000000 0.000000
- 16   1.136841 -0.000001 -0.000001 0.000000 0.000000 0.000000
- 17   3.789472 -0.000301 -0.378948 0.005372 0.078320 0.078679
- 18   1.326317 0.000000 0.000000 0.000000 0.000000 0.000000
- 19   1.326316 0.000000 0.000000 0.000000 0.000000 0.008722
- 20   3.789472 0.000302 0.378947 -0.000794 0.000062 0.078500
- 21   1.136844 0.000000 0.000000 0.000000 0.000000 0.000000
- 22   1.136840 0.000000 0.000000 0.000000 0.000000 0.000000
- 23   3.789472 0.000905 1.136842 -0.012516 -0.147755 0.079485
- 24   0.947368 0.000000 0.000000 0.000000 0.000000 0.000000
- 25   0.947369 0.000000 0.000000 0.000000 0.000000 0.000000
- 26   8.530909 0.189987 -0.101291 1.257615 -1.594313 -1.282459
- 27   0.000002 0.001514 -1.894737 -0.000014 1.370796 3.110783
- 28   4.926316 0.000000 0.000000 0.000000 -1.270796 0.000000
- 29   11.368425 0.000000 0.000000 0.000000 0.000000 -0.200000
- 30   11.368418 0.000000 0.000000 1.570000 0.000000 0.000000
- 31   1.126232 0.104084 1.358370 -1.823541 -0.487125 0.071487
- 32   2.373624 0.000000 0.000000 0.000000 0.000000 0.113389
- 33   1.071902 0.000001 0.000000 0.000000 0.000000 0.017445
- 34   3.789474 -0.000905 1.136842 -0.011610 -0.156576 0.079348
- 35   1.136842 0.000000 -0.000001 0.000000 0.000000 0.000000
- 36   1.136840 0.000000 0.000001 0.000000 0.000000 0.000000
- 37   3.789474 -0.000302 0.378948 -0.005372 -0.078320 0.078679
- 38   1.326317 0.000000 0.000000 0.000000 0.000000 0.000000
- 39   1.326315 0.000000 0.000000 0.000000 0.000000 0.008722
- 40   3.789474 0.000302 -0.378947 0.000794 -0.000062 0.078500
- 41   1.136842 0.000000 0.000000 0.000000 0.000000 0.000000
- 42   1.136842 -0.000001 0.000000 0.000000 0.000000 0.000000
- 43   3.789475 0.000905 -1.136842 0.012516 0.147755 0.079485
- 44   0.947368 0.000000 0.000000 0.000000 0.000000 0.000000
- 45   0.947369 0.000000 0.000000 0.000000 0.000000 0.000000
- 46   8.551309 0.194140 -0.071740 1.257627 -1.547274 -1.282471
- 47   -0.001296 4.328257 7.348128 0.000025 0.000000 -3.141565
+ 47   -0.001296 4.328257 8.168128 0.000025 0.000000 -3.141565
 end
diff --git a/...models/v_tripmine/animations/hd/world.smd → ...models/w_tripmine/animations/hd/world.smd b/...models/v_tripmine/animations/hd/world.smd → ...models/w_tripmine/animations/hd/world.smd
@@ -99,53 +99,4 @@ time 0
  45   0.947369 0.000000 0.000000 0.000000 0.000000 0.000000
  46   8.551309 0.194140 -0.071740 1.257627 -1.547274 -1.282471
  47   -0.001296 4.328257 3.781613 0.000025 0.000000 -3.141565
-time 1
-  0   3.724260 -0.000000 39.395706 0.000000 0.000000 -3.141592
-  1   0.000000 0.000000 0.000000 -1.570795 -1.570451 0.000000
-  2   1.326317 -0.003921 0.000002 -0.000004 -0.000001 0.000796
-  3   4.926312 -0.003923 0.000000 0.000000 0.000000 0.000000
-  4   4.926314 -0.003923 0.000000 0.000000 0.000000 0.000000
-  5   4.926313 -0.003923 0.000000 0.000000 0.000000 0.000000
-  6   4.926363 -0.001508 0.000000 0.000000 0.000000 0.030000
-  7   0.000002 0.001504 1.894737 -0.000014 -1.370796 3.110810
-  8   4.926316 0.000000 0.000002 0.000000 1.270796 0.000000
-  9   11.368427 0.000000 -0.000001 0.000000 0.000000 -0.200000
- 10   11.368419 -0.000001 0.000001 -1.570000 0.000000 0.000000
- 11   1.126229 0.104084 -1.358370 1.823541 0.487125 0.071487
- 12   2.373625 0.000000 0.000000 0.000000 0.000000 0.113389
- 13   1.071903 0.000000 -0.000001 0.000000 0.000000 0.017444
- 14   3.789472 -0.000905 -1.136842 0.011610 0.156576 0.079348
- 15   1.136843 0.000001 0.000001 0.000000 0.000000 0.000000
- 16   1.136841 -0.000001 -0.000001 0.000000 0.000000 0.000000
- 17   3.789472 -0.000301 -0.378948 0.005372 0.078320 0.078679
- 18   1.326317 0.000000 0.000000 0.000000 0.000000 0.000000
- 19   1.326316 0.000000 0.000000 0.000000 0.000000 0.008722
- 20   3.789472 0.000302 0.378947 -0.000794 0.000062 0.078500
- 21   1.136844 0.000000 0.000000 0.000000 0.000000 0.000000
- 22   1.136840 0.000000 0.000000 0.000000 0.000000 0.000000
- 23   3.789472 0.000905 1.136842 -0.012516 -0.147755 0.079485
- 24   0.947368 0.000000 0.000000 0.000000 0.000000 0.000000
- 25   0.947369 0.000000 0.000000 0.000000 0.000000 0.000000
- 26   8.530909 0.189987 -0.101291 1.257615 -1.594313 -1.282459
- 27   0.000002 0.001514 -1.894737 -0.000014 1.370796 3.110783
- 28   4.926316 0.000000 0.000000 0.000000 -1.270796 0.000000
- 29   11.368425 0.000000 0.000000 0.000000 0.000000 -0.200000
- 30   11.368418 0.000000 0.000000 1.570000 0.000000 0.000000
- 31   1.126232 0.104084 1.358370 -1.823541 -0.487125 0.071487
- 32   2.373624 0.000000 0.000000 0.000000 0.000000 0.113389
- 33   1.071902 0.000001 0.000000 0.000000 0.000000 0.017445
- 34   3.789474 -0.000905 1.136842 -0.011610 -0.156576 0.079348
- 35   1.136842 0.000000 -0.000001 0.000000 0.000000 0.000000
- 36   1.136840 0.000000 0.000001 0.000000 0.000000 0.000000
- 37   3.789474 -0.000302 0.378948 -0.005372 -0.078320 0.078679
- 38   1.326317 0.000000 0.000000 0.000000 0.000000 0.000000
- 39   1.326315 0.000000 0.000000 0.000000 0.000000 0.008722
- 40   3.789474 0.000302 -0.378947 0.000794 -0.000062 0.078500
- 41   1.136842 0.000000 0.000000 0.000000 0.000000 0.000000
- 42   1.136842 -0.000001 0.000000 0.000000 0.000000 0.000000
- 43   3.789475 0.000905 -1.136842 0.012516 0.147755 0.079485
- 44   0.947368 0.000000 0.000000 0.000000 0.000000 0.000000
- 45   0.947369 0.000000 0.000000 0.000000 0.000000 0.000000
- 46   8.551309 0.194140 -0.071740 1.257627 -1.547274 -1.282471
- 47   -0.001296 4.328257 3.781613 0.000025 0.000000 -3.141565
 end