audio fixes and minor tweaks

This commit is contained in:
derek
2024-12-06 16:22:56 -06:00
parent d0b247d2c0
commit 3938e53eed
12 changed files with 172 additions and 6 deletions

Binary file not shown.

View File

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cyhvgk0vnb8ir"
path="res://.godot/imported/TerrainAlbedo.exr-0e3ff80354bd87255e081e1fd3eef291.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Models/TerrainAlbedo.exr"
dest_files=["res://.godot/imported/TerrainAlbedo.exr-0e3ff80354bd87255e081e1fd3eef291.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=1
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

View File

@@ -0,0 +1,14 @@
shader_type canvas_item;
void vertex() {
// Called for every vertex the material is visible on.
}
void fragment() {
// Called for every pixel the material is visible on.
}
//void light() {
// Called for every pixel for every light affecting the CanvasItem.
// Uncomment to replace the default light processing function with this one.
//}

Binary file not shown.

View File

@@ -0,0 +1,51 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://b4sy0wlxl22b3"
path="res://.godot/imported/terrain1.blend-e3e85aad5fffa081a29e1a0f644c89eb.scn"
[deps]
source_file="res://assets/Models/terrain1.blend"
dest_files=["res://.godot/imported/terrain1.blend-e3e85aad5fffa081a29e1a0f644c89eb.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
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
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
blender/nodes/visible=0
blender/nodes/active_collection_only=false
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true

Binary file not shown.

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=3 uid="uid://c1gdehrsytlkk"]
[gd_scene load_steps=10 format=3 uid="uid://c1gdehrsytlkk"]
[ext_resource type="Script" path="res://assets/casing.gd" id="1_6f8y7"]
[ext_resource type="PackedScene" uid="uid://bv0sfqdgwa85p" path="res://assets/Models/casing.blend" id="2_1ed71"]
@@ -7,6 +7,9 @@
[ext_resource type="AudioStream" uid="uid://bvfsycfblxn4j" path="res://assets/Audio/bullet-metal-casing-drop-3.mp3" id="5_wvj0r"]
[ext_resource type="AudioStream" uid="uid://b4fyx4keuu0x4" path="res://assets/Audio/bullet-metal-casing-drop-4.mp3" id="6_qbbeb"]
[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_p0vkd"]
bounce = 0.4
[sub_resource type="CylinderShape3D" id="CylinderShape3D_ejwa0"]
margin = 0.001
height = 0.121962
@@ -23,6 +26,7 @@ stream_3/stream = ExtResource("6_qbbeb")
collision_layer = 0
collision_mask = 37
mass = 0.1
physics_material_override = SubResource("PhysicsMaterial_p0vkd")
continuous_cd = true
contact_monitor = true
max_contacts_reported = 1

View File

@@ -246,7 +246,7 @@ collision_mask = 16
[node name="CollisionShape3D" type="CollisionShape3D" parent="pick_up_magnet"]
shape = SubResource("SphereShape3D_xfie3")
[node name="Audio" type="Node" parent="."]
[node name="Audio" type="Node3D" parent="."]
[node name="PickupSound" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource("8_dwqsx")

View File

@@ -1031,7 +1031,7 @@ one_shot = true
wait_time = 8.0
one_shot = true
[node name="AUIDO" type="Node" parent="."]
[node name="AUIDO" type="Node3D" parent="."]
[node name="Fire" type="AudioStreamPlayer3D" parent="AUIDO"]
stream = ExtResource("10_2qmhc")

View File

@@ -199,6 +199,7 @@ numb_0={
crouch={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194326,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":67,"key_label":0,"unicode":99,"location":0,"echo":false,"script":null)
]
}
kill_self={

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=46 format=4 uid="uid://f7e0v1r6ra6c"]
[gd_scene load_steps=47 format=4 uid="uid://f7e0v1r6ra6c"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_saj4q"]
[ext_resource type="PackedScene" uid="uid://b5eclfg0cmmal" path="res://assets/revolver_1.tscn" id="2_ntm2q"]
@@ -26,6 +26,7 @@
[ext_resource type="PackedScene" uid="uid://bycbdb5u5ewgl" path="res://assets/tree_2.tscn" id="24_od0q8"]
[ext_resource type="PackedScene" uid="uid://c7vrpfdh603kr" path="res://assets/bottle_1.tscn" id="25_fk5nr"]
[ext_resource type="PackedScene" uid="uid://c6bpysq1tjhy4" path="res://vendingmahcine.tscn" id="26_rsia7"]
[ext_resource type="PackedScene" uid="uid://8cwmkiwcoaji" path="res://terrain1.tscn" id="27_hlma7"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_py8au"]
@@ -315,10 +316,10 @@ light_energy = 2.0
shadow_enabled = true
[node name="CSGBox3D" type="CSGBox3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.54059, 0, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.54059, -4.88213, 0)
material_override = ExtResource("3_pecld")
use_collision = true
size = Vector3(67.0812, 0.2, 50)
size = Vector3(67.0812, 9.96426, 50)
[node name="CSGBox3D4" type="CSGBox3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26.9842, -0.514714, -14.2135)
@@ -517,3 +518,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 34.1407, 0.919677, 8.89591)
[node name="vendingmachine" parent="." instance=ExtResource("26_rsia7")]
transform = Transform3D(0.0288986, 0, 0.999582, 0, 1, 0, -0.999582, 0, 0.0288986, -18.6276, 0.0999999, 7.03353)
[node name="Terrain" parent="." instance=ExtResource("27_hlma7")]
transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 1001.46, -70.327, 173.409)

58
terrain1.tscn Normal file

File diff suppressed because one or more lines are too long