cleanups and refactors

This commit is contained in:
2024-04-01 00:33:38 +02:00
parent ec6facd4fc
commit 53243b368d
58 changed files with 581 additions and 539 deletions
+13
View File
@@ -0,0 +1,13 @@
extends Control
func _ready():
$".."/AnimationPlayer.play("new_animation")
func _on_server_pressed():
Globals.is_server = true
get_tree().change_scene_to_file("res://levels/TestLevel.tscn")
func _on_client_pressed():
Globals.is_server = false
Globals.server_ip = get_node("MarginContainer/ServerIp").text
get_tree().change_scene_to_file("res://levels/TestLevel.tscn")
+48
View File
@@ -0,0 +1,48 @@
[gd_scene load_steps=2 format=3 uid="uid://1t0g0w550twn"]
[ext_resource type="Script" path="res://assets/MainMenu.gd" id="1_ulhxw"]
[node name="Control" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_ulhxw")
[node name="VFlowContainer" type="VFlowContainer" parent="."]
layout_mode = 0
anchor_left = 0.5
anchor_right = 0.5
anchor_bottom = 1.0
offset_left = -29.0
offset_top = 216.0
offset_right = 29.0
grow_horizontal = 2
grow_vertical = 2
[node name="Button" type="Button" parent="VFlowContainer"]
layout_mode = 2
text = "Server"
[node name="Button2" type="Button" parent="VFlowContainer"]
layout_mode = 2
text = "Client"
[node name="MarginContainer" type="MarginContainer" parent="."]
layout_mode = 0
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_top = -31.0
grow_horizontal = 2
grow_vertical = 0
[node name="ServerIp" type="LineEdit" parent="MarginContainer"]
layout_mode = 2
text = "localhost"
placeholder_text = "server ip"
[connection signal="pressed" from="VFlowContainer/Button" to="." method="_on_server_pressed"]
[connection signal="pressed" from="VFlowContainer/Button2" to="." method="_on_client_pressed"]
+31
View File
@@ -0,0 +1,31 @@
[gd_resource type="Environment" load_steps=3 format=3 uid="uid://olhmjdg33u2i"]
[sub_resource type="Gradient" id="Gradient_i4ik8"]
offsets = PackedFloat32Array(0, 0.0121212, 1)
colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1, 0.18639, 0.890909, 0, 1)
[sub_resource type="GradientTexture1D" id="GradientTexture1D_7n01c"]
gradient = SubResource("Gradient_i4ik8")
[resource]
background_color = Color(0, 0.0627451, 0, 1)
reflected_light_source = 1
tonemap_mode = 1
glow_levels/1 = 1.0
glow_levels/2 = 1.0
glow_levels/4 = 1.0
glow_intensity = 2.0
fog_enabled = true
fog_light_energy = 0.0
fog_density = 0.0455
fog_sky_affect = 0.0
fog_height = 2.5
fog_height_density = 1.7731
volumetric_fog_emission_energy = 0.1
volumetric_fog_length = 32.0
volumetric_fog_detail_spread = 1.36604
volumetric_fog_sky_affect = 0.0
adjustment_enabled = true
adjustment_brightness = 4.46
adjustment_contrast = 0.77
adjustment_color_correction = SubResource("GradientTexture1D_7n01c")
+13
View File
@@ -0,0 +1,13 @@
[gd_resource type="Environment" load_steps=4 format=3 uid="uid://5s8lkk12bxyx"]
[ext_resource type="Texture2D" uid="uid://ch78sj451brhm" path="res://assets/sky.hdr" id="1_vpldf"]
[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_xd32k"]
panorama = ExtResource("1_vpldf")
[sub_resource type="Sky" id="Sky_dv5ea"]
sky_material = SubResource("PanoramaSkyMaterial_xd32k")
[resource]
background_mode = 2
sky = SubResource("Sky_dv5ea")
Binary file not shown.
+159
View File
@@ -0,0 +1,159 @@
{
"asset": {
"generator": "Khronos glTF Blender I/O v3.5.30",
"version": "2.0"
},
"scene": 0,
"scenes": [
{
"name": "Scene",
"nodes": [
0
]
}
],
"nodes": [
{
"mesh": 0,
"name": "concrete_cat_statue"
}
],
"materials": [
{
"doubleSided": true,
"name": "concrete_cat_statue",
"normalTexture": {
"index": 0
},
"pbrMetallicRoughness": {
"baseColorTexture": {
"index": 1
},
"metallicRoughnessTexture": {
"index": 2
}
}
}
],
"meshes": [
{
"name": "Retopo_Node 300000_008.002",
"primitives": [
{
"attributes": {
"POSITION": 0,
"TEXCOORD_0": 1,
"NORMAL": 2
},
"indices": 3,
"material": 0
}
]
}
],
"textures": [
{
"sampler": 0,
"source": 0
},
{
"sampler": 0,
"source": 1
},
{
"sampler": 0,
"source": 2
}
],
"images": [
{
"mimeType": "image/jpeg",
"name": "concrete_cat_statue_nor_gl",
"uri": "textures/concrete_cat_statue_nor_gl_2k.jpg"
},
{
"mimeType": "image/jpeg",
"name": "concrete_cat_statue_diff",
"uri": "textures/concrete_cat_statue_diff_2k.jpg"
},
{
"mimeType": "image/jpeg",
"name": "concrete_cat_statue_metal-concrete_cat_statue_rough",
"uri": "textures/concrete_cat_statue_arm_2k.jpg"
}
],
"accessors": [
{
"bufferView": 0,
"componentType": 5126,
"count": 6863,
"max": [
0.07482201606035233,
0.28300967812538147,
0.10024762153625488
],
"min": [
-0.07814981788396835,
1.1276967626372425e-7,
-0.1497523933649063
],
"type": "VEC3"
},
{
"bufferView": 1,
"componentType": 5126,
"count": 6863,
"type": "VEC2"
},
{
"bufferView": 2,
"componentType": 5126,
"count": 6863,
"type": "VEC3"
},
{
"bufferView": 3,
"componentType": 5123,
"count": 35850,
"type": "SCALAR"
}
],
"bufferViews": [
{
"buffer": 0,
"byteLength": 82356,
"byteOffset": 0,
"target": 34962
},
{
"buffer": 0,
"byteLength": 54904,
"byteOffset": 82356,
"target": 34962
},
{
"buffer": 0,
"byteLength": 82356,
"byteOffset": 137260,
"target": 34962
},
{
"buffer": 0,
"byteLength": 71700,
"byteOffset": 219616,
"target": 34963
}
],
"samplers": [
{
"magFilter": 9729,
"minFilter": 9987
}
],
"buffers": [
{
"byteLength": 291316,
"uri": "concrete_cat_statue.bin"
}
]
}
@@ -0,0 +1,34 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://crsl404uqjgg6"
path="res://.godot/imported/concrete_cat_statue_2k.gltf-1ca883f48fe87eb349f6c5b348c05f3d.scn"
[deps]
source_file="res://assets/kitty/concrete_cat_statue_2k.gltf"
dest_files=["res://.godot/imported/concrete_cat_statue_2k.gltf-1ca883f48fe87eb349f6c5b348c05f3d.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 636 KiB

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://o5rbf3e0m102"
path="res://.godot/imported/concrete_cat_statue_ao_2k.jpg-a1a1522f4f9f8046b08077e131042b4c.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/kitty/textures/concrete_cat_statue_ao_2k.jpg"
dest_files=["res://.godot/imported/concrete_cat_statue_ao_2k.jpg-a1a1522f4f9f8046b08077e131042b4c.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 MiB

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d3uv7dxv25gto"
path.s3tc="res://.godot/imported/concrete_cat_statue_arm_2k.jpg-6d03f7cc2b45dfbe854cc04eb455b334.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://assets/kitty/textures/concrete_cat_statue_arm_2k.jpg"
dest_files=["res://.godot/imported/concrete_cat_statue_arm_2k.jpg-6d03f7cc2b45dfbe854cc04eb455b334.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 MiB

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dyg6rondx7a6r"
path.s3tc="res://.godot/imported/concrete_cat_statue_diff_2k.jpg-b732faba558458e62244e8474f3bf428.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://assets/kitty/textures/concrete_cat_statue_diff_2k.jpg"
dest_files=["res://.godot/imported/concrete_cat_statue_diff_2k.jpg-b732faba558458e62244e8474f3bf428.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
Binary file not shown.

After

Width:  |  Height:  |  Size: 426 KiB

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://deodaqhiffruy"
path="res://.godot/imported/concrete_cat_statue_disp_2k.jpg-3e3d4bed393817c75176d24d4e3c2b0f.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/kitty/textures/concrete_cat_statue_disp_2k.jpg"
dest_files=["res://.godot/imported/concrete_cat_statue_disp_2k.jpg-3e3d4bed393817c75176d24d4e3c2b0f.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 MiB

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dnntdyptfujim"
path="res://.godot/imported/concrete_cat_statue_disp_2k.png-966f1d44fa651cbe84b3487cb16b0d71.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/kitty/textures/concrete_cat_statue_disp_2k.png"
dest_files=["res://.godot/imported/concrete_cat_statue_disp_2k.png-966f1d44fa651cbe84b3487cb16b0d71.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cuwkfk24p5j70"
path="res://.godot/imported/concrete_cat_statue_metal_2k.png-3f9f67c748a1fcf310cb7439c285b500.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/kitty/textures/concrete_cat_statue_metal_2k.png"
dest_files=["res://.godot/imported/concrete_cat_statue_metal_2k.png-3f9f67c748a1fcf310cb7439c285b500.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 MiB

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://djhfeovq42snt"
path.s3tc="res://.godot/imported/concrete_cat_statue_nor_gl_2k.jpg-dc1728567ea9b2d237a52006ab6beaec.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://assets/kitty/textures/concrete_cat_statue_nor_gl_2k.jpg"
dest_files=["res://.godot/imported/concrete_cat_statue_nor_gl_2k.jpg-dc1728567ea9b2d237a52006ab6beaec.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=1
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal="res://assets/kitty/textures/concrete_cat_statue_nor_gl_2k.jpg"
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 MiB

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ebe3ogmfblyl"
path="res://.godot/imported/concrete_cat_statue_rough_2k.jpg-00c831b4c989f3db24e283a261053b3a.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/kitty/textures/concrete_cat_statue_rough_2k.jpg"
dest_files=["res://.godot/imported/concrete_cat_statue_rough_2k.jpg-00c831b4c989f3db24e283a261053b3a.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
BIN
View File
Binary file not shown.
+35
View File
@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ch78sj451brhm"
path.bptc="res://.godot/imported/sky.hdr-58b613cd1aeba3f6b838d7e6edc4a86f.bptc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://assets/sky.hdr"
dest_files=["res://.godot/imported/sky.hdr-58b613cd1aeba3f6b838d7e6edc4a86f.bptc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0