Mathis Brüchert: 1 fix uv on signal 4 files changed, 214 insertions(+), 214 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.sr.ht/~gpcf/advtrains-devel/patches/39887/mbox | git am -3Learn more about email & git
--- advtrains/models/advtrains_signal.obj | 416 +++++++++++------------ advtrains/models/advtrains_signal_30.obj | 4 +- advtrains/models/advtrains_signal_45.obj | 4 +- advtrains/models/advtrains_signal_60.obj | 4 +- 4 files changed, 214 insertions(+), 214 deletions(-) diff --git a/advtrains/models/advtrains_signal.obj b/advtrains/models/advtrains_signal.obj index bcfa1bc..a202f6d 100644 --- a/advtrains/models/advtrains_signal.obj +++ b/advtrains/models/advtrains_signal.obj @@ -1,108 +1,6 @@ # Made in Blockbench 4.6.5 mtllib advtrains_signal.mtl -o cube -v 0.3125 2.375 0 -v 0.3125 2.375 -0.125 -v 0.3125 1.5625 0 -v 0.3125 1.5625 -0.125 -v -0.3125 2.375 0 -v -0.3125 2.375 -0.125 -v -0.3125 1.5625 0 -v -0.3125 1.5625 -0.125 -v 0.25 2.4375 0 -v 0.25 2.4375 -0.125 -v 0.25 1.5 -0.125 -v 0.25 1.5 0 -v -0.25 2.4375 -0.125 -v -0.25 1.5 -0.125 -v -0.25 1.5 0 -v -0.25 2.4375 0 -vt 0.4375 0.515625 -vt 0.40625 0.515625 -vt 0.40625 0.3125 -vt 0.4375 0.3125 -vt 0.4375 0.3125 -vt 0.4375 0.515625 -vt 0.40625 0.515625 -vt 0.40625 0.3125 -vt 0.4375 0.53125 -vt 0.40625 0.53125 -vt 0.40625 0.515625 -vt 0.4375 0.515625 -vt 0.4375 0.3125 -vt 0.40625 0.3125 -vt 0.40625 0.296875 -vt 0.4375 0.296875 -vt 0.75 0.515625 -vt 0.734375 0.53125 -vt 0.734375 0.296875 -vt 0.75 0.3125 -vt 0.4375 0.3125 -vt 0.453125 0.296875 -vt 0.453125 0.53125 -vt 0.4375 0.515625 -vt 0.578125 0.5625 -vt 0.453125 0.5625 -vt 0.453125 0.53125 -vt 0.578125 0.53125 -vt 0.453125 0.296875 -vt 0.578125 0.296875 -vt 0.578125 0.53125 -vt 0.453125 0.53125 -vt 0.578125 0.5625 -vt 0.453125 0.5625 -vt 0.453125 0.53125 -vt 0.578125 0.53125 -vt 0.734375 0.53125 -vt 0.609375 0.53125 -vt 0.609375 0.296875 -vt 0.734375 0.296875 -vt 0.59375 0.515625 -vt 0.578125 0.53125 -vt 0.578125 0.296875 -vt 0.59375 0.3125 -vt 0.40625 0.296875 -vt 0.4375 0.296875 -vt 0.4375 0.3125 -vt 0.40625 0.3125 -vt 0.59375 0.3125 -vt 0.609375 0.296875 -vt 0.609375 0.53125 -vt 0.59375 0.515625 -vt 0.40625 0.515625 -vt 0.4375 0.515625 -vt 0.4375 0.53125 -vt 0.40625 0.53125 -vn 1 0 0 -vn -1 0 0 -vn 0.7071067811865476 0.7071067811865476 0 -vn 0.7071067811865476 -0.7071067811865476 0 -vn 0 0 1 -vn 0 0 -1 -vn 0 1 0 -vn 0 0 -1 -vn 0 -1 0 -vn 0 0 1 -vn 0 0 -1 -vn -0.7071067811865476 -0.7071067811865476 0 -vn 0 0 1 -vn -0.7071067811865476 0.7071067811865476 0 -usemtl m_d2f7d606-8ee1-ae76-432c-0035d85859e2 -f 2/1/1 1/2/1 3/3/1 4/4/1 -f 7/5/2 5/6/2 6/7/2 8/8/2 -f 2/9/3 10/10/3 9/11/3 1/12/3 -f 3/13/4 12/14/4 11/15/4 4/16/4 -f 1/17/5 9/18/5 12/19/5 3/20/5 -f 4/21/6 11/22/6 10/23/6 2/24/6 -f 10/25/7 13/26/7 16/27/7 9/28/7 -f 11/29/8 14/30/8 13/31/8 10/32/8 -f 12/33/9 15/34/9 14/35/9 11/36/9 -f 9/37/10 16/38/10 15/39/10 12/40/10 -f 6/41/11 13/42/11 14/43/11 8/44/11 -f 8/45/12 14/46/12 15/47/12 7/48/12 -f 7/49/13 15/50/13 16/51/13 5/52/13 -f 5/53/14 16/54/14 13/55/14 6/56/14 o tube v 0.051776695296636886 2.25 -0.0624999999999995 v 0.051776695296636886 2.25 -0.2499999999999995 @@ -287,82 +185,36 @@ vn 0 -0.7071067811865475 -0.7071067811865477 vn 1 0 0 vn 0 -2.220446049250313e-16 1 usemtl m_d2f7d606-8ee1-ae76-432c-0035d85859e2 -f 17/57/15 21/58/15 22/59/15 18/60/15 -f 20/61/16 24/62/16 23/63/16 19/64/16 -f 19/65/17 23/66/17 21/67/17 17/68/17 -f 18/69/18 22/70/18 24/71/18 20/72/18 -f 26/73/19 42/74/19 41/75/19 25/76/19 -f 27/77/20 44/78/20 43/79/20 28/80/20 -f 25/81/21 41/82/21 44/83/21 27/84/21 -f 28/85/22 43/86/22 42/87/22 26/88/22 -f 34/89/23 46/90/23 45/91/23 33/92/23 -f 35/93/24 48/94/24 47/95/24 36/96/24 -f 33/97/25 45/98/25 48/99/25 35/100/25 -f 36/101/26 47/102/26 46/103/26 34/104/26 -f 33/105/27 37/106/27 38/107/27 34/108/27 -f 36/109/28 40/110/28 39/111/28 35/112/28 -f 35/113/29 39/114/29 37/115/29 33/116/29 -f 34/117/30 38/118/30 40/119/30 36/120/30 -f 37/121/31 17/122/31 18/123/31 38/124/31 -f 40/125/32 20/126/32 19/127/32 39/128/32 -f 39/129/33 19/130/33 17/131/33 37/132/33 -f 38/133/34 18/134/34 20/135/34 40/136/34 -f 26/137/35 25/138/35 27/139/35 28/140/35 -f 29/141/36 30/142/36 32/143/36 31/144/36 -f 21/145/37 41/146/37 42/147/37 22/148/37 -f 22/149/38 42/150/38 43/151/38 24/152/38 -f 24/153/39 43/154/39 44/155/39 23/156/39 -f 23/157/40 44/158/40 41/159/40 21/160/40 -f 29/161/41 45/162/41 46/163/41 30/164/41 -f 30/165/42 46/166/42 47/167/42 32/168/42 -f 32/169/43 47/170/43 48/171/43 31/172/43 -f 31/173/44 48/174/44 45/175/44 29/176/44 -o Stiel -v -0.0625 2.1875 -0.0625 -v -0.0625 2.1875 0.0625 -v -0.0625 -0.5 -0.0625 -v -0.0625 -0.5 0.0625 -v 0.0625 2.1875 0.0625 -v 0.0625 2.1875 -0.0625 -v 0.0625 -0.5 0.0625 -v 0.0625 -0.5 -0.0625 -vt 0.96875 0.671875 -vt 1 0.671875 -vt 1 0 -vt 0.96875 0 -vt 1 0.671875 -vt 0.96875 0.671875 -vt 0.96875 0.015625 -vt 1 0.015625 -vt 0.96875 0.671875 -vt 1 0.671875 -vt 1 0 -vt 0.96875 0 -vt 1 0.671875 -vt 0.96875 0.671875 -vt 0.96875 0 -vt 1 0 -vt 0.9375 0.75 -vt 0.90625 0.75 -vt 0.90625 0.78125 -vt 0.9375 0.78125 -vt 0.96875 0.78125 -vt 0.9375 0.78125 -vt 0.9375 0.75 -vt 0.96875 0.75 -vn 1.2246467991473532e-16 0 1 -vn -1 0 1.2246467991473532e-16 -vn -1.2246467991473532e-16 0 -1 -vn 1 0 -1.2246467991473532e-16 -vn 0 1 0 -vn 0 -1 0 -usemtl m_d2f7d606-8ee1-ae76-432c-0035d85859e2 -f 52/180/45 55/179/45 53/178/45 50/177/45 -f 51/184/46 52/183/46 50/182/46 49/181/46 -f 56/188/47 51/187/47 49/186/47 54/185/47 -f 55/192/48 56/191/48 54/190/48 53/189/48 -f 54/196/49 49/195/49 50/194/49 53/193/49 -f 55/200/50 52/199/50 51/198/50 56/197/50 +f 1/1/1 5/2/1 6/3/1 2/4/1 +f 4/5/2 8/6/2 7/7/2 3/8/2 +f 3/9/3 7/10/3 5/11/3 1/12/3 +f 2/13/4 6/14/4 8/15/4 4/16/4 +f 10/17/5 26/18/5 25/19/5 9/20/5 +f 11/21/6 28/22/6 27/23/6 12/24/6 +f 9/25/7 25/26/7 28/27/7 11/28/7 +f 12/29/8 27/30/8 26/31/8 10/32/8 +f 18/33/9 30/34/9 29/35/9 17/36/9 +f 19/37/10 32/38/10 31/39/10 20/40/10 +f 17/41/11 29/42/11 32/43/11 19/44/11 +f 20/45/12 31/46/12 30/47/12 18/48/12 +f 17/49/13 21/50/13 22/51/13 18/52/13 +f 20/53/14 24/54/14 23/55/14 19/56/14 +f 19/57/15 23/58/15 21/59/15 17/60/15 +f 18/61/16 22/62/16 24/63/16 20/64/16 +f 21/65/17 1/66/17 2/67/17 22/68/17 +f 24/69/18 4/70/18 3/71/18 23/72/18 +f 23/73/19 3/74/19 1/75/19 21/76/19 +f 22/77/20 2/78/20 4/79/20 24/80/20 +f 10/81/21 9/82/21 11/83/21 12/84/21 +f 13/85/22 14/86/22 16/87/22 15/88/22 +f 5/89/23 25/90/23 26/91/23 6/92/23 +f 6/93/24 26/94/24 27/95/24 8/96/24 +f 8/97/25 27/98/25 28/99/25 7/100/25 +f 7/101/26 28/102/26 25/103/26 5/104/26 +f 13/105/27 29/106/27 30/107/27 14/108/27 +f 14/109/28 30/110/28 31/111/28 16/112/28 +f 16/113/29 31/114/29 32/115/29 15/116/29 +f 15/117/30 32/118/30 29/119/30 13/120/30 o tube v 0.051776695296636886 1.9375 -0.06249999999999957 v 0.051776695296636886 1.9375 -0.24999999999999956 @@ -547,33 +399,181 @@ vn 0 -0.7071067811865475 -0.7071067811865477 vn 1 0 0 vn 0 -2.220446049250313e-16 1 usemtl m_d2f7d606-8ee1-ae76-432c-0035d85859e2 -f 57/201/51 61/202/51 62/203/51 58/204/51 -f 60/205/52 64/206/52 63/207/52 59/208/52 -f 59/209/53 63/210/53 61/211/53 57/212/53 -f 58/213/54 62/214/54 64/215/54 60/216/54 -f 66/217/55 82/218/55 81/219/55 65/220/55 -f 67/221/56 84/222/56 83/223/56 68/224/56 -f 65/225/57 81/226/57 84/227/57 67/228/57 -f 68/229/58 83/230/58 82/231/58 66/232/58 -f 74/233/59 86/234/59 85/235/59 73/236/59 -f 75/237/60 88/238/60 87/239/60 76/240/60 -f 73/241/61 85/242/61 88/243/61 75/244/61 -f 76/245/62 87/246/62 86/247/62 74/248/62 -f 73/249/63 77/250/63 78/251/63 74/252/63 -f 76/253/64 80/254/64 79/255/64 75/256/64 -f 75/257/65 79/258/65 77/259/65 73/260/65 -f 74/261/66 78/262/66 80/263/66 76/264/66 -f 77/265/67 57/266/67 58/267/67 78/268/67 -f 80/269/68 60/270/68 59/271/68 79/272/68 -f 79/273/69 59/274/69 57/275/69 77/276/69 -f 78/277/70 58/278/70 60/279/70 80/280/70 -f 66/281/71 65/282/71 67/283/71 68/284/71 -f 69/285/72 70/286/72 72/287/72 71/288/72 -f 61/289/73 81/290/73 82/291/73 62/292/73 -f 62/293/74 82/294/74 83/295/74 64/296/74 -f 64/297/75 83/298/75 84/299/75 63/300/75 -f 63/301/76 84/302/76 81/303/76 61/304/76 -f 69/305/77 85/306/77 86/307/77 70/308/77 -f 70/309/78 86/310/78 87/311/78 72/312/78 -f 72/313/79 87/314/79 88/315/79 71/316/79 -f 71/317/80 88/318/80 85/319/80 69/320/80 \ No newline at end of file +f 33/121/31 37/122/31 38/123/31 34/124/31 +f 36/125/32 40/126/32 39/127/32 35/128/32 +f 35/129/33 39/130/33 37/131/33 33/132/33 +f 34/133/34 38/134/34 40/135/34 36/136/34 +f 42/137/35 58/138/35 57/139/35 41/140/35 +f 43/141/36 60/142/36 59/143/36 44/144/36 +f 41/145/37 57/146/37 60/147/37 43/148/37 +f 44/149/38 59/150/38 58/151/38 42/152/38 +f 50/153/39 62/154/39 61/155/39 49/156/39 +f 51/157/40 64/158/40 63/159/40 52/160/40 +f 49/161/41 61/162/41 64/163/41 51/164/41 +f 52/165/42 63/166/42 62/167/42 50/168/42 +f 49/169/43 53/170/43 54/171/43 50/172/43 +f 52/173/44 56/174/44 55/175/44 51/176/44 +f 51/177/45 55/178/45 53/179/45 49/180/45 +f 50/181/46 54/182/46 56/183/46 52/184/46 +f 53/185/47 33/186/47 34/187/47 54/188/47 +f 56/189/48 36/190/48 35/191/48 55/192/48 +f 55/193/49 35/194/49 33/195/49 53/196/49 +f 54/197/50 34/198/50 36/199/50 56/200/50 +f 42/201/51 41/202/51 43/203/51 44/204/51 +f 45/205/52 46/206/52 48/207/52 47/208/52 +f 37/209/53 57/210/53 58/211/53 38/212/53 +f 38/213/54 58/214/54 59/215/54 40/216/54 +f 40/217/55 59/218/55 60/219/55 39/220/55 +f 39/221/56 60/222/56 57/223/56 37/224/56 +f 45/225/57 61/226/57 62/227/57 46/228/57 +f 46/229/58 62/230/58 63/231/58 48/232/58 +f 48/233/59 63/234/59 64/235/59 47/236/59 +f 47/237/60 64/238/60 61/239/60 45/240/60 +o cube +v 0.3125 2.375 0 +v 0.3125 2.375 -0.125 +v 0.3125 1.5625 0 +v 0.3125 1.5625 -0.125 +v -0.3125 2.375 0 +v -0.3125 2.375 -0.125 +v -0.3125 1.5625 0 +v -0.3125 1.5625 -0.125 +v 0.25 2.4375 0 +v 0.25 2.4375 -0.125 +v 0.25 1.5 -0.125 +v 0.25 1.5 0 +v -0.25 2.4375 -0.125 +v -0.25 1.5 -0.125 +v -0.25 1.5 0 +v -0.25 2.4375 0 +vt 0.4375 0.515625 +vt 0.40625 0.515625 +vt 0.40625 0.3125 +vt 0.4375 0.3125 +vt 0.4375 0.3125 +vt 0.4375 0.515625 +vt 0.40625 0.515625 +vt 0.40625 0.3125 +vt 0.4375 0.53125 +vt 0.40625 0.53125 +vt 0.40625 0.515625 +vt 0.4375 0.515625 +vt 0.4375 0.3125 +vt 0.40625 0.3125 +vt 0.40625 0.296875 +vt 0.4375 0.296875 +vt 0.75 0.515625 +vt 0.734375 0.53125 +vt 0.734375 0.296875 +vt 0.75 0.3125 +vt 0.4375 0.3125 +vt 0.453125 0.296875 +vt 0.453125 0.53125 +vt 0.4375 0.515625 +vt 0.578125 0.5625 +vt 0.453125 0.5625 +vt 0.453125 0.53125 +vt 0.578125 0.53125 +vt 0.453125 0.296875 +vt 0.578125 0.296875 +vt 0.578125 0.53125 +vt 0.453125 0.53125 +vt 0.578125 0.5625 +vt 0.453125 0.5625 +vt 0.453125 0.53125 +vt 0.578125 0.53125 +vt 0.734375 0.53125 +vt 0.609375 0.53125 +vt 0.609375 0.296875 +vt 0.734375 0.296875 +vt 0.59375 0.515625 +vt 0.578125 0.53125 +vt 0.578125 0.296875 +vt 0.59375 0.3125 +vt 0.40625 0.296875 +vt 0.4375 0.296875 +vt 0.4375 0.3125 +vt 0.40625 0.3125 +vt 0.59375 0.3125 +vt 0.609375 0.296875 +vt 0.609375 0.53125 +vt 0.59375 0.515625 +vt 0.40625 0.515625 +vt 0.4375 0.515625 +vt 0.4375 0.53125 +vt 0.40625 0.53125 +vn 1 0 0 +vn -1 0 0 +vn 0.7071067811865476 0.7071067811865476 0 +vn 0.7071067811865476 -0.7071067811865476 0 +vn 0 0 1 +vn 0 0 -1 +vn 0 1 0 +vn 0 0 -1 +vn 0 -1 0 +vn 0 0 1 +vn 0 0 -1 +vn -0.7071067811865476 -0.7071067811865476 0 +vn 0 0 1 +vn -0.7071067811865476 0.7071067811865476 0 +usemtl m_d2f7d606-8ee1-ae76-432c-0035d85859e2 +f 66/241/61 65/242/61 67/243/61 68/244/61 +f 71/245/62 69/246/62 70/247/62 72/248/62 +f 66/249/63 74/250/63 73/251/63 65/252/63 +f 67/253/64 76/254/64 75/255/64 68/256/64 +f 65/257/65 73/258/65 76/259/65 67/260/65 +f 68/261/66 75/262/66 74/263/66 66/264/66 +f 74/265/67 77/266/67 80/267/67 73/268/67 +f 75/269/68 78/270/68 77/271/68 74/272/68 +f 76/273/69 79/274/69 78/275/69 75/276/69 +f 73/277/70 80/278/70 79/279/70 76/280/70 +f 70/281/71 77/282/71 78/283/71 72/284/71 +f 72/285/72 78/286/72 79/287/72 71/288/72 +f 71/289/73 79/290/73 80/291/73 69/292/73 +f 69/293/74 80/294/74 77/295/74 70/296/74 +o Stiel +v -0.0625 2.1875 -0.0625 +v -0.0625 2.1875 0.0625 +v -0.0625 -0.5 -0.0625 +v -0.0625 -0.5 0.0625 +v 0.0625 2.1875 0.0625 +v 0.0625 2.1875 -0.0625 +v 0.0625 -0.5 0.0625 +v 0.0625 -0.5 -0.0625 +vt 0.96875 0.671875 +vt 1 0.671875 +vt 1 0 +vt 0.96875 0 +vt 1 0.671875 +vt 0.96875 0.671875 +vt 0.96875 0 +vt 1 0 +vt 0.96875 0.671875 +vt 1 0.671875 +vt 1 0 +vt 0.96875 0 +vt 1 0.671875 +vt 0.96875 0.671875 +vt 0.96875 0 +vt 1 0 +vt 0.9375 0.75 +vt 0.90625 0.75 +vt 0.90625 0.78125 +vt 0.9375 0.78125 +vt 0.96875 0.78125 +vt 0.9375 0.78125 +vt 0.9375 0.75 +vt 0.96875 0.75 +vn 1.2246467991473532e-16 0 1 +vn -1 0 1.2246467991473532e-16 +vn -1.2246467991473532e-16 0 -1 +vn 1 0 -1.2246467991473532e-16 +vn 0 1 0 +vn 0 -1 0 +usemtl m_d2f7d606-8ee1-ae76-432c-0035d85859e2 +f 84/300/75 87/299/75 85/298/75 82/297/75 +f 83/304/76 84/303/76 82/302/76 81/301/76 +f 88/308/77 83/307/77 81/306/77 86/305/77 +f 87/312/78 88/311/78 86/310/78 85/309/78 +f 86/316/79 81/315/79 82/314/79 85/313/79 +f 87/320/80 84/319/80 83/318/80 88/317/80 \ No newline at end of file diff --git a/advtrains/models/advtrains_signal_30.obj b/advtrains/models/advtrains_signal_30.obj index 1d03588..a7da505 100644 --- a/advtrains/models/advtrains_signal_30.obj +++ b/advtrains/models/advtrains_signal_30.obj @@ -16,8 +16,8 @@ vt 1 0 vt 0.96875 0 vt 1 0.671875 vt 0.96875 0.671875 -vt 0.96875 0.015625 -vt 1 0.015625 +vt 0.96875 0 +vt 1 0 vt 0.96875 0.671875 vt 1 0.671875 vt 1 0 diff --git a/advtrains/models/advtrains_signal_45.obj b/advtrains/models/advtrains_signal_45.obj index 315ddd8..15f8947 100644 --- a/advtrains/models/advtrains_signal_45.obj +++ b/advtrains/models/advtrains_signal_45.obj @@ -16,8 +16,8 @@ vt 1 0 vt 0.96875 0 vt 1 0.671875 vt 0.96875 0.671875 -vt 0.96875 0.015625 -vt 1 0.015625 +vt 0.96875 0 +vt 1 0 vt 0.96875 0.671875 vt 1 0.671875 vt 1 0 diff --git a/advtrains/models/advtrains_signal_60.obj b/advtrains/models/advtrains_signal_60.obj index 6bed5a5..e3068be 100644 --- a/advtrains/models/advtrains_signal_60.obj +++ b/advtrains/models/advtrains_signal_60.obj @@ -16,8 +16,8 @@ vt 1 0 vt 0.96875 0 vt 1 0.671875 vt 0.96875 0.671875 -vt 0.96875 0.015625 -vt 1 0.015625 +vt 0.96875 0 +vt 1 0 vt 0.96875 0.671875 vt 1 0.671875 vt 1 0 -- 2.39.2
Hi mbb, Is this a follow-up of your previous patch ("change models on rotate")? If you send a series of patches, it would be nice if you would add the message ID of the previous email as the In-Reply-To field (NOT Reply-To) of the new patch. This would make the patches appear as a thread and make it obvious that the newer one depends on the older one. ywang