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
+2
View File
@@ -0,0 +1,2 @@
# Godot 4+ specific ignores
.godot/
-16
View File
@@ -1,16 +0,0 @@
extends TextureRect
# Called when the node enters the scene tree for the first time.
func _ready():
await texture.changed
var image = texture.get_image()
print(image.detect_alpha())
image.fill(Color(1, 0, 1, 0.5))
print(image.detect_alpha())
print(image.get_format())
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta):
texture.noise_offset.x += 25*delta
texture.noise_offset.y -= 5*delta
pass
-11
View File
@@ -1,11 +0,0 @@
extends Control
func _on_button_pressed():
Globals.is_server = true
get_tree().change_scene_to_file("res://node_3d.tscn")
func _on_button_2_pressed():
Globals.is_server = false
Globals.server_ip = get_node("MarginContainer/ServerIp").text
get_tree().change_scene_to_file("res://node_3d.tscn")
-48
View File
@@ -1,48 +0,0 @@
extends Node
const PlayerScene = preload("res://Player.tscn")
var rng = RandomNumberGenerator.new()
func _ready():
$MultiplayerSpawner.add_spawnable_scene("res://Player.tscn")
print($MultiplayerSpawner.get_spawnable_scene(0))
# Start the server if Godot is passed the "--server" argument,
# and start a client otherwise.
if Globals.is_server:
start_network(true)
else:
start_network(false)
func start_network(server: bool):
var peer = ENetMultiplayerPeer.new()
if server:
multiplayer.peer_connected.connect(self.create_player)
multiplayer.peer_disconnected.connect(self.destroy_player)
peer.create_server(4242)
print('server listening on localhost 4242')
else:
multiplayer.connected_to_server.connect(self.connected_to_server)
peer.create_client(Globals.server_ip, 4242)
multiplayer.set_multiplayer_peer(peer)
func create_player(id):
#pass
# Instantiate a new player for this client.
var p = PlayerScene.instantiate()
#var p = Node3D.new()
# Set the name, so players can figure out their local authority
p.name = str(1)
print(str(id) + ' just connected')
$NetworkedNodes.add_child(p)
func destroy_player(id):
pass
# Delete this peer's node.
#$NetworkedNodes.get_node(str(id)).queue_free()
func connected_to_server():
$Pole/Camera3D.queue_free()
+49
View File
@@ -0,0 +1,49 @@
[gd_scene load_steps=6 format=3 uid="uid://c6w1inomsy6fp"]
[ext_resource type="PackedScene" uid="uid://1t0g0w550twn" path="res://assets/MainMenu.tscn" id="1_iaw56"]
[ext_resource type="Environment" uid="uid://5s8lkk12bxyx" path="res://assets/default_environment.tres" id="2_stw21"]
[ext_resource type="PackedScene" uid="uid://crsl404uqjgg6" path="res://assets/kitty/concrete_cat_statue_2k.gltf" id="3_76y63"]
[sub_resource type="Animation" id="Animation_gojcw"]
resource_name = "new_animation"
length = 30.0
tracks/0/type = "position_3d"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath(".")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = PackedFloat32Array(0, 1, 0.454, 1.517, -2.572, 1.5, 1, 0.454, 1.97523, 0.966014, 4.1, 1, 0.454, 3.2871, 2.84737, 7, 1, 1.92063, 3.43251, -0.523631, 8.3, 1, 2.35502, 3.52832, -2.74459, 10.2, 1, 2.68438, 3.61438, -4.73982, 12.1, 1, -0.0351753, 2.63149, -7.11426, 13.8, 1, -2.18601, 1.36965, -7.92156, 15.5, 1, -2.94256, 1.67447, -7.82756, 17.4, 1, -1.44099, 3.73792, -4.08864, 20, 1, -3.30595, 4.72699, -0.869471, 30, 1, -0.569977, 4.72699, 5.4241)
tracks/1/type = "rotation_3d"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath(".")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = PackedFloat32Array(0, 1, 0, 0, 0, 1, 1.5, 1, 0.0793464, 0, 0, 0.996847, 4.1, 1, 0.159502, 0, 0, 0.987198, 7, 1, 0.0211018, -0.203535, -0.00438783, 0.978831, 8.4, 1, 0.0215521, -0.00968415, -0.00020877, 0.999721, 10.2, 1, 0.0195802, 0.417873, 0.00900857, 0.90825, 12, 1, -0.294469, 0.389197, 0.152396, 0.859412, 13.8, 1, -0.294918, 0.950294, -0.0275901, -0.0959363, 15.5, 1, -0.178057, 0.983183, -0.0161448, 0.0372412, 17.4, 1, -0.138516, 0.933496, -0.294042, -0.151455, 20, 1, -0.121745, -0.52284, 0.301373, 0.78803, 30, 1, 0, 0, 0, 1)
[sub_resource type="AnimationLibrary" id="AnimationLibrary_53h31"]
_data = {
"new_animation": SubResource("Animation_gojcw")
}
[node name="Intro" type="Node3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.24287)
[node name="Control" parent="." instance=ExtResource("1_iaw56")]
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
root_node = NodePath("../Camera3D")
libraries = {
"": SubResource("AnimationLibrary_53h31")
}
speed_scale = 0.1
[node name="Camera3D" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.569977, 4.72699, 5.4241)
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = ExtResource("2_stw21")
[node name="concrete_cat_statue_2k" parent="." instance=ExtResource("3_76y63")]
transform = Transform3D(25, 0, 0, 0, 25, 0, 0, 0, 25, 0.00769079, 0, -3.86678)
-14
View File
@@ -1,14 +0,0 @@
extends TextureRect
# Called when the node enters the scene tree for the first time.
func _ready():
pass
#var texture = NoiseTexture.new()
#texture.noise = OpenSimplexNoise.new()
#await texture.changed
#var image = texture.get_image()
#var data = image.get_data()
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta):
pass
-63
View File
@@ -1,63 +0,0 @@
extends CharacterBody3D
const SPEED = 5.0
const JUMP_VELOCITY = 4.5
var synced_position := Vector3.ZERO
var synced_rotation := Vector3.ZERO
# Get the gravity from the project settings to be synced with RigidDynamicBody nodes.
var gravity = ProjectSettings.get_setting("physics/3d/default_gravity")
var has_control = false
func _ready():
has_control = name == str(multiplayer.get_unique_id())
print( 'I am ' + str(multiplayer.get_unique_id()))
print( 'or ' + str(multiplayer.get_remote_sender_id()))
has_control = !Globals.is_server
if Globals.is_server == false && has_control:
print ( 'Taking control!')
get_node("Camera3D").current = true
func _physics_process(delta):
if not has_control:
position = synced_position
rotation = synced_rotation
return
# Add the gravity.
if not is_on_floor():
velocity.y -= gravity * delta
# Handle Jump.
if Input.is_action_just_pressed("ui_accept") and is_on_floor():
velocity.y = JUMP_VELOCITY
# Get the input direction and handle the movement/deceleration.
# As good practice, you should replace UI actions with custom gameplay actions.
var input_dir = Input.get_vector("strafe_left", "strafe_right", "move_forward", "move_backward")
var direction = (transform.basis * Vector3(input_dir.x, 0, input_dir.y)).normalized()
if direction:
velocity.x = direction.x * SPEED
velocity.z = direction.z * SPEED
else:
velocity.x = move_toward(velocity.x, 0, SPEED)
velocity.z = move_toward(velocity.z, 0, SPEED)
move_and_slide()
if Input.is_action_pressed("look_left"):
rotation.y += 0.02
if Input.is_action_pressed("look_right"):
rotation.y -= 0.02
rpc_id(1, StringName('update_server'), position, rotation)
#update_server(position, rotation).rpc()
@rpc("any_peer", "call_remote", "unreliable_ordered")
func update_server(pos: Vector3, rot: Vector3):
if not multiplayer.is_server():
return
#if name != str(multiplayer.get_remote_sender_id()):
##print ("foei?")
#return
synced_position = pos
synced_rotation = rot
BIN
View File
Binary file not shown.
-22
View File
@@ -1,22 +0,0 @@
[remap]
importer="wav"
type="AudioStreamSample"
uid="uid://dg48i2jldqlsj"
path="res://.godot/imported/ambient.wav-2018c2193d0c6844e65bf0e62b17abbe.sample"
[deps]
source_file="res://ambient.wav"
dest_files=["res://.godot/imported/ambient.wav-2018c2193d0c6844e65bf0e62b17abbe.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop=false
compress/mode=0
+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")
+4 -4
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://1t0g0w550twn"]
[ext_resource type="Script" path="res://Control.gd" id="1_yrh3j"]
[ext_resource type="Script" path="res://assets/MainMenu.gd" id="1_ulhxw"]
[node name="Control" type="Control"]
layout_mode = 3
@@ -9,7 +9,7 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_yrh3j")
script = ExtResource("1_ulhxw")
[node name="VFlowContainer" type="VFlowContainer" parent="."]
layout_mode = 0
@@ -44,5 +44,5 @@ layout_mode = 2
text = "localhost"
placeholder_text = "server ip"
[connection signal="pressed" from="VFlowContainer/Button" to="." method="_on_button_pressed"]
[connection signal="pressed" from="VFlowContainer/Button2" to="." method="_on_button_2_pressed"]
[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.

Before

Width:  |  Height:  |  Size: 21 MiB

After

Width:  |  Height:  |  Size: 37 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 KiB

@@ -1,27 +1,26 @@
[remap]
importer="texture"
type="StreamTexture2D"
uid="uid://gq3nlc7buqyp"
path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
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://icon.png"
dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"]
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/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
compress/streamed=false
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
@@ -30,5 +29,6 @@ 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

@@ -1,27 +1,26 @@
[remap]
importer="texture"
type="StreamTexture2D"
uid="uid://8fltpxfkhrgv"
path="res://.godot/imported/wallpaper.jpeg-0f8880b77d92d3ef9840c60cb632ae45.stex"
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://wallpaper.jpeg"
dest_files=["res://.godot/imported/wallpaper.jpeg-0f8880b77d92d3ef9840c60cb632ae45.stex"]
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/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
compress/streamed=false
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
@@ -30,5 +29,6 @@ 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
-16
View File
@@ -1,16 +0,0 @@
[gd_resource type="AudioBusLayout" format=3 uid="uid://g3oly0umcvrr"]
[resource]
bus/0/mute = true
bus/1/name = &"Bass"
bus/1/solo = false
bus/1/mute = false
bus/1/bypass_fx = false
bus/1/volume_db = 0.0
bus/1/send = &""
bus/2/name = &"Beat"
bus/2/solo = false
bus/2/mute = false
bus/2/bypass_fx = false
bus/2/volume_db = 0.0
bus/2/send = &""
-28
View File
@@ -1,28 +0,0 @@
[preset.0]
name="Linux/X11"
platform="Linux/X11"
runnable=true
custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path="./HDheist.x86_64"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
encrypt_directory=false
script_export_mode=1
script_encryption_key=""
[preset.0.options]
custom_template/debug=""
custom_template/release="/home/mark/workspace/repos/godot/bin/godot.linuxbsd.opt.64"
binary_format/64_bits=true
binary_format/embed_pck=false
texture_format/bptc=false
texture_format/s3tc=false
texture_format/etc=false
texture_format/etc2=false
texture_format/no_bptc_fallbacks=true
-4
View File
@@ -1,4 +0,0 @@
extends Node
var is_server = false
var server_ip = ""
+11 -58
View File
@@ -1,36 +1,24 @@
[gd_scene load_steps=18 format=3 uid="uid://dh63aggy3a08x"]
[gd_scene load_steps=12 format=3 uid="uid://dh63aggy3a08x"]
[ext_resource type="Script" path="res://GameLogic.gd" id="1_0vmht"]
[ext_resource type="AudioStream" uid="uid://nmem3ajdweey" path="res://music/cycles/cycles_stems-003.wav" id="3_5ndbl"]
[ext_resource type="AudioStream" uid="uid://c3ka0yftm4hvu" path="res://music/cycles/cycles_stems-005.wav" id="4_ht4c1"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_hllgj"]
sky_top_color = Color(0.054902, 0.0627451, 0.0784314, 1)
sky_horizon_color = Color(0.0823529, 0.0588235, 0.0431373, 1)
ground_bottom_color = Color(0.0313726, 0.027451, 0.0196078, 1)
ground_horizon_color = Color(0.0784314, 0.054902, 0.0392157, 1)
[sub_resource type="Sky" id="Sky_rin5s"]
sky_material = SubResource("ProceduralSkyMaterial_hllgj")
[sub_resource type="Environment" id="Environment_eo1rv"]
background_mode = 2
sky = SubResource("Sky_rin5s")
glow_enabled = true
[ext_resource type="Environment" uid="uid://5s8lkk12bxyx" path="res://assets/default_environment.tres" id="3_8gl6a"]
[ext_resource type="Environment" uid="uid://olhmjdg33u2i" path="res://assets/camera_environment.tres" id="3_evlwd"]
[sub_resource type="FastNoiseLite" id="OpenSimplexNoise_37ngu"]
noise_type = 2
frequency = 0.0793
[sub_resource type="NoiseTexture2D" id="NoiseTexture_qxk8p"]
width = 1024
height = 1024
seamless = true
as_normal_map = true
bump_strength = 0.3
noise = SubResource("OpenSimplexNoise_37ngu")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_2ho13"]
albedo_color = Color(0.278431, 0.266667, 0.223529, 1)
normal_enabled = true
normal_scale = 0.25
normal_texture = SubResource("NoiseTexture_qxk8p")
[sub_resource type="PlaneMesh" id="PlaneMesh_4f4w7"]
@@ -45,26 +33,6 @@ top_radius = 0.2
bottom_radius = 0.2
height = 10.0
[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")
[sub_resource type="Environment" id="Environment_7oc1w"]
background_color = Color(0, 0.0627451, 0, 1)
tonemap_mode = 1
glow_enabled = true
glow_levels/1 = 1.0
glow_levels/2 = 1.0
glow_levels/4 = 1.0
glow_intensity = 2.0
fog_enabled = true
adjustment_enabled = true
adjustment_saturation = 0.01
adjustment_color_correction = SubResource("GradientTexture1D_7n01c")
[sub_resource type="BoxMesh" id="BoxMesh_x36ey"]
size = Vector3(20, 5, 1)
@@ -78,7 +46,7 @@ script = ExtResource("1_0vmht")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_eo1rv")
environment = ExtResource("3_8gl6a")
[node name="Floor" type="MeshInstance3D" parent="."]
cast_shadow = 0
@@ -95,8 +63,10 @@ mesh = SubResource("CylinderMesh_lvw42")
[node name="Camera3D" type="Camera3D" parent="Pole"]
transform = Transform3D(1, 4.47035e-08, -2.08616e-07, 0, 0.926798, 0.375561, 1.49012e-07, -0.375561, 0.926798, 0, 5, 0)
environment = SubResource("Environment_7oc1w")
fov = 100.0
environment = ExtResource("3_evlwd")
fov = 96.3
near = 1.0
far = 300.0
[node name="MultiplayerSpawner" type="MultiplayerSpawner" parent="."]
spawn_path = NodePath("../NetworkedNodes")
@@ -153,13 +123,6 @@ skeleton = NodePath("../..")
[node name="130952" type="CollisionShape3D" parent="VisibleWalls/Wall4/StaticBody3D"]
shape = SubResource("ConcavePolygonShape3D_cfdha")
[node name="SpotLight3D" type="SpotLight3D" parent="."]
transform = Transform3D(-4.37114e-08, -0.707107, 0.707107, 0, 0.707107, 0.707107, -1, 3.09086e-08, -3.09086e-08, -17.0248, 4.53458, 17.1366)
light_size = 3.67
spot_range = 7.3
spot_attenuation = 1.27456
spot_angle_attenuation = 6.49802
[node name="InvisibleWalls" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.1293, -1.41031, -13.5949)
@@ -413,13 +376,3 @@ spot_range = 18.4
spot_attenuation = 1.46409
spot_angle = 50.6
spot_angle_attenuation = 2.0
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource("3_5ndbl")
autoplay = true
bus = &"Bass"
[node name="AudioStreamPlayer2" type="AudioStreamPlayer" parent="."]
stream = ExtResource("4_ht4c1")
autoplay = true
bus = &"Beat"
Binary file not shown.
-22
View File
@@ -1,22 +0,0 @@
[remap]
importer="wav"
type="AudioStreamSample"
uid="uid://djeegnrqodx4"
path="res://.godot/imported/cycles_stems-001.wav-f01af6e2df77e644ab7bef6a06d6320a.sample"
[deps]
source_file="res://music/cycles/cycles_stems-001.wav"
dest_files=["res://.godot/imported/cycles_stems-001.wav-f01af6e2df77e644ab7bef6a06d6320a.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop=false
compress/mode=0
Binary file not shown.
-22
View File
@@ -1,22 +0,0 @@
[remap]
importer="wav"
type="AudioStreamSample"
uid="uid://4nyqp8oh8gii"
path="res://.godot/imported/cycles_stems-002.wav-957bd12d59f3bc53e08559be9f4b0b1b.sample"
[deps]
source_file="res://music/cycles/cycles_stems-002.wav"
dest_files=["res://.godot/imported/cycles_stems-002.wav-957bd12d59f3bc53e08559be9f4b0b1b.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop=false
compress/mode=0
Binary file not shown.
-22
View File
@@ -1,22 +0,0 @@
[remap]
importer="wav"
type="AudioStreamSample"
uid="uid://nmem3ajdweey"
path="res://.godot/imported/cycles_stems-003.wav-4ed8af3efe4f020cdebc08518aa8882f.sample"
[deps]
source_file="res://music/cycles/cycles_stems-003.wav"
dest_files=["res://.godot/imported/cycles_stems-003.wav-4ed8af3efe4f020cdebc08518aa8882f.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop=false
compress/mode=0
Binary file not shown.
-22
View File
@@ -1,22 +0,0 @@
[remap]
importer="wav"
type="AudioStreamSample"
uid="uid://bvufvh173a43l"
path="res://.godot/imported/cycles_stems-004.wav-06732b54edc160fa73083b8d1d291991.sample"
[deps]
source_file="res://music/cycles/cycles_stems-004.wav"
dest_files=["res://.godot/imported/cycles_stems-004.wav-06732b54edc160fa73083b8d1d291991.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop=false
compress/mode=0
Binary file not shown.
-22
View File
@@ -1,22 +0,0 @@
[remap]
importer="wav"
type="AudioStreamSample"
uid="uid://c3ka0yftm4hvu"
path="res://.godot/imported/cycles_stems-005.wav-9be9f2dc64923e96f3341687707e192b.sample"
[deps]
source_file="res://music/cycles/cycles_stems-005.wav"
dest_files=["res://.godot/imported/cycles_stems-005.wav-9be9f2dc64923e96f3341687707e192b.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop=false
compress/mode=0
Binary file not shown.
-22
View File
@@ -1,22 +0,0 @@
[remap]
importer="wav"
type="AudioStreamSample"
uid="uid://jryfb5icmf1e"
path="res://.godot/imported/cycles_stems-006.wav-e62b6413161e1653ff84aa99f53042a6.sample"
[deps]
source_file="res://music/cycles/cycles_stems-006.wav"
dest_files=["res://.godot/imported/cycles_stems-006.wav-e62b6413161e1653ff84aa99f53042a6.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop=false
compress/mode=0
Binary file not shown.
-22
View File
@@ -1,22 +0,0 @@
[remap]
importer="wav"
type="AudioStreamSample"
uid="uid://dkygu4qd1pcym"
path="res://.godot/imported/cycles_stems-007.wav-ab4d5749b34d50206ba412a0a13f77d8.sample"
[deps]
source_file="res://music/cycles/cycles_stems-007.wav"
dest_files=["res://.godot/imported/cycles_stems-007.wav-ab4d5749b34d50206ba412a0a13f77d8.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop=false
compress/mode=0
Binary file not shown.
-22
View File
@@ -1,22 +0,0 @@
[remap]
importer="wav"
type="AudioStreamSample"
uid="uid://b6nv3gk5vc316"
path="res://.godot/imported/cycles_stems-008.wav-8914eff3e2590c7038ba016b6c33e8a8.sample"
[deps]
source_file="res://music/cycles/cycles_stems-008.wav"
dest_files=["res://.godot/imported/cycles_stems-008.wav-8914eff3e2590c7038ba016b6c33e8a8.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop=false
compress/mode=0
-6
View File
@@ -1,6 +0,0 @@
shader_type canvas_item;
void fragment() {
COLOR = vec4(1, 0, 1, 1);
// Place fragment code here.
}
-58
View File
@@ -1,58 +0,0 @@
[gd_scene load_steps=7 format=3 uid="uid://d1g5ngawg2cii"]
[ext_resource type="Shader" path="res://newmenu.gdshader" id="1_7l1by"]
[ext_resource type="Script" path="res://MenuBackground.gd" id="1_uc23c"]
[ext_resource type="Script" path="res://Clouds.gd" id="1_yjx8d"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_8w316"]
shader = ExtResource( "1_7l1by" )
[sub_resource type="OpenSimplexNoise" id="OpenSimplexNoise_g52tw"]
octaves = 2
period = 61.5
[sub_resource type="NoiseTexture" id="NoiseTexture_eqs1f"]
noise = SubResource( "OpenSimplexNoise_g52tw" )
noise_offset = Vector2(200, 0)
[node name="Control" type="Control"]
material = SubResource( "ShaderMaterial_8w316" )
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
__meta__ = {
"_edit_use_anchors_": false,
"_edit_use_custom_anchors": false
}
[node name="GridContainer" type="GridContainer" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
__meta__ = {
"_edit_layout_mode": 1,
"_edit_use_anchors_": false,
"_edit_use_custom_anchors": false
}
[node name="TextureRect" type="TextureRect" parent="GridContainer"]
offset_right = 1024.0
offset_bottom = 600.0
size_flags_horizontal = 3
size_flags_vertical = 3
script = ExtResource( "1_uc23c" )
[node name="Clouds" type="TextureRect" parent="."]
visible = false
offset_top = 88.0
offset_right = 1024.0
offset_bottom = 600.0
size_flags_horizontal = 3
size_flags_vertical = 3
texture = SubResource( "NoiseTexture_eqs1f" )
script = ExtResource( "1_yjx8d" )
__meta__ = {
"_edit_use_anchors_": false
}
+9 -1
View File
@@ -11,11 +11,15 @@ config_version=5
[application]
config/name="HDheist"
run/main_scene="res://control.tscn"
run/main_scene="res://Intro.tscn"
config/features=PackedStringArray("4.2")
boot_splash/show_image=false
config/icon="res://icon.png"
[audio]
buses/default_bus_layout=""
[autoload]
Globals="*res://globals.gd"
@@ -25,6 +29,10 @@ Globals="*res://globals.gd"
window/size/borderless=true
window/size/always_on_top=true
[filesystem]
import/blender/enabled=false
[input]
strafe_left={