New incarnation of MDL destroyed some resource files, re-added them.

harrand · Mar 25, 2017 · 50d7def · 50d7def
1 parent 66cde37
commit 50d7def
Show file tree

Hide file tree

Showing 7 changed files with 415 additions and 406 deletions.
diff --git a/lib/libmdl.a b/lib/libmdl.a
diff --git a/res/dep/mdl.dll b/res/dep/mdl.dll
diff --git a/res/runtime/models/cylinder.obj b/res/runtime/models/cylinder.obj
@@ -0,0 +1,359 @@
+# Blender v2.76 (sub 0) OBJ File: ''
+# www.blender.org
+o Cylinder
+v 0.000000 -2.000000 -0.100000
+v 0.000000 2.000000 -0.100000
+v 0.019509 -2.000000 -0.098079
+v 0.019509 2.000000 -0.098079
+v 0.038268 -2.000000 -0.092388
+v 0.038268 2.000000 -0.092388
+v 0.055557 -2.000000 -0.083147
+v 0.055557 2.000000 -0.083147
+v 0.070711 -2.000000 -0.070711
+v 0.070711 2.000000 -0.070711
+v 0.083147 -2.000000 -0.055557
+v 0.083147 2.000000 -0.055557
+v 0.092388 -2.000000 -0.038268
+v 0.092388 2.000000 -0.038268
+v 0.098079 -2.000000 -0.019509
+v 0.098079 2.000000 -0.019509
+v 0.100000 -2.000000 -0.000000
+v 0.100000 2.000000 -0.000000
+v 0.098079 -2.000000 0.019509
+v 0.098079 2.000000 0.019509
+v 0.092388 -2.000000 0.038268
+v 0.092388 2.000000 0.038268
+v 0.083147 -2.000000 0.055557
+v 0.083147 2.000000 0.055557
+v 0.070711 -2.000000 0.070711
+v 0.070711 2.000000 0.070711
+v 0.055557 -2.000000 0.083147
+v 0.055557 2.000000 0.083147
+v 0.038268 -2.000000 0.092388
+v 0.038268 2.000000 0.092388
+v 0.019509 -2.000000 0.098079
+v 0.019509 2.000000 0.098079
+v -0.000000 -2.000000 0.100000
+v -0.000000 2.000000 0.100000
+v -0.019509 -2.000000 0.098079
+v -0.019509 2.000000 0.098079
+v -0.038268 -2.000000 0.092388
+v -0.038268 2.000000 0.092388
+v -0.055557 -2.000000 0.083147
+v -0.055557 2.000000 0.083147
+v -0.070711 -2.000000 0.070711
+v -0.070711 2.000000 0.070711
+v -0.083147 -2.000000 0.055557
+v -0.083147 2.000000 0.055557
+v -0.092388 -2.000000 0.038268
+v -0.092388 2.000000 0.038268
+v -0.098079 -2.000000 0.019509
+v -0.098079 2.000000 0.019509
+v -0.100000 -2.000000 -0.000000
+v -0.100000 2.000000 -0.000000
+v -0.098079 -2.000000 -0.019509
+v -0.098079 2.000000 -0.019509
+v -0.092388 -2.000000 -0.038268
+v -0.092388 2.000000 -0.038268
+v -0.083147 -2.000000 -0.055557
+v -0.083147 2.000000 -0.055557
+v -0.070711 -2.000000 -0.070711
+v -0.070711 2.000000 -0.070711
+v -0.055557 -2.000000 -0.083147
+v -0.055557 2.000000 -0.083147
+v -0.038268 -2.000000 -0.092388
+v -0.038268 2.000000 -0.092388
+v -0.019509 -2.000000 -0.098079
+v -0.019509 2.000000 -0.098079
+vt 0.555976 0.995437
+vt 0.538604 0.995577
+vt 0.538604 0.000233
+vt 0.521233 0.995716
+vt 0.521233 0.000373
+vt 0.503862 0.995856
+vt 0.503862 0.000512
+vt 0.486490 0.995996
+vt 0.486490 0.000652
+vt 0.469119 0.996135
+vt 0.469119 0.000792
+vt 0.451748 0.996275
+vt 0.451748 0.000932
+vt 0.434376 0.996415
+vt 0.434376 0.001071
+vt 0.417005 0.996554
+vt 0.417005 0.001211
+vt 0.399634 0.996694
+vt 0.399634 0.001351
+vt 0.382262 0.996834
+vt 0.382262 0.001491
+vt 0.364891 0.996973
+vt 0.364891 0.001630
+vt 0.347520 0.997113
+vt 0.347520 0.001770
+vt 0.330148 0.997253
+vt 0.330148 0.001910
+vt 0.312777 0.997392
+vt 0.312777 0.002050
+vt 0.295406 0.997532
+vt 0.295406 0.002189
+vt 0.278034 0.997672
+vt 0.278034 0.002329
+vt 0.260663 0.997811
+vt 0.260663 0.002469
+vt 0.243292 0.997951
+vt 0.243292 0.002609
+vt 0.225920 0.998091
+vt 0.225920 0.002748
+vt 0.208549 0.998231
+vt 0.208549 0.002888
+vt 0.191178 0.998370
+vt 0.191178 0.003028
+vt 0.173806 0.998510
+vt 0.173806 0.003168
+vt 0.156435 0.998650
+vt 0.156435 0.003307
+vt 0.139064 0.998789
+vt 0.139064 0.003447
+vt 0.121692 0.998929
+vt 0.121692 0.003587
+vt 0.104321 0.999069
+vt 0.104321 0.003727
+vt 0.086950 0.999208
+vt 0.086950 0.003866
+vt 0.069578 0.999348
+vt 0.069578 0.004006
+vt 0.052207 0.999488
+vt 0.052207 0.004146
+vt 0.034836 0.999627
+vt 0.034836 0.004286
+vt 0.611514 0.637026
+vt 0.918401 0.606800
+vt 0.948626 0.913687
+vt 0.017465 0.999767
+vt 0.000093 0.999907
+vt 0.000093 0.004565
+vt 0.017465 0.004425
+vt 0.673356 0.414441
+vt 0.584708 0.122209
+vt 0.876941 0.033561
+vt 0.555976 0.000093
+vt 0.918401 0.943913
+vt 0.882859 0.967661
+vt 0.843367 0.984019
+vt 0.801443 0.992358
+vt 0.758697 0.992358
+vt 0.716774 0.984019
+vt 0.677281 0.967661
+vt 0.641740 0.943913
+vt 0.611514 0.913687
+vt 0.587766 0.878145
+vt 0.571407 0.838653
+vt 0.563068 0.796729
+vt 0.563068 0.753983
+vt 0.571407 0.712059
+vt 0.587766 0.672567
+vt 0.641740 0.606800
+vt 0.677281 0.583052
+vt 0.716774 0.566694
+vt 0.758698 0.558354
+vt 0.801444 0.558355
+vt 0.843367 0.566694
+vt 0.882859 0.583052
+vt 0.948627 0.637026
+vt 0.972375 0.672568
+vt 0.988733 0.712059
+vt 0.997072 0.753984
+vt 0.997072 0.796729
+vt 0.988733 0.838653
+vt 0.972375 0.878145
+vt 0.912138 0.057079
+vt 0.942071 0.087011
+vt 0.965589 0.122208
+vt 0.981789 0.161317
+vt 0.990047 0.202835
+vt 0.990047 0.245167
+vt 0.981789 0.286685
+vt 0.965589 0.325794
+vt 0.942071 0.360991
+vt 0.912138 0.390924
+vt 0.876941 0.414442
+vt 0.837832 0.430641
+vt 0.796314 0.438899
+vt 0.753983 0.438899
+vt 0.712465 0.430641
+vt 0.638159 0.390923
+vt 0.608226 0.360990
+vt 0.584708 0.325793
+vt 0.568509 0.286684
+vt 0.560250 0.245167
+vt 0.560250 0.202836
+vt 0.568509 0.161318
+vt 0.608226 0.087012
+vt 0.638159 0.057079
+vt 0.673356 0.033561
+vt 0.712465 0.017361
+vt 0.753983 0.009103
+vt 0.796315 0.009103
+vt 0.837832 0.017361
+vn 0.098000 0.000000 -0.995200
+vn 0.290300 0.000000 -0.956900
+vn 0.471400 0.000000 -0.881900
+vn 0.634400 0.000000 -0.773000
+vn 0.773000 0.000000 -0.634400
+vn 0.881900 0.000000 -0.471400
+vn 0.956900 0.000000 -0.290300
+vn 0.995200 0.000000 -0.098000
+vn 0.995200 0.000000 0.098000
+vn 0.956900 0.000000 0.290300
+vn 0.881900 0.000000 0.471400
+vn 0.773000 0.000000 0.634400
+vn 0.634400 0.000000 0.773000
+vn 0.471400 0.000000 0.881900
+vn 0.290300 0.000000 0.956900
+vn 0.098000 0.000000 0.995200
+vn -0.098000 0.000000 0.995200
+vn -0.290300 0.000000 0.956900
+vn -0.471400 0.000000 0.881900
+vn -0.634400 0.000000 0.773000
+vn -0.773000 0.000000 0.634400
+vn -0.881900 0.000000 0.471400
+vn -0.956900 0.000000 0.290300
+vn -0.995200 0.000000 0.098000
+vn -0.995200 0.000000 -0.098000
+vn -0.956900 0.000000 -0.290300
+vn -0.881900 0.000000 -0.471400
+vn -0.773000 0.000000 -0.634400
+vn -0.634400 0.000000 -0.773000
+vn -0.471400 0.000000 -0.881900
+vn 0.000000 1.000000 -0.000000
+vn -0.098000 0.000000 -0.995200
+vn -0.290300 0.000000 -0.956900
+vn 0.000000 -1.000000 -0.000000
+vn 0.000000 1.000000 -0.000100
+vn 0.000000 1.000000 0.000100
+vn 0.000000 -1.000000 -0.000100
+s off
+f 2/1/1 4/2/1 3/3/1
+f 4/2/2 6/4/2 5/5/2
+f 6/4/3 8/6/3 7/7/3
+f 8/6/4 10/8/4 9/9/4
+f 10/8/5 12/10/5 11/11/5
+f 12/10/6 14/12/6 13/13/6
+f 14/12/7 16/14/7 15/15/7
+f 16/14/8 18/16/8 17/17/8
+f 18/16/9 20/18/9 19/19/9
+f 20/18/10 22/20/10 21/21/10
+f 22/20/11 24/22/11 23/23/11
+f 24/22/12 26/24/12 25/25/12
+f 26/24/13 28/26/13 27/27/13
+f 28/26/14 30/28/14 29/29/14
+f 30/28/15 32/30/15 31/31/15
+f 32/30/16 34/32/16 33/33/16
+f 34/32/17 36/34/17 35/35/17
+f 36/34/18 38/36/18 37/37/18
+f 38/36/19 40/38/19 39/39/19
+f 40/38/20 42/40/20 41/41/20
+f 42/40/21 44/42/21 43/43/21
+f 44/42/22 46/44/22 45/45/22
+f 46/44/23 48/46/23 47/47/23
+f 48/46/24 50/48/24 49/49/24
+f 50/48/25 52/50/25 51/51/25
+f 52/50/26 54/52/26 53/53/26
+f 54/52/27 56/54/27 55/55/27
+f 56/54/28 58/56/28 57/57/28
+f 58/56/29 60/58/29 59/59/29
+f 60/58/30 62/60/30 61/61/30
+f 38/62/31 22/63/31 6/64/31
+f 64/65/32 2/66/32 1/67/32
+f 62/60/33 64/65/33 63/68/33
+f 31/69/34 47/70/34 63/71/34
+f 1/72/1 2/1/1 3/3/1
+f 3/3/2 4/2/2 5/5/2
+f 5/5/3 6/4/3 7/7/3
+f 7/7/4 8/6/4 9/9/4
+f 9/9/5 10/8/5 11/11/5
+f 11/11/6 12/10/6 13/13/6
+f 13/13/7 14/12/7 15/15/7
+f 15/15/8 16/14/8 17/17/8
+f 17/17/9 18/16/9 19/19/9
+f 19/19/10 20/18/10 21/21/10
+f 21/21/11 22/20/11 23/23/11
+f 23/23/12 24/22/12 25/25/12
+f 25/25/13 26/24/13 27/27/13
+f 27/27/14 28/26/14 29/29/14
+f 29/29/15 30/28/15 31/31/15
+f 31/31/16 32/30/16 33/33/16
+f 33/33/17 34/32/17 35/35/17
+f 35/35/18 36/34/18 37/37/18
+f 37/37/19 38/36/19 39/39/19
+f 39/39/20 40/38/20 41/41/20
+f 41/41/21 42/40/21 43/43/21
+f 43/43/22 44/42/22 45/45/22
+f 45/45/23 46/44/23 47/47/23
+f 47/47/24 48/46/24 49/49/24
+f 49/49/25 50/48/25 51/51/25
+f 51/51/26 52/50/26 53/53/26
+f 53/53/27 54/52/27 55/55/27
+f 55/55/28 56/54/28 57/57/28
+f 57/57/29 58/56/29 59/59/29
+f 59/59/30 60/58/30 61/61/30
+f 6/64/31 4/73/31 2/74/31
+f 2/74/31 64/75/31 6/64/31
+f 62/76/31 60/77/31 58/78/31
+f 58/78/31 56/79/31 54/80/31
+f 54/80/31 52/81/31 50/82/31
+f 50/82/31 48/83/31 54/80/31
+f 46/84/31 44/85/31 42/86/31
+f 42/86/31 40/87/31 46/84/31
+f 38/62/35 36/88/35 34/89/35
+f 34/89/36 32/90/36 30/91/36
+f 30/91/31 28/92/31 22/63/31
+f 26/93/31 24/94/31 22/63/31
+f 22/63/31 20/95/31 18/96/31
+f 18/96/31 16/97/31 22/63/31
+f 14/98/31 12/99/31 10/100/31
+f 10/100/31 8/101/31 14/98/31
+f 6/64/31 64/75/31 62/76/31
+f 62/76/31 58/78/31 54/80/31
+f 54/80/31 48/83/31 46/84/31
+f 46/84/31 40/87/31 38/62/31
+f 38/62/31 34/89/31 22/63/31
+f 28/92/31 26/93/31 22/63/31
+f 22/63/31 16/97/31 14/98/31
+f 14/98/31 8/101/31 6/64/31
+f 6/64/31 62/76/31 54/80/31
+f 54/80/31 46/84/31 38/62/31
+f 34/89/31 30/91/31 22/63/31
+f 22/63/31 14/98/31 6/64/31
+f 6/64/31 54/80/31 38/62/31
+f 63/68/32 64/65/32 1/67/32
+f 61/61/33 62/60/33 63/68/33
+f 63/71/37 1/102/37 3/103/37
+f 3/103/34 5/104/34 7/105/34
+f 7/105/34 9/106/34 11/107/34
+f 11/107/34 13/108/34 7/105/34
+f 15/109/34 17/110/34 19/111/34
+f 19/111/34 21/112/34 23/113/34
+f 23/113/34 25/114/34 27/115/34
+f 27/115/37 29/116/37 31/69/37
+f 31/69/37 33/117/37 35/118/37
+f 35/118/34 37/119/34 39/120/34
+f 39/120/34 41/121/34 43/122/34
+f 43/122/34 45/123/34 47/70/34
+f 47/70/34 49/124/34 51/125/34
+f 51/125/34 53/126/34 47/70/34
+f 55/127/34 57/128/34 59/129/34
+f 59/129/37 61/130/37 63/71/37
+f 63/71/34 3/103/34 7/105/34
+f 7/105/34 13/108/34 15/109/34
+f 15/109/34 19/111/34 31/69/34
+f 23/113/34 27/115/34 31/69/34
+f 31/69/34 35/118/34 39/120/34
+f 39/120/34 43/122/34 47/70/34
+f 47/70/34 53/126/34 55/127/34
+f 55/127/34 59/129/34 63/71/34
+f 63/71/34 7/105/34 31/69/34
+f 19/111/34 23/113/34 31/69/34
+f 31/69/34 39/120/34 47/70/34
+f 47/70/34 55/127/34 63/71/34
+f 7/105/34 15/109/34 31/69/34
diff --git a/res/runtime/resources.data b/res/runtime/resources.data
@@ -71,7 +71,8 @@ models: %[
 - cube
 - monkeyhead
 - sphere
-- torus]%
+- torus
+- cylinder]%
 cube.path: ../../../res/runtime/models/cube.obj
 cube.name: Complete Cube
 monkeyhead.path: ../../../res/runtime/models/monkeyhead.obj
@@ -82,5 +83,7 @@ sword.path: ../../../res/runtime/models/sword.obj
 sword.name: Complete Sword
 torus.path: ../../../res/runtime/models/torus.obj
 torus.name: Complete Torus
-speed: 1
-played: 128302
+cylinder.path: ../../../res/runtime/models/cylinder.obj
+cylinder.name: Complete Cylinder
+speed: 0.5
+played: 125253
diff --git a/res/runtime/templates/cylinder_template.png b/res/runtime/templates/cylinder_template.png