diff --git a/asset_dev/guard_rail/guard_rail.xcf b/asset_dev/guard_rail/guard_rail.xcf new file mode 100644 index 0000000..fc6d9af Binary files /dev/null and b/asset_dev/guard_rail/guard_rail.xcf differ diff --git a/assets/materials/guard_rail.tres b/assets/materials/guard_rail.tres new file mode 100644 index 0000000..ca40269 --- /dev/null +++ b/assets/materials/guard_rail.tres @@ -0,0 +1,8 @@ +[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://cift6p0wn1oce"] + +[ext_resource type="Texture2D" uid="uid://b8vgf8wy7h4nx" path="res://assets/textures/guard_rail/guard_rail.png" id="1_3fqse"] + +[resource] +albedo_texture = ExtResource("1_3fqse") +uv1_offset = Vector3(0, -0.125, 0) +texture_filter = 4 diff --git a/assets/textures/guard_rail/guard_rail.png b/assets/textures/guard_rail/guard_rail.png new file mode 100644 index 0000000..2935ee7 --- /dev/null +++ b/assets/textures/guard_rail/guard_rail.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82af32ddc31eeaca71283f8f76e4d048a660266f9476fadfbbfddad4423d4f9c +size 588 diff --git a/assets/textures/guard_rail/guard_rail.png.import b/assets/textures/guard_rail/guard_rail.png.import new file mode 100644 index 0000000..c090aae --- /dev/null +++ b/assets/textures/guard_rail/guard_rail.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b8vgf8wy7h4nx" +path.s3tc="res://.godot/imported/guard_rail.png-c5478404987848bc11f90ea8062336a0.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/textures/guard_rail/guard_rail.png" +dest_files=["res://.godot/imported/guard_rail.png-c5478404987848bc11f90ea8062336a0.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 diff --git a/levels/debug_level/terrain_3d_storage.res b/levels/debug_level/terrain_3d_storage.res index 641bc92..51dddb7 100644 --- a/levels/debug_level/terrain_3d_storage.res +++ b/levels/debug_level/terrain_3d_storage.res @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8930f396f07a2241c26b195a0879cae82e16e3f40a06e25e4194abd9cda02ac9 -size 907293 +oid sha256:69ee35d345ab47d868c1b2e9901af9b2457a79f865269d42e7e27fe4ed4dd585 +size 883222 diff --git a/src/player/shot_setup/shot_setup.gd b/src/player/shot_setup/shot_setup.gd index d42d008..50f9a90 100644 --- a/src/player/shot_setup/shot_setup.gd +++ b/src/player/shot_setup/shot_setup.gd @@ -39,6 +39,8 @@ const CAMERA_SNAP_TIME := 0.3 @export var debug_ball_impact := false ## When enabled, ignore curve meter and hit a perfect shot every time. @export var perfect_aim := false +## Keep projection visible +@export var keep_projection := false var base_speed: float = ProjectSettings.get_setting("game/config/controls/camera/free_camera_speed") @@ -214,7 +216,10 @@ func insert_free_cam() -> void: func return_free_cam() -> void: # TODO alter shot aim based on free camera selection arrow_animation.play("show") - #shot_projection.hide() + + if not keep_projection: + shot_projection.hide() + hud_state.travel("visible") _free_camera.queue_free() _free_camera = null diff --git a/src/props/scenery/highway/guard_rail.tscn b/src/props/scenery/highway/guard_rail.tscn index dbcd586..a8ed894 100644 --- a/src/props/scenery/highway/guard_rail.tscn +++ b/src/props/scenery/highway/guard_rail.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=6 format=3 uid="uid://nqar1qcun8ax"] +[gd_scene load_steps=7 format=3 uid="uid://nqar1qcun8ax"] [ext_resource type="Script" path="res://src/props/scenery/highway/guard_rail.gd" id="1_imntf"] +[ext_resource type="Material" uid="uid://cift6p0wn1oce" path="res://assets/materials/guard_rail.tres" id="2_1s4wy"] [sub_resource type="CompressedTexture2D" id="CompressedTexture2D_fo7j3"] load_path = "res://.godot/imported/guard_rail_post.png-4447ff881a5916e5281ed251b7beecd0.ctex" @@ -26,7 +27,6 @@ mesh = SubResource("PlaneMesh_ko4yv") [node name="GuardRail" type="Path3D"] script = ExtResource("1_imntf") -end_cap = true [node name="UpperRail" type="CSGPolygon3D" parent="."] use_collision = true @@ -41,6 +41,7 @@ path_local = true path_continuous_u = true path_u_distance = 1.0 path_joined = false +material = ExtResource("2_1s4wy") [node name="LowerRail" type="CSGPolygon3D" parent="."] use_collision = true @@ -55,6 +56,7 @@ path_local = true path_continuous_u = true path_u_distance = 1.0 path_joined = false +material = ExtResource("2_1s4wy") [node name="PostMultiMesh" type="MultiMeshInstance3D" parent="."] multimesh = SubResource("MultiMesh_o7ch8")