cs-os
/
cs-os
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Update UI & Player Model + Add new materials

This commit is contained in:
dise 2024-02-28 21:28:13 +03:00
parent 6b131e7ee2
commit 7b568eb8a9
8 changed files with 1576 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1337
models/player.obj Normal file
View File

File diff suppressed because it is too large Load Diff

22
models/player.obj.import Normal file
View File

@ -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

84
models/player.tscn
View File

@ -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")

9
scenes/HUD/choose_team.tscn
View File

@ -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

97
scenes/HUD/hud.tscn
View File

@ -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
[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

60
scenes/HUD/menu.tscn
View File

@ -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

BIN
textures/materials/black90%.res Normal file
View File

Binary file not shown.

BIN
textures/materials/orange.res Normal file
View File

Binary file not shown.