From 7b568eb8a9d1aaf4bce61686cb805691521adf90 Mon Sep 17 00:00:00 2001 From: dise Date: Wed, 28 Feb 2024 21:28:13 +0300 Subject: [PATCH] Update UI & Player Model + Add new materials --- models/player.obj | 1337 +++++++++++++++++++++++++++++++ models/player.obj.import | 22 + models/player.tscn | 84 +- scenes/HUD/choose_team.tscn | 9 +- scenes/HUD/hud.tscn | 97 ++- scenes/HUD/menu.tscn | 60 +- textures/materials/black90%.res | Bin 0 -> 1016 bytes textures/materials/orange.res | Bin 0 -> 1023 bytes 8 files changed, 1576 insertions(+), 33 deletions(-) create mode 100644 models/player.obj create mode 100644 models/player.obj.import create mode 100644 textures/materials/black90%.res create mode 100644 textures/materials/orange.res diff --git a/models/player.obj b/models/player.obj new file mode 100644 index 0000000..b32ff69 --- /dev/null +++ b/models/player.obj @@ -0,0 +1,1337 @@ +# Made in Blockbench 4.9.4 +mtllib player.mtl + +o foot_left +v 0.4375 0.125 0.1875 +v 0.4375 0.125 -0.25 +v 0.4375 0 0.1875 +v 0.4375 0 -0.25 +v 0.1875 0.125 -0.25 +v 0.1875 0.125 0.1875 +v 0.1875 0 -0.25 +v 0.1875 0 0.1875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.875 +vt 0 0.875 +vt 0 1 +vt 0.4375 1 +vt 0.4375 0.875 +vt 0 0.875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.875 +vt 0 0.875 +vt 0 1 +vt 0.4375 1 +vt 0.4375 0.875 +vt 0 0.875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.5625 +vt 0 0.5625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.5625 +vt 0 0.5625 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 4/4/1 7/3/1 5/2/1 2/1/1 +f 3/8/2 4/7/2 2/6/2 1/5/2 +f 8/12/3 3/11/3 1/10/3 6/9/3 +f 7/16/4 8/15/4 6/14/4 5/13/4 +f 6/20/5 1/19/5 2/18/5 5/17/5 +f 7/24/6 4/23/6 3/22/6 8/21/6 +o foot_right +v -0.1875 0.125 0.1875 +v -0.1875 0.125 -0.25 +v -0.1875 0 0.1875 +v -0.1875 0 -0.25 +v -0.4375 0.125 -0.25 +v -0.4375 0.125 0.1875 +v -0.4375 0 -0.25 +v -0.4375 0 0.1875 +vt 0 0.5 +vt 0.25 0.5 +vt 0.25 0.0625 +vt 0 0.0625 +vt 0 0.5 +vt 0.25 0.5 +vt 0.25 0.0625 +vt 0 0.0625 +vt 0 0.5 +vt 0.25 0.5 +vt 0.25 0.0625 +vt 0 0.0625 +vt 0 0.5 +vt 0.25 0.5 +vt 0.25 0.0625 +vt 0 0.0625 +vt 0 0.5 +vt 0.25 0.5 +vt 0.25 0.0625 +vt 0 0.0625 +vt 0 0.5 +vt 0.25 0.5 +vt 0.25 0.0625 +vt 0 0.0625 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 12/28/7 15/27/7 13/26/7 10/25/7 +f 11/32/8 12/31/8 10/30/8 9/29/8 +f 16/36/9 11/35/9 9/34/9 14/33/9 +f 15/40/10 16/39/10 14/38/10 13/37/10 +f 14/44/11 9/43/11 10/42/11 13/41/11 +f 15/48/12 12/47/12 11/46/12 16/45/12 +o cube +v 0.375 0.25 0.125 +v 0.375 0.25 0 +v 0.375 0.125 0.125 +v 0.375 0.125 0 +v 0.25 0.25 0 +v 0.25 0.25 0.125 +v 0.25 0.125 0 +v 0.25 0.125 0.125 +vt 0 0.9375 +vt 1 0.9375 +vt 1 0.125 +vt 0 0.125 +vt 0 0.9375 +vt 1 0.9375 +vt 1 0.125 +vt 0 0.125 +vt 0 0.9375 +vt 1 0.9375 +vt 1 0.125 +vt 0 0.125 +vt 0 0.9375 +vt 1 0.9375 +vt 1 0.125 +vt 0 0.125 +vt 0 0.9375 +vt 1 0.9375 +vt 1 0.125 +vt 0 0.125 +vt 0 0.9375 +vt 1 0.9375 +vt 1 0.125 +vt 0 0.125 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 20/52/13 23/51/13 21/50/13 18/49/13 +f 19/56/14 20/55/14 18/54/14 17/53/14 +f 24/60/15 19/59/15 17/58/15 22/57/15 +f 23/64/16 24/63/16 22/62/16 21/61/16 +f 22/68/17 17/67/17 18/66/17 21/65/17 +f 23/72/18 20/71/18 19/70/18 24/69/18 +o cube +v -0.25 0.25 0.125 +v -0.25 0.25 0 +v -0.25 0.125 0.125 +v -0.25 0.125 0 +v -0.375 0.25 0 +v -0.375 0.25 0.125 +v -0.375 0.125 0 +v -0.375 0.125 0.125 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 28/76/19 31/75/19 29/74/19 26/73/19 +f 27/80/20 28/79/20 26/78/20 25/77/20 +f 32/84/21 27/83/21 25/82/21 30/81/21 +f 31/88/22 32/87/22 30/86/22 29/85/22 +f 30/92/23 25/91/23 26/90/23 29/89/23 +f 31/96/24 28/95/24 27/94/24 32/93/24 +o cube +v 0.4375 0.625 0.1875 +v 0.4375 0.625 -0.0625 +v 0.4375 0.25 0.1875 +v 0.4375 0.25 -0.0625 +v 0.1875 0.625 -0.0625 +v 0.1875 0.625 0.1875 +v 0.1875 0.25 -0.0625 +v 0.1875 0.25 0.1875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 36/100/25 39/99/25 37/98/25 34/97/25 +f 35/104/26 36/103/26 34/102/26 33/101/26 +f 40/108/27 35/107/27 33/106/27 38/105/27 +f 39/112/28 40/111/28 38/110/28 37/109/28 +f 38/116/29 33/115/29 34/114/29 37/113/29 +f 39/120/30 36/119/30 35/118/30 40/117/30 +o cube +v -0.1875 0.625 0.1875 +v -0.1875 0.625 -0.0625 +v -0.1875 0.25 0.1875 +v -0.1875 0.25 -0.0625 +v -0.4375 0.625 -0.0625 +v -0.4375 0.625 0.1875 +v -0.4375 0.25 -0.0625 +v -0.4375 0.25 0.1875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 44/124/31 47/123/31 45/122/31 42/121/31 +f 43/128/32 44/127/32 42/126/32 41/125/32 +f 48/132/33 43/131/33 41/130/33 46/129/33 +f 47/136/34 48/135/34 46/134/34 45/133/34 +f 46/140/35 41/139/35 42/138/35 45/137/35 +f 47/144/36 44/143/36 43/142/36 48/141/36 +o cube +v -0.25 0.6875 0.125 +v -0.25 0.6875 0 +v -0.25 0.625 0.125 +v -0.25 0.625 0 +v -0.375 0.6875 0 +v -0.375 0.6875 0.125 +v -0.375 0.625 0 +v -0.375 0.625 0.125 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 52/148/37 55/147/37 53/146/37 50/145/37 +f 51/152/38 52/151/38 50/150/38 49/149/38 +f 56/156/39 51/155/39 49/154/39 54/153/39 +f 55/160/40 56/159/40 54/158/40 53/157/40 +f 54/164/41 49/163/41 50/162/41 53/161/41 +f 55/168/42 52/167/42 51/166/42 56/165/42 +o cube +v 0.375 1.125 0.125 +v 0.375 1.125 0 +v 0.375 1.0625 0.125 +v 0.375 1.0625 0 +v 0.25 1.125 0 +v 0.25 1.125 0.125 +v 0.25 1.0625 0 +v 0.25 1.0625 0.125 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 60/172/43 63/171/43 61/170/43 58/169/43 +f 59/176/44 60/175/44 58/174/44 57/173/44 +f 64/180/45 59/179/45 57/178/45 62/177/45 +f 63/184/46 64/183/46 62/182/46 61/181/46 +f 62/188/47 57/187/47 58/186/47 61/185/47 +f 63/192/48 60/191/48 59/190/48 64/189/48 +o cube +v -0.1875 1.0625 0.1875 +v -0.1875 1.0625 -0.0625 +v -0.1875 0.6875 0.1875 +v -0.1875 0.6875 -0.0625 +v -0.4375 1.0625 -0.0625 +v -0.4375 1.0625 0.1875 +v -0.4375 0.6875 -0.0625 +v -0.4375 0.6875 0.1875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 68/196/49 71/195/49 69/194/49 66/193/49 +f 67/200/50 68/199/50 66/198/50 65/197/50 +f 72/204/51 67/203/51 65/202/51 70/201/51 +f 71/208/52 72/207/52 70/206/52 69/205/52 +f 70/212/53 65/211/53 66/210/53 69/209/53 +f 71/216/54 68/215/54 67/214/54 72/213/54 +o cube +v 0.4375 1.0625 0.1875 +v 0.4375 1.0625 -0.0625 +v 0.4375 0.6875 0.1875 +v 0.4375 0.6875 -0.0625 +v 0.1875 1.0625 -0.0625 +v 0.1875 1.0625 0.1875 +v 0.1875 0.6875 -0.0625 +v 0.1875 0.6875 0.1875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 76/220/55 79/219/55 77/218/55 74/217/55 +f 75/224/56 76/223/56 74/222/56 73/221/56 +f 80/228/57 75/227/57 73/226/57 78/225/57 +f 79/232/58 80/231/58 78/230/58 77/229/58 +f 78/236/59 73/235/59 74/234/59 77/233/59 +f 79/240/60 76/239/60 75/238/60 80/237/60 +o cube +v 0.4375 1.3125 0.1875 +v 0.4375 1.3125 -0.0625 +v 0.4375 1.125 0.1875 +v 0.4375 1.125 -0.0625 +v -0.4375 1.3125 -0.0625 +v -0.4375 1.3125 0.1875 +v -0.4375 1.125 -0.0625 +v -0.4375 1.125 0.1875 +vt 0 1 +vt 0.875 1 +vt 0.875 0.8125 +vt 0 0.8125 +vt 0 1 +vt 0.25 1 +vt 0.25 0.8125 +vt 0 0.8125 +vt 0 1 +vt 0.875 1 +vt 0.875 0.8125 +vt 0 0.8125 +vt 0 1 +vt 0.25 1 +vt 0.25 0.8125 +vt 0 0.8125 +vt 0 1 +vt 0.875 1 +vt 0.875 0.75 +vt 0 0.75 +vt 0 1 +vt 0.875 1 +vt 0.875 0.75 +vt 0 0.75 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 84/244/61 87/243/61 85/242/61 82/241/61 +f 83/248/62 84/247/62 82/246/62 81/245/62 +f 88/252/63 83/251/63 81/250/63 86/249/63 +f 87/256/64 88/255/64 86/254/64 85/253/64 +f 86/260/65 81/259/65 82/258/65 85/257/65 +f 87/264/66 84/263/66 83/262/66 88/261/66 +o cube +v -0.25 1.125 0.125 +v -0.25 1.125 0 +v -0.25 1.0625 0.125 +v -0.25 1.0625 0 +v -0.375 1.125 0 +v -0.375 1.125 0.125 +v -0.375 1.0625 0 +v -0.375 1.0625 0.125 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 92/268/67 95/267/67 93/266/67 90/265/67 +f 91/272/68 92/271/68 90/270/68 89/269/68 +f 96/276/69 91/275/69 89/274/69 94/273/69 +f 95/280/70 96/279/70 94/278/70 93/277/70 +f 94/284/71 89/283/71 90/282/71 93/281/71 +f 95/288/72 92/287/72 91/286/72 96/285/72 +o cube +v 0.375 1.4375 0.125 +v 0.375 1.4375 0 +v 0.375 1.3125 0.125 +v 0.375 1.3125 0 +v -0.375 1.4375 0 +v -0.375 1.4375 0.125 +v -0.375 1.3125 0 +v -0.375 1.3125 0.125 +vt 0 1 +vt 0.75 1 +vt 0.75 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.75 1 +vt 0.75 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.75 1 +vt 0.75 0.875 +vt 0 0.875 +vt 0 1 +vt 0.75 1 +vt 0.75 0.875 +vt 0 0.875 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 100/292/73 103/291/73 101/290/73 98/289/73 +f 99/296/74 100/295/74 98/294/74 97/293/74 +f 104/300/75 99/299/75 97/298/75 102/297/75 +f 103/304/76 104/303/76 102/302/76 101/301/76 +f 102/308/77 97/307/77 98/306/77 101/305/77 +f 103/312/78 100/311/78 99/310/78 104/309/78 +o cube +v 0.4375 2.375 0.1875 +v 0.4375 2.375 -0.0625 +v 0.4375 1.4375 0.1875 +v 0.4375 1.4375 -0.0625 +v -0.4375 2.375 -0.0625 +v -0.4375 2.375 0.1875 +v -0.4375 1.4375 -0.0625 +v -0.4375 1.4375 0.1875 +vt 1.125 -0.1875 +vt 0.25 -0.1875 +vt 0.25 0.75 +vt 1.125 0.75 +vt 0.25 -0.1875 +vt 0 -0.1875 +vt 0 0.75 +vt 0.25 0.75 +vt 2.25 -0.1875 +vt 1.375 -0.1875 +vt 1.375 0.75 +vt 2.25 0.75 +vt 1.375 -0.1875 +vt 1.125 -0.1875 +vt 1.125 0.75 +vt 1.375 0.75 +vt 0.25 1 +vt 1.125 1 +vt 1.125 0.75 +vt 0.25 0.75 +vt 1.125 0.75 +vt 2 0.75 +vt 2 1 +vt 1.125 1 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 108/316/79 111/315/79 109/314/79 106/313/79 +f 107/320/80 108/319/80 106/318/80 105/317/80 +f 112/324/81 107/323/81 105/322/81 110/321/81 +f 111/328/82 112/327/82 110/326/82 109/325/82 +f 110/332/83 105/331/83 106/330/83 109/329/83 +f 111/336/84 108/335/84 107/334/84 112/333/84 +o cube +v -0.375 2.3125 0.125 +v -0.375 2.3125 0 +v -0.375 2.1875 0.125 +v -0.375 2.1875 0 +v -0.5 2.3125 0 +v -0.5 2.3125 0.125 +v -0.5 2.1875 0 +v -0.5 2.1875 0.125 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 116/340/85 119/339/85 117/338/85 114/337/85 +f 115/344/86 116/343/86 114/342/86 113/341/86 +f 120/348/87 115/347/87 113/346/87 118/345/87 +f 119/352/88 120/351/88 118/350/88 117/349/88 +f 118/356/89 113/355/89 114/354/89 117/353/89 +f 119/360/90 116/359/90 115/358/90 120/357/90 +o cube +v 0.5 2.3125 0.125 +v 0.5 2.3125 0 +v 0.5 2.1875 0.125 +v 0.5 2.1875 0 +v 0.375 2.3125 0 +v 0.375 2.3125 0.125 +v 0.375 2.1875 0 +v 0.375 2.1875 0.125 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 124/364/91 127/363/91 125/362/91 122/361/91 +f 123/368/92 124/367/92 122/366/92 121/365/92 +f 128/372/93 123/371/93 121/370/93 126/369/93 +f 127/376/94 128/375/94 126/374/94 125/373/94 +f 126/380/95 121/379/95 122/378/95 125/377/95 +f 127/384/96 124/383/96 123/382/96 128/381/96 +o cube +v 0.75 2.375 0.1875 +v 0.75 2.375 -0.0625 +v 0.75 2 0.1875 +v 0.75 2 -0.0625 +v 0.5 2.375 -0.0625 +v 0.5 2.375 0.1875 +v 0.5 2 -0.0625 +v 0.5 2 0.1875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 132/388/97 135/387/97 133/386/97 130/385/97 +f 131/392/98 132/391/98 130/390/98 129/389/98 +f 136/396/99 131/395/99 129/394/99 134/393/99 +f 135/400/100 136/399/100 134/398/100 133/397/100 +f 134/404/101 129/403/101 130/402/101 133/401/101 +f 135/408/102 132/407/102 131/406/102 136/405/102 +o cube +v -0.5 2.375 0.1875 +v -0.5 2.375 -0.0625 +v -0.5 2 0.1875 +v -0.5 2 -0.0625 +v -0.75 2.375 -0.0625 +v -0.75 2.375 0.1875 +v -0.75 2 -0.0625 +v -0.75 2 0.1875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 140/412/103 143/411/103 141/410/103 138/409/103 +f 139/416/104 140/415/104 138/414/104 137/413/104 +f 144/420/105 139/419/105 137/418/105 142/417/105 +f 143/424/106 144/423/106 142/422/106 141/421/106 +f 142/428/107 137/427/107 138/426/107 141/425/107 +f 143/432/108 140/431/108 139/430/108 144/429/108 +o cube +v -0.5625 2 0.125 +v -0.5625 2 0 +v -0.5625 1.9375 0.125 +v -0.5625 1.9375 0 +v -0.6875 2 0 +v -0.6875 2 0.125 +v -0.6875 1.9375 0 +v -0.6875 1.9375 0.125 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 148/436/109 151/435/109 149/434/109 146/433/109 +f 147/440/110 148/439/110 146/438/110 145/437/110 +f 152/444/111 147/443/111 145/442/111 150/441/111 +f 151/448/112 152/447/112 150/446/112 149/445/112 +f 150/452/113 145/451/113 146/450/113 149/449/113 +f 151/456/114 148/455/114 147/454/114 152/453/114 +o cube +v 0.6875 2 0.125 +v 0.6875 2 0 +v 0.6875 1.9375 0.125 +v 0.6875 1.9375 0 +v 0.5625 2 0 +v 0.5625 2 0.125 +v 0.5625 1.9375 0 +v 0.5625 1.9375 0.125 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 156/460/115 159/459/115 157/458/115 154/457/115 +f 155/464/116 156/463/116 154/462/116 153/461/116 +f 160/468/117 155/467/117 153/466/117 158/465/117 +f 159/472/118 160/471/118 158/470/118 157/469/118 +f 158/476/119 153/475/119 154/474/119 157/473/119 +f 159/480/120 156/479/120 155/478/120 160/477/120 +o cube +v 0.75 1.9375 0.1875 +v 0.75 1.9375 -0.0625 +v 0.75 1.5625 0.1875 +v 0.75 1.5625 -0.0625 +v 0.5 1.9375 -0.0625 +v 0.5 1.9375 0.1875 +v 0.5 1.5625 -0.0625 +v 0.5 1.5625 0.1875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 164/484/121 167/483/121 165/482/121 162/481/121 +f 163/488/122 164/487/122 162/486/122 161/485/122 +f 168/492/123 163/491/123 161/490/123 166/489/123 +f 167/496/124 168/495/124 166/494/124 165/493/124 +f 166/500/125 161/499/125 162/498/125 165/497/125 +f 167/504/126 164/503/126 163/502/126 168/501/126 +o cube +v -0.5 1.9375 0.1875 +v -0.5 1.9375 -0.0625 +v -0.5 1.5625 0.1875 +v -0.5 1.5625 -0.0625 +v -0.75 1.9375 -0.0625 +v -0.75 1.9375 0.1875 +v -0.75 1.5625 -0.0625 +v -0.75 1.5625 0.1875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.625 +vt 0 0.625 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 172/508/127 175/507/127 173/506/127 170/505/127 +f 171/512/128 172/511/128 170/510/128 169/509/128 +f 176/516/129 171/515/129 169/514/129 174/513/129 +f 175/520/130 176/519/130 174/518/130 173/517/130 +f 174/524/131 169/523/131 170/522/131 173/521/131 +f 175/528/132 172/527/132 171/526/132 176/525/132 +o cube +v -0.5 1.5 0.1875 +v -0.5 1.5 -0.0625 +v -0.5 1.25 0.1875 +v -0.5 1.25 -0.0625 +v -0.75 1.5 -0.0625 +v -0.75 1.5 0.1875 +v -0.75 1.25 -0.0625 +v -0.75 1.25 0.1875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 180/532/133 183/531/133 181/530/133 178/529/133 +f 179/536/134 180/535/134 178/534/134 177/533/134 +f 184/540/135 179/539/135 177/538/135 182/537/135 +f 183/544/136 184/543/136 182/542/136 181/541/136 +f 182/548/137 177/547/137 178/546/137 181/545/137 +f 183/552/138 180/551/138 179/550/138 184/549/138 +o cube +v 0.75 1.5 0.1875 +v 0.75 1.5 -0.0625 +v 0.75 1.25 0.1875 +v 0.75 1.25 -0.0625 +v 0.5 1.5 -0.0625 +v 0.5 1.5 0.1875 +v 0.5 1.25 -0.0625 +v 0.5 1.25 0.1875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vt 0 1 +vt 0.25 1 +vt 0.25 0.75 +vt 0 0.75 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 188/556/139 191/555/139 189/554/139 186/553/139 +f 187/560/140 188/559/140 186/558/140 185/557/140 +f 192/564/141 187/563/141 185/562/141 190/561/141 +f 191/568/142 192/567/142 190/566/142 189/565/142 +f 190/572/143 185/571/143 186/570/143 189/569/143 +f 191/576/144 188/575/144 187/574/144 192/573/144 +o cube +v 0.6875 1.5625 0.125 +v 0.6875 1.5625 0 +v 0.6875 1.5 0.125 +v 0.6875 1.5 0 +v 0.5625 1.5625 0 +v 0.5625 1.5625 0.125 +v 0.5625 1.5 0 +v 0.5625 1.5 0.125 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 196/580/145 199/579/145 197/578/145 194/577/145 +f 195/584/146 196/583/146 194/582/146 193/581/146 +f 200/588/147 195/587/147 193/586/147 198/585/147 +f 199/592/148 200/591/148 198/590/148 197/589/148 +f 198/596/149 193/595/149 194/594/149 197/593/149 +f 199/600/150 196/599/150 195/598/150 200/597/150 +o cube +v -0.5625 1.5625 0.125 +v -0.5625 1.5625 0 +v -0.5625 1.5 0.125 +v -0.5625 1.5 0 +v -0.6875 1.5625 0 +v -0.6875 1.5625 0.125 +v -0.6875 1.5 0 +v -0.6875 1.5 0.125 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 204/604/151 207/603/151 205/602/151 202/601/151 +f 203/608/152 204/607/152 202/606/152 201/605/152 +f 208/612/153 203/611/153 201/610/153 206/609/153 +f 207/616/154 208/615/154 206/614/154 205/613/154 +f 206/620/155 201/619/155 202/618/155 205/617/155 +f 207/624/156 204/623/156 203/622/156 208/621/156 +o cube +v 0.125 2.5 0.125 +v 0.125 2.5 0 +v 0.125 2.375 0.125 +v 0.125 2.375 0 +v -0.125 2.5 0 +v -0.125 2.5 0.125 +v -0.125 2.375 0 +v -0.125 2.375 0.125 +vt 0 1 +vt 0.25 1 +vt 0.25 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.875 +vt 0 0.875 +vt 0 1 +vt 0.25 1 +vt 0.25 0.875 +vt 0 0.875 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 212/628/157 215/627/157 213/626/157 210/625/157 +f 211/632/158 212/631/158 210/630/158 209/629/158 +f 216/636/159 211/635/159 209/634/159 214/633/159 +f 215/640/160 216/639/160 214/638/160 213/637/160 +f 214/644/161 209/643/161 210/642/161 213/641/161 +f 215/648/162 212/647/162 211/646/162 216/645/162 +o cube +v 0.3125 3.125 0.3125 +v 0.3125 3.125 -0.25 +v 0.3125 2.5 0.3125 +v 0.3125 2.5 -0.25 +v -0.3125 3.125 -0.25 +v -0.3125 3.125 0.3125 +v -0.3125 2.5 -0.25 +v -0.3125 2.5 0.3125 +vt 0 1 +vt 0.625 1 +vt 0.625 0.4375 +vt 0 0.4375 +vt 0 1 +vt 0.5625 1 +vt 0.5625 0.4375 +vt 0 0.4375 +vt 0 1 +vt 0.625 1 +vt 0.625 0.4375 +vt 0 0.4375 +vt 0.125 0.625 +vt 0.6875 0.625 +vt 0.6875 0.0625 +vt 0.125 0.0625 +vt 0 1 +vt 0.625 1 +vt 0.625 0.4375 +vt 0 0.4375 +vt 0.3125 1 +vt 0.9375 1 +vt 0.9375 0.4375 +vt 0.3125 0.4375 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 220/652/163 223/651/163 221/650/163 218/649/163 +f 219/656/164 220/655/164 218/654/164 217/653/164 +f 224/660/165 219/659/165 217/658/165 222/657/165 +f 223/664/166 224/663/166 222/662/166 221/661/166 +f 222/668/167 217/667/167 218/666/167 221/665/167 +f 223/672/168 220/671/168 219/670/168 224/669/168 +o cube +v 0.375 0.6875 0.125 +v 0.375 0.6875 0 +v 0.375 0.625 0.125 +v 0.375 0.625 0 +v 0.25 0.6875 0 +v 0.25 0.6875 0.125 +v 0.25 0.625 0 +v 0.25 0.625 0.125 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.9375 +vt 0 0.9375 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vt 0 1 +vt 0.125 1 +vt 0.125 0.875 +vt 0 0.875 +vn 0 0 -1 +vn 1 0 0 +vn 0 0 1 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +usemtl none +f 228/676/169 231/675/169 229/674/169 226/673/169 +f 227/680/170 228/679/170 226/678/170 225/677/170 +f 232/684/171 227/683/171 225/682/171 230/681/171 +f 231/688/172 232/687/172 230/686/172 229/685/172 +f 230/692/173 225/691/173 226/690/173 229/689/173 +f 231/696/174 228/695/174 227/694/174 232/693/174 \ No newline at end of file diff --git a/models/player.obj.import b/models/player.obj.import new file mode 100644 index 0000000..fb11937 --- /dev/null +++ b/models/player.obj.import @@ -0,0 +1,22 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://p2wom3t07fio" +path="res://.godot/imported/player.obj-2e9a6922de577ef9126cb60ee24cd899.mesh" + +[deps] + +files=["res://.godot/imported/player.obj-2e9a6922de577ef9126cb60ee24cd899.mesh"] + +source_file="res://models/player.obj" +dest_files=["res://.godot/imported/player.obj-2e9a6922de577ef9126cb60ee24cd899.mesh", "res://.godot/imported/player.obj-2e9a6922de577ef9126cb60ee24cd899.mesh"] + +[params] + +generate_tangents=true +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +optimize_mesh=true +force_disable_mesh_compression=false diff --git a/models/player.tscn b/models/player.tscn index 650b998..40a53a6 100644 --- a/models/player.tscn +++ b/models/player.tscn @@ -1,14 +1,16 @@ -[gd_scene load_steps=7 format=3 uid="uid://b2jhgtduapovl"] +[gd_scene load_steps=9 format=3 uid="uid://b2jhgtduapovl"] [ext_resource type="Script" path="res://scripts/Player.gd" id="1_o6o4b"] [ext_resource type="PackedScene" uid="uid://cnu1vf8k5i3tv" path="res://scenes/models/pistol.tscn" id="2_nxbij"] [ext_resource type="PackedScene" uid="uid://caos4gg5cd6f6" path="res://scenes/models/ak_47.tscn" id="3_r56e3"] -[ext_resource type="ArrayMesh" uid="uid://ctvjxmdm3qep1" path="res://models/model.obj" id="4_kc88k"] +[ext_resource type="ArrayMesh" uid="uid://p2wom3t07fio" path="res://models/player.obj" id="6_lfqxv"] +[ext_resource type="Material" uid="uid://btj7xxav4d6l0" path="res://textures/materials/orange.res" id="6_md2fv"] +[ext_resource type="Material" uid="uid://ojceh78w7jp0" path="res://textures/materials/black90%.res" id="7_2k5kn"] [sub_resource type="SphereMesh" id="SphereMesh_fp0bl"] [sub_resource type="BoxShape3D" id="BoxShape3D_gsdrn"] -size = Vector3(1.28345, 0.764107, 0.123107) +size = Vector3(1.44899, 0.8463, 0.132389) [node name="player" type="Node3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.10113, 0) @@ -19,50 +21,88 @@ script = ExtResource("1_o6o4b") [node name="Head" type="Node3D" parent="CharacterBody3D"] [node name="Camera" type="Camera3D" parent="CharacterBody3D/Head"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.675496, 0) -visible = false +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.898785, 0) +fov = 90.0 [node name="viewRaycast" type="RayCast3D" parent="CharacterBody3D/Head/Camera"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0123241, -0.315944) target_position = Vector3(0, 0, -100) [node name="Hand" type="Node3D" parent="CharacterBody3D/Head/Camera"] transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.72454, -0.463491, -0.808041) [node name="knife" type="MeshInstance3D" parent="CharacterBody3D/Head/Camera/Hand"] -transform = Transform3D(0.16, 0, 0, 0, 0.16, 0, 0, 0, 0.16, 0, 0, 0) -visible = false +transform = Transform3D(0.16, 0, 0, 0, 0.16, 0, 0, 0, 0.16, -0.158471, 0.140001, 0.229943) mesh = SubResource("SphereMesh_fp0bl") [node name="raycast" type="RayCast3D" parent="CharacterBody3D/Head/Camera/Hand/knife"] [node name="pistol" parent="CharacterBody3D/Head/Camera/Hand" instance=ExtResource("2_nxbij")] -transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 0, 0, 0) -visible = false +transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 2.38419e-07, -0.0344509, 0.118615) [node name="ak-47" parent="CharacterBody3D/Head/Camera/Hand" instance=ExtResource("3_r56e3")] -visible = false +transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -0.30437, -0.235472, 0.183832) [node name="Nickname" type="Label3D" parent="CharacterBody3D/Head"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.24983, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2111, 0.097512) billboard = 1 text = "Unnamed" -[node name="Collisionbody3d" type="CollisionShape3D" parent="CharacterBody3D"] -transform = Transform3D(0.593769, 0, 0, 0, 1.06879, 0, 0, 0, 1, 0.000362556, 0.18734, 0.0654087) +[node name="Player" type="MeshInstance3D" parent="CharacterBody3D/Head"] +transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, -0.00798726, -1.10113, 0.132147) +cast_shadow = 0 +mesh = ExtResource("6_lfqxv") +skeleton = NodePath("../../..") +surface_material_override/0 = ExtResource("6_md2fv") +surface_material_override/1 = ExtResource("6_md2fv") +surface_material_override/2 = ExtResource("7_2k5kn") +surface_material_override/3 = ExtResource("7_2k5kn") +surface_material_override/4 = ExtResource("6_md2fv") +surface_material_override/5 = ExtResource("6_md2fv") +surface_material_override/6 = ExtResource("7_2k5kn") +surface_material_override/7 = ExtResource("7_2k5kn") +surface_material_override/8 = ExtResource("6_md2fv") +surface_material_override/9 = ExtResource("6_md2fv") +surface_material_override/10 = ExtResource("6_md2fv") +surface_material_override/11 = ExtResource("7_2k5kn") +surface_material_override/12 = ExtResource("7_2k5kn") +surface_material_override/13 = ExtResource("6_md2fv") +surface_material_override/14 = ExtResource("7_2k5kn") +surface_material_override/15 = ExtResource("7_2k5kn") +surface_material_override/16 = ExtResource("6_md2fv") +surface_material_override/17 = ExtResource("6_md2fv") +surface_material_override/18 = ExtResource("7_2k5kn") +surface_material_override/19 = ExtResource("7_2k5kn") +surface_material_override/20 = ExtResource("6_md2fv") +surface_material_override/21 = ExtResource("6_md2fv") +surface_material_override/22 = ExtResource("6_md2fv") +surface_material_override/23 = ExtResource("6_md2fv") +surface_material_override/24 = ExtResource("7_2k5kn") +surface_material_override/25 = ExtResource("7_2k5kn") +surface_material_override/26 = ExtResource("7_2k5kn") +surface_material_override/27 = ExtResource("6_md2fv") +surface_material_override/28 = ExtResource("7_2k5kn") + +[node name="collisionhead" type="CollisionShape3D" parent="CharacterBody3D"] +transform = Transform3D(0.302512, 0, 0, 0, 0.511135, 0, 0, 0, 3.00211, -0.00773959, 0.868869, 0.153421) shape = SubResource("BoxShape3D_gsdrn") -[node name="Collisionlefsleg3d" type="CollisionShape3D" parent="CharacterBody3D"] -transform = Transform3D(0.105175, 0, 0, 0, 1.02835, 0, 0, 0, 1, 0.1883, -0.615178, 0.0654087) +[node name="collisionbody" type="CollisionShape3D" parent="CharacterBody3D"] +transform = Transform3D(0.416155, 0, 0, 0, 1.02805, 0, 0, 0, 1.32184, -0.0077214, 0.12071, 0.172368) shape = SubResource("BoxShape3D_gsdrn") -[node name="collisionlegs3d" type="CollisionShape3D" parent="CharacterBody3D"] -transform = Transform3D(0.105175, 0, 0, 0, 1.06879, 0, 0, 0, 1, -0.189172, -0.632077, 0.0654087) +[node name="collisionlefthand" type="CollisionShape3D" parent="CharacterBody3D"] +transform = Transform3D(0.121545, 0, 0, 0, 0.927443, 0, 0, 0, 1.32184, 0.428738, 0.168562, 0.172368) shape = SubResource("BoxShape3D_gsdrn") -[node name="collisionhead3d" type="CollisionShape3D" parent="CharacterBody3D"] -transform = Transform3D(0.293794, 0, 0, 0, 0.494858, 0, 0, 0, 3.00211, 0.000588377, 0.777139, 0.0603607) +[node name="collisionrighthand" type="CollisionShape3D" parent="CharacterBody3D"] +transform = Transform3D(0.121545, 0, 0, 0, 0.927443, 0, 0, 0, 1.32184, -0.443319, 0.168562, 0.172368) shape = SubResource("BoxShape3D_gsdrn") -[node name="MeshInstance3D" type="MeshInstance3D" parent="CharacterBody3D"] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, -0.972941, 0) -mesh = ExtResource("4_kc88k") +[node name="collisionrightleg" type="CollisionShape3D" parent="CharacterBody3D"] +transform = Transform3D(0.121545, 0, 0, 0, 0.927443, 0, 0, 0, 1.32184, -0.227494, -0.708139, 0.172368) +shape = SubResource("BoxShape3D_gsdrn") + +[node name="collisionleftleg" type="CollisionShape3D" parent="CharacterBody3D"] +transform = Transform3D(0.121545, 0, 0, 0, 0.927443, 0, 0, 0, 1.32184, 0.212081, -0.708139, 0.172368) +shape = SubResource("BoxShape3D_gsdrn") diff --git a/scenes/HUD/choose_team.tscn b/scenes/HUD/choose_team.tscn index dc62e0c..00be324 100644 --- a/scenes/HUD/choose_team.tscn +++ b/scenes/HUD/choose_team.tscn @@ -13,6 +13,7 @@ grow_horizontal = 2 grow_vertical = 2 [node name="Choose_team" type="Control" parent="."] +visible = false layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 @@ -113,9 +114,9 @@ script = ExtResource("1_nua8c") visible = false layout_mode = 1 anchors_preset = 0 -offset_left = -520.0 +offset_left = -41.0 offset_top = -139.0 -offset_right = -520.0 +offset_right = -41.0 offset_bottom = -139.0 [node name="Class 1" type="Control" parent="Choose_class_OS"] @@ -225,9 +226,9 @@ anchors_preset = 14 anchor_top = 0.5 anchor_right = 1.0 anchor_bottom = 0.5 -offset_left = -520.0 +offset_left = -41.0 offset_top = -139.0 -offset_right = -520.0 +offset_right = -41.0 offset_bottom = -139.0 grow_horizontal = 2 grow_vertical = 2 diff --git a/scenes/HUD/hud.tscn b/scenes/HUD/hud.tscn index ccba594..713686b 100644 --- a/scenes/HUD/hud.tscn +++ b/scenes/HUD/hud.tscn @@ -1 +1,96 @@ -[gd_scene load_steps=7 format=3 uid="uid://gxfhitfre2fj"] [ext_resource type="Texture2D" uid="uid://vnk3r1p4ao3n" path="res://textures/prototype-textures/Prototype_symbol_cross_32x32px.png" id="1_g1v70"] [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_mhtpk"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_oe47i"] bg_color = Color(0, 0, 0, 1) [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_tw7o5"] bg_color = Color(0.882353, 0, 0.0627451, 1) [sub_resource type="Theme" id="Theme_xwpjm"] [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_mkhl7"] texture = ExtResource("1_g1v70") [node name="HUD" type="Control"] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 metadata/_edit_use_anchors_ = true [node name="HealthBar" type="ProgressBar" parent="."] material = SubResource("CanvasItemMaterial_mhtpk") layout_mode = 1 anchors_preset = 2 anchor_top = 1.0 anchor_bottom = 1.0 offset_top = -27.0 offset_right = 246.544 grow_vertical = 0 theme_override_styles/background = SubResource("StyleBoxFlat_oe47i") theme_override_styles/fill = SubResource("StyleBoxFlat_tw7o5") value = 50.0 [node name="Control" type="Control" parent="."] z_index = -10 layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 [node name="Panel" type="Panel" parent="Control"] layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 offset_left = -6.0 offset_top = -6.0 offset_right = 6.0 offset_bottom = 6.0 grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 theme = SubResource("Theme_xwpjm") theme_override_styles/panel = SubResource("StyleBoxTexture_mkhl7") [node name="AmmoDisplay" type="Control" parent="."] anchors_preset = 0 offset_right = 40.0 offset_bottom = 40.0 [node name="Ammo" type="Label" parent="AmmoDisplay"] layout_mode = 0 offset_right = 40.0 offset_bottom = 23.0 text = "Ammo: " [node name="Magazine" type="Label" parent="AmmoDisplay"] layout_mode = 0 offset_top = 23.0 offset_right = 40.0 offset_bottom = 46.0 text = "Magazine:" [node name="Status" type="Label" parent="."] layout_mode = 1 anchors_preset = 3 anchor_left = 1.0 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 offset_left = -40.0 offset_top = -23.0 grow_horizontal = 0 grow_vertical = 0 \ No newline at end of file +[gd_scene load_steps=7 format=3 uid="uid://gxfhitfre2fj"] + +[ext_resource type="Texture2D" uid="uid://vnk3r1p4ao3n" path="res://textures/prototype-textures/Prototype_symbol_cross_32x32px.png" id="1_g1v70"] + +[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_mhtpk"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_oe47i"] +bg_color = Color(0, 0, 0, 1) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_tw7o5"] +bg_color = Color(0.882353, 0, 0.0627451, 1) + +[sub_resource type="Theme" id="Theme_xwpjm"] + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_mkhl7"] +texture = ExtResource("1_g1v70") + +[node name="HUD" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +metadata/_edit_use_anchors_ = true + +[node name="HealthBar" type="ProgressBar" parent="."] +material = SubResource("CanvasItemMaterial_mhtpk") +layout_mode = 1 +anchors_preset = 2 +anchor_top = 1.0 +anchor_bottom = 1.0 +offset_top = -27.0 +offset_right = 246.544 +grow_vertical = 0 +theme_override_styles/background = SubResource("StyleBoxFlat_oe47i") +theme_override_styles/fill = SubResource("StyleBoxFlat_tw7o5") +value = 50.0 + +[node name="Control" type="Control" parent="."] +z_index = -10 +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 + +[node name="Panel" type="Panel" parent="Control"] +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -6.0 +offset_top = -6.0 +offset_right = 6.0 +offset_bottom = 6.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +theme = SubResource("Theme_xwpjm") +theme_override_styles/panel = SubResource("StyleBoxTexture_mkhl7") + +[node name="AmmoDisplay" type="Control" parent="."] +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 + +[node name="Ammo" type="Label" parent="AmmoDisplay"] +layout_mode = 0 +offset_right = 40.0 +offset_bottom = 23.0 +text = "Ammo: " + +[node name="Magazine" type="Label" parent="AmmoDisplay"] +layout_mode = 0 +offset_top = 23.0 +offset_right = 40.0 +offset_bottom = 46.0 +text = "Magazine:" + +[node name="Status" type="Label" parent="."] +layout_mode = 1 +anchors_preset = 3 +anchor_left = 1.0 +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = -40.0 +offset_top = -23.0 +grow_horizontal = 0 +grow_vertical = 0 diff --git a/scenes/HUD/menu.tscn b/scenes/HUD/menu.tscn index 47706e4..2443936 100644 --- a/scenes/HUD/menu.tscn +++ b/scenes/HUD/menu.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://scripts/ConnectButton.gd" id="1_nhpm2"] [ext_resource type="Script" path="res://scripts/Nickname.gd" id="2_5xejq"] -[ext_resource type="Texture2D" uid="uid://c4pah1vj0aa4x" path="res://textures/prototype-textures/Prototype_symbol_cross_32x32px.png" id="2_mk5ih"] +[ext_resource type="Texture2D" uid="uid://vnk3r1p4ao3n" path="res://textures/prototype-textures/Prototype_symbol_cross_32x32px.png" id="2_mk5ih"] [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_eqsfo"] texture = ExtResource("2_mk5ih") @@ -31,11 +31,58 @@ anchors_preset = 12 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -offset_top = -39.4052 -offset_bottom = 0.594849 +offset_top = -28.0 +offset_bottom = 2.0 grow_horizontal = 2 grow_vertical = 0 +[node name="buttons" type="Control" parent="ColorRect"] +layout_mode = 1 +anchors_preset = 2 +anchor_top = 1.0 +anchor_bottom = 1.0 +offset_top = -40.0 +offset_right = 40.0 +grow_vertical = 0 + +[node name="Button_quit" type="Button" parent="ColorRect/buttons"] +layout_mode = 1 +anchors_preset = 2 +anchor_top = 1.0 +anchor_bottom = 1.0 +offset_top = -28.4312 +offset_right = 30.0 +offset_bottom = 1.56878 +grow_vertical = 0 +theme_override_font_sizes/font_size = 12 +text = "off" + +[node name="Button_serverlist" type="Button" parent="ColorRect/buttons"] +layout_mode = 1 +anchors_preset = 2 +anchor_top = 1.0 +anchor_bottom = 1.0 +offset_left = 30.0 +offset_top = -28.4312 +offset_right = 63.0 +offset_bottom = 1.56878 +grow_vertical = 0 +theme_override_font_sizes/font_size = 12 +text = "web" + +[node name="Button_settings" type="Button" parent="ColorRect/buttons"] +layout_mode = 1 +anchors_preset = 2 +anchor_top = 1.0 +anchor_bottom = 1.0 +offset_left = 63.0 +offset_top = -28.4312 +offset_right = 96.0 +offset_bottom = 1.56878 +grow_vertical = 0 +theme_override_font_sizes/font_size = 12 +text = "settings" + [node name="ConnectMenu" type="Control" parent="."] layout_mode = 1 anchors_preset = 8 @@ -90,7 +137,7 @@ anchor_right = 0.5 anchor_bottom = 0.5 offset_left = -123.0 offset_top = -100.0 -offset_right = -73.0 +offset_right = -82.0 offset_bottom = -75.0 grow_horizontal = 2 grow_vertical = 2 @@ -101,10 +148,11 @@ text = "https://" [node name="IP" type="TextEdit" parent="ConnectMenu"] layout_mode = 2 -offset_left = 15.0 +offset_left = 2.0 offset_top = -28.0 -offset_right = 95.0 +offset_right = 77.0 offset_bottom = -3.0 +pivot_offset = Vector2(1, 0) theme_override_colors/background_color = Color(0.231373, 0.231373, 0.231373, 1) theme_override_colors/font_selected_color = Color(0, 0, 0, 1) theme_override_font_sizes/font_size = 9 diff --git a/textures/materials/black90%.res b/textures/materials/black90%.res new file mode 100644 index 0000000000000000000000000000000000000000..d4ad3e79a6070bd6a500322bb84bb1e5ff6aaa51 GIT binary patch literal 1016 zcmV0BZnm0FI()T38b@ z>sS6YL(tPPuQKgAC{s6=I5#mf0~SG?j%qRb+ghmZpJX$`u*j>ox;oFq8I}!l0!vP` zuKyNM?KhwzP7_G7IW=kUauZw-9M?gq zR<5hm|8pryXLvZC5!`z?85;{5#m}U%;1Rl#j~vC<`+)?<@v9; zvl3@%@|+9fpVCz#*n_+1s7_@j2@0EJ%#1;U#z(0rc%9J-8%VEWAfnp8moj2JHge2G ztly|N>WgS02p&R+2*Djlm~mLKg2jb#vLHVU7&e$$1v3NiN*xt=@K`mHb>Hb+82vUM zRkt)HR4($`=+my&YA(`ubnvXLa)ho+`KZE9H+YctMP+V0aO`AP6NIWE4e68*O_YwQ z((_jphr{7;V5IeiC`V?UBV&NxsIjF{Xog6V6cnV;0YCym6f2^765w+=N0SaAhG<4& zPHHs=t01|H$@1B{P;$plG9FEC(@7F%NyW-!Zm#_g#Rkm&Ys9@x;`abou^0vdTap*4 zS)!12?!xsao7XrN@E(e{I4X6af{nUnRx-a#sOx+*IY~H0yaMe6Dq>1!WMYvK=hJfoYNo_T zn`(~{xn$x=O3stdQ`v@q!aJh7Eu)$|s~l{&KK3jepu5t)9mHmXk>l|U-<2*QhUXH` znwYd6_+P745-{YoseH8rE}Y>#jtKqQeJ$t(Mr!NG%l#Gb=8Oz+|8hAo zhV?u8!fsw$`8j$aVhP0Rxd6>iZC!1c7{cJ4W}P!8akLW?b&*)eaVrWIzhP9ivj|Hs z!JxnMRNk;bS?&9cL{crYDH!5QUTQM+geTT^ov m^j=f<6}cjLI6GuYI8glfe+XU`Mm>*`3Ur#GhHe;AQ$s^BqSPV) literal 0 HcmV?d00001 diff --git a/textures/materials/orange.res b/textures/materials/orange.res new file mode 100644 index 0000000000000000000000000000000000000000..a13118514e06aa95ccdd4da5d89774a36eb43241 GIT binary patch literal 1023 zcmVYvZH0j5MD5i-z1#SRs0B!)enq^VM zup)%4U-{P@K}QF9m1ws)i8>wPT*b@|*yM0Js>SGUW(jO9RQHl(GrO?KtGBv3PsA9O z30Z+9=ULZ(i>LSUc+)H0%p{muYhbaFA_GGU0Tx2TqIy1xK#qviqZOt|?{Z+G+P{}F zUOe`3%ss51)RX#RAV!cF!5>VRc~GHZ#Rml^P#7>s!(l_Zjg1awR>8~wyiz{}BzUYE z$-3WkGK_wk5>>YpAzW_qnpD!R)@tt2cXaTqt+Ir!Ln+aPn@)IEvxE|16K@wh*)aMRC%MRX}gFVcn%;X)8WBG(BiScJF2^#QA?hUdSXC&Yb>gvQR*KEQm*0kyl+PC z3QLH}b17LXCavNBhg<~(21aXDubw~%XOur1p-;QJ1);!r+8Y0uKVaQl&#(ZxOb!9w zkpy_7{V{!;M$XnEaV*R&Nm@Mukk_fz)sTr77|7EsJc0KBRAQ1UKI?WIr*QOt zMCqMhSU+<@`yo$h!wC3b`0RLkB-bupV?JC@!7*m6Aiy2d9U?LAcd|TiLfiy=0~V(X z;_%{$mv+Z2@{-#GOo%SKgfAtcYP=$n#WNKJlv4tH3&7f*M8lIb*t6p~qWvxwI@|g; tySdsb