diff --git a/.gitignore b/.gitignore index be58600..354f948 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ #icon assets addons/at-icons/* + +#rendered images +assets/models/crt-render-1/* diff --git a/assets/models/RGB.png b/assets/models/RGB.png new file mode 100644 index 0000000..561be85 Binary files /dev/null and b/assets/models/RGB.png differ diff --git a/assets/models/crt-monitor.blend b/assets/models/crt-monitor.blend index fc82dbf..e61f0a1 100644 Binary files a/assets/models/crt-monitor.blend and b/assets/models/crt-monitor.blend differ diff --git a/assets/models/crt-monitor.blend1 b/assets/models/crt-monitor.blend1 index 8cc4c98..db87139 100644 Binary files a/assets/models/crt-monitor.blend1 and b/assets/models/crt-monitor.blend1 differ diff --git a/entities/player/player.tscn b/entities/player/player.tscn index 4f34f6a..6e17571 100644 --- a/entities/player/player.tscn +++ b/entities/player/player.tscn @@ -183,13 +183,15 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.7621309, 0) doppler_tracking = 2 [node name="RaytracedAudioListener" type="AudioListener3D" parent="CameraPivot/PlayerListener" unique_id=154629324] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.45788532, 0) doppler_tracking = 2 current = true script = ExtResource("14_we0b7") -ray_scatter_model = 1 -muffle_interpolation = 0.02 -echo_room_size_multiplier = 5.0 -echo_interpolation = 0.0 +muffle_interpolation = 0.04 +echo_room_size_multiplier = 3.0 +ambient_pan_interpolation = 0.22 +ambient_volume_interpolation = 0.1 +ambient_volume_attenuation = 1.0 metadata/_custom_type_script = "uid://bjpmu5sklv5h8" [node name="MeshInstance3D" type="MeshInstance3D" parent="CameraPivot" unique_id=539906244] diff --git a/entities/usable/music_player.tscn b/entities/usable/music_player.tscn index 2dfc2a4..0985296 100644 --- a/entities/usable/music_player.tscn +++ b/entities/usable/music_player.tscn @@ -34,7 +34,7 @@ transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, 1 mesh = SubResource("TubeTrailMesh_b5l5s") [node name="ChangableAudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="." unique_id=2198078 groups=["sound_player"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.9425293, 0.23302945) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.9425293, 0.25567618) stream = ExtResource("3_rf3au") attenuation_model = 3 unit_size = 32.04 diff --git a/scenes/main_menu/main_menu.gd b/scenes/main_menu/main_menu.gd index 7f3dbc2..0936151 100644 --- a/scenes/main_menu/main_menu.gd +++ b/scenes/main_menu/main_menu.gd @@ -11,7 +11,7 @@ func _ready() -> void: UiManager.hide() - #%AnimationPlayer.play("camera_init") + %AnimationPlayer.play("camera_init") func _process(delta: float) -> void: move_camera_based_on_mouse(delta) diff --git a/scenes/maps/dev/dev_map.tscn b/scenes/maps/dev/dev_map.tscn index 40f153a..6cf2346 100644 --- a/scenes/maps/dev/dev_map.tscn +++ b/scenes/maps/dev/dev_map.tscn @@ -22,7 +22,7 @@ [sub_resource type="BoxMesh" id="BoxMesh_yf5fn"] [sub_resource type="BoxShape3D" id="BoxShape3D_57qmd"] -size = Vector3(20.447998, 11.038544, 1) +size = Vector3(20.447998, 16.566147, 1) [sub_resource type="Environment" id="Environment_b5l5s"] background_mode = 2 @@ -35,6 +35,9 @@ dof_blur_far_distance = 16.46 dof_blur_amount = 0.01 auto_exposure_max_sensitivity = 14462.9 +[sub_resource type="BoxShape3D" id="BoxShape3D_7j4jp"] +size = Vector3(100, 100, 1) + [node name="DevMap" type="Node3D" unique_id=471389571] [node name="bakpakbruh" parent="." unique_id=829759791 instance=ExtResource("1_de016")] @@ -131,5 +134,35 @@ camera_attributes = SubResource("CameraAttributesPractical_60a4j") [node name="UsableBase" parent="." unique_id=1189819781 instance=ExtResource("9_hupuo")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.8267124, 0.65320015, -0.25214243) +[node name="StaticBody3D5" type="StaticBody3D" parent="." unique_id=1060538462] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.8267124, 0.65320015, -0.25214243) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D5" unique_id=517469897] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 83.8801, 49.864983, -50.69651) +shape = SubResource("BoxShape3D_7j4jp") + +[node name="CollisionShape3D3" type="CollisionShape3D" parent="StaticBody3D5" unique_id=1764096820] +transform = Transform3D(1, 0, 0, 0, -4.371139e-08, -1, 0, 1, -4.371139e-08, 83.8801, -1.9845104, 0.8780961) +shape = SubResource("BoxShape3D_7j4jp") + +[node name="CollisionShape3D4" type="CollisionShape3D" parent="StaticBody3D5" unique_id=2021497330] +transform = Transform3D(1, 0, 0, 0, -4.371139e-08, -1, 0, 1, -4.371139e-08, 83.8801, 98.95747, 0.8780961) +shape = SubResource("BoxShape3D_7j4jp") + +[node name="CollisionShape3D5" type="CollisionShape3D" parent="StaticBody3D5" unique_id=674733187] +transform = Transform3D(-4.371139e-08, -4.371139e-08, -1, -1, 1.9106855e-15, 4.371139e-08, 0, 1, -4.371139e-08, 135.2068, 48.38263, 0.8780961) +shape = SubResource("BoxShape3D_7j4jp") + +[node name="CollisionShape3D6" type="CollisionShape3D" parent="StaticBody3D5" unique_id=225589793] +transform = Transform3D(-4.371139e-08, -4.371139e-08, -1, -1, 1.9106855e-15, 4.371139e-08, 0, 1, -4.371139e-08, 35.339264, 48.38263, 0.8780961) +shape = SubResource("BoxShape3D_7j4jp") + +[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D5" unique_id=445238902] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 83.8801, 49.864983, 47.276882) +shape = SubResource("BoxShape3D_7j4jp") + [node name="MusicPlayer" parent="." unique_id=1866568806 instance=ExtResource("10_13hof")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.569429, 1.810069, 2.4010668) + +[node name="MusicPlayer2" parent="." unique_id=248560085 instance=ExtResource("10_13hof")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 62.980488, 1.810069, 2.4010668)