summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rw-r--r--asset.h5
-rw-r--r--intermediate/gun.obj194
-rw-r--r--src/gun.blendbin0 -> 945876 bytes
4 files changed, 202 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 792b8b1..050f658 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,9 @@ sources = \
objects = $(sources:%.c=%.o)
mesh_sources = \
- $(int_dir)/monkey.obj \
- $(int_dir)/cube.obj
+ $(int_dir)/cube.obj \
+ $(int_dir)/gun.obj \
+ $(int_dir)/monkey.obj
texture_sources = \
$(int_dir)/gun.bmp \
diff --git a/asset.h b/asset.h
index c0346b7..35496bf 100644
--- a/asset.h
+++ b/asset.h
@@ -16,6 +16,11 @@ struct Mesh;
asset_type_mesh, \
"monkey.msh" \
) \
+ x( \
+ asset_id_gun_mesh, \
+ asset_type_mesh, \
+ "gun.msh" \
+ ) \
typedef enum {
#define x(id, type, path) id,
diff --git a/intermediate/gun.obj b/intermediate/gun.obj
new file mode 100644
index 0000000..62749e1
--- /dev/null
+++ b/intermediate/gun.obj
@@ -0,0 +1,194 @@
+# Blender 4.0.2
+# www.blender.org
+o Cube
+v -1.000000 -1.414214 1.427537
+v -1.000000 0.000000 2.841751
+v -1.000000 0.000000 0.000035
+v -0.018807 1.414214 1.427537
+v 9.078833 -1.414214 1.427537
+v 9.078833 0.000000 2.841751
+v 9.078833 0.000000 0.000035
+v 9.078833 1.414214 1.427537
+v -1.000000 -1.414214 -1.427468
+v -1.000000 0.000000 -2.841682
+v -0.018807 1.414214 -1.427468
+v 9.078833 -1.414214 -1.427468
+v 9.078833 0.000000 -2.841682
+v 9.078833 1.414214 -1.427468
+v 2.118911 1.414214 1.427537
+v 2.118911 1.414214 -1.427468
+v 4.303145 0.000000 0.000035
+v -1.577792 0.000003 -1.427468
+v -1.577792 -0.000023 1.427537
+v -0.018807 1.414214 0.227655
+v 2.118911 1.414214 0.227655
+v -0.018807 1.414214 -0.251127
+v 2.118911 1.414214 -0.251127
+v -0.018807 1.508344 0.053232
+v 1.741786 1.508344 0.053232
+v -0.018807 1.508344 -0.076704
+v 1.741786 1.508344 -0.076704
+vn -0.8659 -0.3538 0.3538
+vn 1.0000 -0.0000 -0.0000
+vn -0.0000 -0.7071 0.7071
+vn -0.0000 -0.7104 -0.7038
+vn -0.0000 0.7071 0.7071
+vn -0.8669 -0.3542 0.3509
+vn -0.0000 0.7071 -0.7071
+vn -0.0000 -0.7104 0.7038
+vn -0.0000 -0.7071 -0.7071
+vn -0.0000 0.7104 0.7038
+vn 0.5435 0.8394 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn -0.0000 0.7104 -0.7038
+vn -0.8216 0.5700 -0.0000
+vn -0.6483 0.7147 -0.2624
+vn -0.6479 0.7142 -0.2647
+vn -0.6479 0.7142 0.2647
+vn -0.8659 -0.3538 -0.3538
+vn -0.6483 0.7147 0.2624
+vn -0.8669 -0.3542 -0.3509
+vn -0.0000 0.8800 0.4749
+vn -0.0000 0.8800 -0.4749
+vn -1.0000 -0.0000 -0.0000
+vn 0.2422 0.9702 -0.0000
+vt 0.255386 0.825942
+vt 0.127693 0.832658
+vt 0.182932 0.757520
+vt 0.568322 0.821496
+vt 0.437429 0.952390
+vt 0.436814 0.820881
+vt 0.738170 0.659627
+vt 0.869064 0.000000
+vt 0.869064 0.659627
+vt 0.344258 0.312553
+vt 0.475767 -0.000000
+vt 0.475767 0.659627
+vt 0.213994 0.241937
+vt 0.344258 0.037815
+vt 0.344258 0.697442
+vt -0.000000 0.825942
+vt 0.000000 0.697442
+vt 0.072455 0.757519
+vt 0.130264 0.102031
+vt 0.130264 0.241937
+vt 0.000000 0.697442
+vt 0.720608 0.800149
+vt 0.851502 0.931042
+vt 0.720608 0.931042
+vt 0.475768 0.659627
+vt 0.475768 0.347074
+vt 0.607277 -0.000000
+vt 0.607277 0.000000
+vt 0.607277 0.659627
+vt 0.869063 0.455504
+vt 1.000000 0.142951
+vt 1.000000 0.455504
+vt 0.436814 0.820881
+vt 0.526359 0.723278
+vt 0.500819 0.705124
+vt 0.781308 0.659627
+vt 0.720608 0.799534
+vt 0.720608 0.659627
+vt 1.000000 0.768058
+vt 0.869063 0.455504
+vt 1.000000 0.455504
+vt 0.344258 0.738155
+vt 0.344258 0.769490
+vt 0.436814 0.753052
+vt 0.209078 0.217256
+vt 0.202505 0.102031
+vt 0.209078 0.102031
+vt 0.720608 0.659627
+vt 0.720608 0.805463
+vt 0.654859 0.757278
+vt 0.000000 0.037815
+vt 0.071542 -0.000000
+vt 0.272716 -0.000000
+vt 0.213994 0.102031
+vt 0.127693 0.832658
+vt 0.654859 0.757277
+vt 0.589109 0.805463
+vt 0.589109 0.659627
+vt 0.255386 0.697442
+vt 0.781308 0.799534
+vt 0.794040 0.684309
+vt 0.794040 0.799534
+vt 0.189773 0.241937
+vt 0.189773 0.102031
+vt 0.202505 0.217256
+vt 0.261258 0.728776
+vt 0.255386 0.708857
+vt 0.261258 0.697442
+vt 0.213994 0.241937
+vt 0.568322 0.952390
+vt 0.738170 0.000000
+vt 0.344258 0.659627
+vt 0.344258 -0.000000
+vt 0.213994 0.697442
+vt 0.130264 0.697442
+vt 0.852117 0.799534
+vt 0.475768 0.000000
+vt 0.738170 0.000000
+vt 0.869063 0.000000
+vt 0.589109 0.767882
+vt 0.436814 0.659627
+vt 0.781308 0.799534
+vt 0.869064 0.911009
+vt 0.344258 0.659627
+vt 0.344258 0.846478
+vt 0.781308 0.659627
+vt 0.255386 0.717361
+s 0
+f 1/1/1 2/2/1 19/3/1
+f 8/4/2 5/5/2 7/6/2
+f 6/7/3 1/8/3 5/9/3
+f 17/10/4 5/11/4 1/12/4
+f 15/13/5 2/14/5 6/15/5
+f 9/16/6 3/17/6 18/18/6
+f 11/19/7 16/20/7 13/21/7
+f 14/22/2 12/23/2 13/24/2
+f 7/25/8 17/26/8 9/27/8
+f 13/28/9 9/7/9 10/29/9
+f 14/30/10 17/31/10 7/32/10
+f 17/33/11 23/34/11 21/35/11
+f 21/36/12 4/37/12 15/38/12
+f 17/39/13 8/40/13 7/41/13
+f 20/42/14 22/43/14 3/44/14
+f 25/45/12 26/46/12 24/47/12
+f 4/48/15 3/49/15 19/50/15
+f 11/19/16 10/51/16 18/52/16
+f 19/53/17 2/14/17 4/54/17
+f 18/18/18 10/55/18 9/16/18
+f 18/56/19 3/57/19 11/58/19
+f 19/3/20 3/59/20 1/1/20
+f 20/60/21 25/61/21 24/62/21
+f 23/63/12 11/19/12 22/64/12
+f 22/64/22 27/65/22 23/63/22
+f 20/66/23 26/67/23 22/68/23
+f 23/63/24 25/45/24 21/69/24
+f 8/4/2 6/70/2 5/5/2
+f 6/7/3 2/71/3 1/8/3
+f 1/12/4 3/72/4 17/10/4
+f 17/10/4 7/73/4 5/11/4
+f 6/15/5 8/74/5 15/13/5
+f 15/13/5 4/54/5 2/14/5
+f 13/21/7 10/51/7 11/19/7
+f 16/20/7 14/75/7 13/21/7
+f 14/22/2 7/76/2 12/23/2
+f 9/27/8 12/29/8 7/25/8
+f 17/26/8 3/77/8 9/27/8
+f 13/28/9 12/78/9 9/7/9
+f 14/30/10 16/79/10 17/31/10
+f 17/33/11 16/80/11 23/34/11
+f 21/35/11 15/81/11 17/33/11
+f 21/36/12 20/82/12 4/37/12
+f 17/39/13 15/83/13 8/40/13
+f 3/44/14 4/84/14 20/42/14
+f 22/43/14 11/85/14 3/44/14
+f 25/45/12 27/65/12 26/46/12
+f 20/60/21 21/86/21 25/61/21
+f 23/63/12 16/20/12 11/19/12
+f 22/64/22 26/46/22 27/65/22
+f 20/66/23 24/87/23 26/67/23
+f 23/63/24 27/65/24 25/45/24
diff --git a/src/gun.blend b/src/gun.blend
new file mode 100644
index 0000000..038849c
--- /dev/null
+++ b/src/gun.blend
Binary files differ