Redrew all of the not-low-poly pipe-related models

to higher quality.  Way more polys than before, but
without a measurable drop in FPS.

Also tweaked the textures for the pump and flow
sensor, and tweaked the low-poly models for them,
so that low-poly models use a different part of
the texture for the "light" on the side (allows
the higher-poly models to just put a glow there
and use a raised dome for the actual light).

Also fixed a Z-fighting issue with the grating on
the bottom of the pump (both versions)
This commit is contained in:
Vanessa Ezekowitz 2017-10-27 00:21:01 -04:00
parent 8817918a53
commit 7b167224f4
24 changed files with 78046 additions and 9045 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -65,10 +65,10 @@ vt 0.2647 0.9902
vt 0.2647 0.7549 vt 0.2647 0.7549
vt 0.5000 0.7549 vt 0.5000 0.7549
vt 0.5000 0.9902 vt 0.5000 0.9902
vt 0.5196 0.7549 vt 0.0098 0.5000
vt 0.8333 0.7549 vt 0.3235 0.5000
vt 0.8333 0.9902 vt 0.3235 0.7353
vt 0.5196 0.9902 vt 0.0098 0.7353
vt 0.2451 0.7549 vt 0.2451 0.7549
vt 0.2451 0.9902 vt 0.2451 0.9902
vt 0.0098 0.9902 vt 0.0098 0.9902

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,13 +0,0 @@
# Blender MTL File: 'pipe-master-lowpoly.blend'
# Material Count: 1
newmtl None
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd /home/vanessa/Minetest-related/mods/my_mods/pipeworks/textures/pipeworks_pump_on.png

View File

@ -1,55 +1,70 @@
# Blender v2.78 (sub 0) OBJ File: 'pipe-master-lowpoly.blend' # Blender v2.78 (sub 0) OBJ File: 'pipe-pump-lowpoly.blend'
# www.blender.org # www.blender.org
mtllib pipeworks_pump_lowpoly.mtl
o Cube o Cube
v -0.500000 -0.375000 0.500000 v -0.153364 0.500000 0.063525
v -0.500000 -0.375000 -0.500000 v -0.063525 0.500000 0.153364
v -0.500000 -0.500000 -0.500000 v 0.063525 0.500000 0.153364
v -0.500000 -0.500000 0.500000 v 0.153364 0.500000 0.063525
v 0.500000 -0.375000 -0.500000 v 0.153364 0.500000 -0.063526
v 0.500000 -0.500000 -0.500000 v 0.063525 0.500000 -0.153364
v 0.500000 -0.375000 0.500000 v -0.063525 0.500000 -0.153364
v 0.500000 -0.500000 0.500000 v -0.153364 0.500000 -0.063526
v -0.063525 0.468700 0.153364
v -0.153364 0.468700 0.063525
v -0.153364 0.468700 -0.063526
v -0.063525 0.468700 -0.153364
v 0.063525 0.468700 -0.153364
v 0.153364 0.468700 -0.063526
v 0.153364 0.468700 0.063525
v 0.063525 0.468700 0.153364
v 0.122689 0.374847 -0.050803
v 0.050860 0.374847 -0.122608
v 0.050761 0.468750 -0.122608
v 0.122590 0.468750 -0.050804
v 0.050804 0.468750 0.122590
v 0.050903 0.374847 0.122590
v 0.122707 0.374847 0.050761
v 0.122608 0.468750 0.050760
v -0.050761 0.468750 0.122607
v -0.050662 0.374847 0.122608
v -0.122590 0.468750 0.050803
v -0.122491 0.374847 0.050804
v -0.050804 0.468750 -0.122590
v -0.050705 0.374847 -0.122590
v -0.122509 0.374847 -0.050761
v -0.122608 0.468750 -0.050761
v 0.496094 -0.496094 -0.496094
v 0.496094 -0.496094 0.496094
v -0.496094 -0.496094 0.496094
v -0.496094 -0.496094 -0.496094
v 0.496094 -0.375000 -0.496094
v 0.496094 -0.375000 0.496094
v -0.496094 -0.375000 0.496094
v -0.496094 -0.375000 -0.496094
v 0.437500 -0.375000 -0.437500
v 0.437500 -0.375000 0.437500
v -0.437500 -0.375000 0.437500
v -0.437500 -0.375000 -0.437500
v 0.437500 0.375000 -0.437500
v 0.437500 0.375000 0.437500
v -0.437500 0.375000 0.437500 v -0.437500 0.375000 0.437500
v -0.437500 0.375000 -0.437500 v -0.437500 0.375000 -0.437500
v -0.437500 -0.375000 -0.437500 vt 0.0312 0.7695
v -0.437500 -0.375000 0.437500 vt 0.0078 0.7461
v 0.437500 0.375000 -0.437500 vt 0.0078 0.7148
v 0.437500 -0.375000 -0.437500 vt 0.0312 0.6914
v 0.437500 0.375000 0.437500 vt 0.0625 0.6914
v 0.437500 -0.375000 0.437500 vt 0.0859 0.7148
v 0.051777 0.468750 -0.125000 vt 0.0859 0.7461
v 0.125000 0.468750 -0.051777 vt 0.0625 0.7695
v 0.125000 0.468750 0.051777 vt 0.1016 0.7461
v 0.051777 0.468750 0.125000 vt 0.1250 0.7695
v -0.051777 0.468750 0.125000 vt 0.1562 0.7695
v -0.125000 0.468750 0.051777 vt 0.1797 0.7461
v -0.125000 0.468750 -0.051777 vt 0.1797 0.7148
v -0.051777 0.468750 -0.125000 vt 0.1562 0.6914
v 0.064721 0.468750 -0.156250 vt 0.1250 0.6914
v 0.064721 0.500000 -0.156250 vt 0.1016 0.7148
v 0.156250 0.468750 -0.064721
v 0.156250 0.500000 -0.064721
v 0.156250 0.468750 0.064721
v 0.156250 0.500000 0.064721
v 0.064721 0.468750 0.156250
v 0.064721 0.500000 0.156250
v -0.064721 0.468750 0.156250
v -0.064721 0.500000 0.156250
v -0.156250 0.468750 0.064721
v -0.156250 0.500000 0.064721
v -0.156250 0.468750 -0.064721
v -0.156250 0.500000 -0.064721
v -0.064721 0.468750 -0.156250
v -0.064721 0.500000 -0.156250
v 0.125000 0.370887 0.051777
v -0.051777 0.370905 -0.125000
v -0.125000 0.370905 -0.051777
v 0.051777 0.370905 0.125000
v 0.051777 0.370905 -0.125000
v -0.051777 0.370905 0.125000
v 0.125000 0.370905 -0.051777
v -0.125000 0.370887 0.051777
vt 0.7148 0.7617 vt 0.7148 0.7617
vt 0.7148 0.5117 vt 0.7148 0.5117
vt 0.7461 0.5117 vt 0.7461 0.5117
@ -91,119 +106,109 @@ vt 0.2305 0.6602
vt 0.2305 0.4414 vt 0.2305 0.4414
vt 0.4492 0.4414 vt 0.4492 0.4414
vt 0.4492 0.6602 vt 0.4492 0.6602
vt 0.0898 0.7500 vt 0.0547 0.9727
vt 0.0625 0.7734 vt 0.0547 0.9648
vt 0.0273 0.7734 vt 0.0625 0.9648
vt 0.0039 0.7500 vt 0.0625 0.9727
vt 0.0039 0.7148 vt 0.0781 0.9727
vt 0.0273 0.6875 vt 0.0781 0.9648
vt 0.0625 0.6875 vt 0.0859 0.9648
vt 0.0898 0.7148 vt 0.0859 0.9727
vt 0.1562 0.7734 vt 0.0469 0.9727
vt 0.1836 0.7461 vt 0.0469 0.9648
vt 0.1836 0.7148 vt 0.0938 0.9648
vt 0.1562 0.6875 vt 0.0938 0.9727
vt 0.1250 0.6875 vt 0.0391 0.9727
vt 0.0977 0.7148 vt 0.0391 0.9648
vt 0.0977 0.7461 vt 0.0703 0.9727
vt 0.1250 0.7734 vt 0.0703 0.9648
vt 0.1211 0.9961 vt 0.0312 0.9727
vt 0.1211 0.9883 vt 0.0312 0.9648
vt 0.1406 0.9883 vt 0.0508 0.9766
vt 0.1406 0.9961 vt 0.0664 0.9766
vt 0.1016 0.9961 vt 0.0664 0.9922
vt 0.1016 0.9883 vt 0.0508 0.9922
vt 0.1602 0.9883 vt 0.0195 0.9922
vt 0.1602 0.9961 vt 0.0195 0.9766
vt 0.0039 0.9961 vt 0.0352 0.9766
vt 0.0039 0.9883 vt 0.0352 0.9922
vt 0.0234 0.9883 vt 0.0039 0.9922
vt 0.0234 0.9961 vt 0.0039 0.9766
vt 0.0430 0.9883 vt 0.1133 0.9922
vt 0.0430 0.9961 vt 0.1133 0.9766
vt 0.0625 0.9883 vt 0.1289 0.9766
vt 0.0625 0.9961 vt 0.1289 0.9922
vt 0.0820 0.9883 vt 0.0820 0.9922
vt 0.0820 0.9961 vt 0.0820 0.9766
vt 0.0977 0.9844 vt 0.0977 0.9766
vt 0.0820 0.9844 vt 0.0977 0.9922
vt 0.0820 0.9609 vn 0.0000 1.0000 0.0000
vt 0.0977 0.9609 vn -0.0000 -1.0000 0.0000
vt 0.1133 0.9609
vt 0.1133 0.9844
vt 0.1289 0.9844
vt 0.1289 0.9609
vt 0.1445 0.9844
vt 0.1445 0.9609
vt 0.0352 0.9844
vt 0.0195 0.9844
vt 0.0195 0.9609
vt 0.0352 0.9609
vt 0.0508 0.9609
vt 0.0508 0.9844
vt 0.0664 0.9609
vt 0.0664 0.9844
vn -1.0000 0.0000 0.0000
vn 0.0000 0.0000 -1.0000
vn 1.0000 0.0000 0.0000 vn 1.0000 0.0000 0.0000
vn 0.0000 0.0000 1.0000 vn 0.0000 0.0000 1.0000
vn 0.0000 -1.0000 -0.0000 vn -1.0000 0.0000 0.0000
vn 0.0000 1.0000 0.0000 vn 0.0000 0.0000 -1.0000
vn 0.7173 -0.6302 -0.2971
vn 0.7173 0.6302 -0.2971 vn 0.7173 0.6302 -0.2971
vn 0.7173 0.6302 0.2971 vn 0.7173 -0.6302 -0.2971
vn 0.7173 -0.6302 0.2971
vn 0.2971 -0.6302 -0.7173 vn 0.2971 -0.6302 -0.7173
vn 0.2971 0.6302 -0.7173 vn 0.2971 0.6302 -0.7173
vn 0.2971 0.6302 0.7173
vn 0.2971 -0.6302 0.7173
vn -0.2971 0.6302 0.7173
vn -0.2971 -0.6302 0.7173
vn -0.7173 0.6302 0.2971
vn -0.7173 -0.6302 0.2971
vn -0.7173 0.6302 -0.2971 vn -0.7173 0.6302 -0.2971
vn -0.7173 -0.6302 -0.2971 vn -0.7173 -0.6302 -0.2971
vn -0.7173 -0.6302 0.2971
vn -0.7173 0.6302 0.2971
vn 0.7173 0.6302 0.2971
vn 0.7173 -0.6302 0.2971
vn -0.2971 -0.6302 0.7173
vn -0.2971 0.6302 0.7173
vn 0.2971 0.6302 0.7173
vn 0.2971 -0.6302 0.7173
vn -0.2971 0.6302 -0.7173 vn -0.2971 0.6302 -0.7173
vn -0.2971 -0.6302 -0.7173 vn -0.2971 -0.6302 -0.7173
vn -0.9239 0.0000 0.3827 vn 0.9238 0.0009 -0.3827
vn -0.9239 0.0000 -0.3827 vn 0.3827 0.0004 -0.9238
vn -0.9239 0.0000 -0.3826 vn 0.3823 0.0004 -0.9240
vn -0.3827 0.0000 0.9239 vn 0.9238 0.0009 -0.3829
vn 0.3827 0.0000 0.9239 vn 0.3826 0.0004 0.9239
vn 0.9239 0.0000 0.3827 vn 0.3830 0.0004 0.9237
vn 0.9239 0.0000 -0.3827 vn 0.9240 0.0009 0.3824
vn 0.9239 0.0000 -0.3826 vn 0.9239 0.0009 0.3826
vn 0.3827 0.0000 -0.9239 vn -0.3827 -0.0004 0.9238
vn -0.3827 0.0000 -0.9239 vn -0.3823 -0.0004 0.9240
usemtl None vn -0.9238 -0.0009 0.3827
vn -0.9238 -0.0009 0.3829
vn -0.3830 -0.0004 -0.9237
vn -0.3826 -0.0004 -0.9239
vn -0.9239 -0.0009 -0.3826
vn -0.9240 -0.0009 -0.3824
g Cube_Cube_None
s off s off
f 1/1/1 2/2/1 3/3/1 4/4/1 f 1/1/1 2/2/1 3/3/1 4/4/1 5/5/1 6/6/1 7/7/1 8/8/1
f 2/5/2 5/6/2 6/7/2 3/8/2 f 9/9/2 10/10/2 11/11/2 12/12/2 13/13/2 14/14/2 15/15/2 16/16/2
f 5/9/3 7/10/3 8/11/3 6/12/3 f 37/17/3 38/18/3 34/19/3 33/20/3
f 7/10/4 1/13/4 4/14/4 8/15/4 f 38/21/4 39/22/4 35/23/4 34/24/4
f 4/4/5 3/3/5 6/16/5 8/17/5 f 39/25/5 40/26/5 36/27/5 35/28/5
f 7/18/6 5/19/6 2/20/6 1/21/6 f 40/26/6 37/29/6 33/30/6 36/31/6
f 9/22/1 10/23/1 11/24/1 12/25/1 f 33/20/2 34/19/2 35/32/2 36/33/2
f 10/26/2 13/27/2 14/28/2 11/29/2 f 40/34/1 39/35/1 38/36/1 37/37/1
f 13/30/3 15/31/3 16/32/3 14/33/3 f 45/38/3 46/39/3 42/40/3 41/41/3
f 15/34/4 9/35/4 12/36/4 16/37/4 f 46/42/4 47/43/4 43/44/4 42/45/4
f 15/38/6 13/39/6 10/40/6 9/41/6 f 47/46/5 48/47/5 44/48/5 43/49/5
f 28/42/6 26/43/6 40/44/6 38/45/6 36/46/6 34/47/6 32/48/6 30/49/6 f 48/50/6 45/51/6 41/52/6 44/53/6
f 25/50/5 27/51/5 29/52/5 31/53/5 33/54/5 35/55/5 37/56/5 39/57/5 f 48/54/1 47/55/1 46/56/1 45/57/1
s 1 s 1
f 27/58/7 28/59/8 30/60/9 29/61/10 f 5/58/7 14/59/8 13/60/9 6/61/10
f 25/62/11 26/63/12 28/59/8 27/58/7 f 8/62/11 11/63/12 10/64/13 1/65/14
f 29/61/10 30/60/9 32/64/13 31/65/14 f 4/66/15 15/67/16 14/59/8 5/58/7
f 31/66/14 32/67/13 34/68/15 33/69/16 f 1/65/14 10/64/13 9/68/17 2/69/18
f 33/69/16 34/68/15 36/70/17 35/71/18 f 3/70/19 16/71/20 15/67/16 4/66/15
f 35/71/18 36/70/17 38/72/19 37/73/20 f 7/72/21 12/73/22 11/63/12 8/62/11
f 37/73/20 38/72/19 40/74/21 39/75/22 f 6/61/10 13/60/9 12/73/22 7/72/21
f 39/75/22 40/74/21 26/63/12 25/62/11 f 2/74/18 9/75/17 16/71/20 3/70/19
f 22/76/23 23/77/24 43/78/25 48/79/23 f 17/76/23 18/77/24 19/78/25 20/79/26
f 22/76/23 48/79/23 46/80/26 21/81/26 f 21/80/27 22/81/28 23/82/29 24/83/30
f 20/82/27 21/81/26 46/80/26 44/83/27 f 25/84/31 26/85/32 22/81/28 21/80/27
f 19/84/28 20/82/27 44/83/27 41/85/28 f 27/86/33 28/87/34 26/88/32 25/89/31
f 18/86/29 19/87/28 41/88/28 47/89/30 f 29/90/35 30/91/36 31/92/37 32/93/38
f 18/86/29 47/89/30 45/90/31 17/91/31 f 19/78/25 18/77/24 30/91/36 29/90/35
f 17/91/31 45/90/31 42/92/32 24/93/32 f 24/83/30 23/82/29 17/76/23 20/79/26
f 24/93/32 42/92/32 43/78/25 23/77/24 f 31/92/37 28/87/34 27/86/33 32/93/38

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 49 KiB