diff --git a/project/assets/characters/player_fem/character_fem.blend b/project/assets/characters/player_fem/character_fem.blend index 1670122e..b63624e8 100644 Binary files a/project/assets/characters/player_fem/character_fem.blend and b/project/assets/characters/player_fem/character_fem.blend differ diff --git a/project/assets/characters/player_fem/character_fem.blend1 b/project/assets/characters/player_fem/character_fem.blend1 index a6f7632c..44a1688d 100644 Binary files a/project/assets/characters/player_fem/character_fem.blend1 and b/project/assets/characters/player_fem/character_fem.blend1 differ diff --git a/project/assets/characters/player_fem/textures/Face.png b/project/assets/characters/player_fem/textures/Face.png index 9f8eea5a..942b4264 100644 Binary files a/project/assets/characters/player_fem/textures/Face.png and b/project/assets/characters/player_fem/textures/Face.png differ diff --git a/project/assets/environments/blockouts/cliffs_blockout.blend b/project/assets/environments/blockouts/cliffs_blockout.blend index a534f878..d49eddce 100644 Binary files a/project/assets/environments/blockouts/cliffs_blockout.blend and b/project/assets/environments/blockouts/cliffs_blockout.blend differ diff --git a/project/assets/environments/blockouts/cliffs_blockout.blend1 b/project/assets/environments/blockouts/cliffs_blockout.blend1 index 1d600adb..64456248 100644 Binary files a/project/assets/environments/blockouts/cliffs_blockout.blend1 and b/project/assets/environments/blockouts/cliffs_blockout.blend1 differ diff --git a/project/assets/environments/props/tree.blend b/project/assets/environments/props/tree.blend index 67827690..7c45b961 100644 Binary files a/project/assets/environments/props/tree.blend and b/project/assets/environments/props/tree.blend differ diff --git a/project/assets/environments/props/tree.blend1 b/project/assets/environments/props/tree.blend1 index b115a91f..1c795ec8 100644 Binary files a/project/assets/environments/props/tree.blend1 and b/project/assets/environments/props/tree.blend1 differ diff --git a/project/assets/style/base_outline_material.tres b/project/assets/style/base_outline_material.tres index 2ad2ad85..723181a0 100644 --- a/project/assets/style/base_outline_material.tres +++ b/project/assets/style/base_outline_material.tres @@ -13,5 +13,4 @@ albedo_color = Color(0.121152334, 0.121152334, 0.121152334, 1) grow = true grow_amount = 0.02 proximity_fade_distance = 0.1 -stencil_mode = 3 stencil_outline_thickness = 0.029 diff --git a/project/assets/style/character_outline_material.tres b/project/assets/style/detail_outline_material.tres similarity index 86% rename from project/assets/style/character_outline_material.tres rename to project/assets/style/detail_outline_material.tres index c1ad274e..189cd35a 100644 --- a/project/assets/style/character_outline_material.tres +++ b/project/assets/style/detail_outline_material.tres @@ -2,7 +2,7 @@ [resource] transparency = 2 -alpha_scissor_threshold = 0.5 +alpha_scissor_threshold = 0.94 alpha_antialiasing_mode = 0 cull_mode = 1 shading_mode = 0 @@ -13,5 +13,5 @@ albedo_color = Color(0.121152334, 0.121152334, 0.121152334, 1) grow = true grow_amount = 0.02 proximity_fade_enabled = true -proximity_fade_distance = 0.25 +proximity_fade_distance = 0.3 stencil_outline_thickness = 0.029 diff --git a/project/assets/style/model_importer.gd b/project/assets/style/model_importer.gd index 92ef55dc..f00c0533 100644 --- a/project/assets/style/model_importer.gd +++ b/project/assets/style/model_importer.gd @@ -2,11 +2,13 @@ extends EditorScenePostImport var regular_outline_material : StandardMaterial3D -var character_outline_material : StandardMaterial3D +var detail_outline_material : StandardMaterial3D +var thin_outline_material : StandardMaterial3D func _post_import(root : Node): regular_outline_material = ResourceLoader.load("res://assets/style/base_outline_material.tres") as StandardMaterial3D - character_outline_material = ResourceLoader.load("res://assets/style/character_outline_material.tres") as StandardMaterial3D + detail_outline_material = ResourceLoader.load("res://assets/style/detail_outline_material.tres") as StandardMaterial3D + thin_outline_material = ResourceLoader.load("res://assets/style/thin_outline_material.tres") as StandardMaterial3D apply_outline_recursive(root) return root @@ -22,9 +24,12 @@ func apply_outline_recursive(node : Node): var outline : bool = not get_flag(node, "-nooutline") if outline and node is MeshInstance3D: var detail : bool = get_flag(node, "-detailoutline") + var thin : bool = get_flag(node, "-thinoutline") var mesh : MeshInstance3D = (node as MeshInstance3D) - if detail and character_outline_material: - mesh.material_overlay = character_outline_material + if detail and detail_outline_material: + mesh.material_overlay = detail_outline_material + elif thin and thin_outline_material: + mesh.material_overlay = thin_outline_material elif regular_outline_material: mesh.material_overlay = regular_outline_material for child in node.get_children(): diff --git a/project/assets/style/thin_outline_material.tres b/project/assets/style/thin_outline_material.tres new file mode 100644 index 00000000..c9b353e8 --- /dev/null +++ b/project/assets/style/thin_outline_material.tres @@ -0,0 +1,22 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://vo4kk73alewq"] + +[ext_resource type="Material" uid="uid://02s3lq67141v" path="res://assets/style/detail_outline_material.tres" id="1_jjhui"] + +[resource] +next_pass = ExtResource("1_jjhui") +transparency = 2 +alpha_scissor_threshold = 0.9 +alpha_antialiasing_mode = 0 +cull_mode = 1 +shading_mode = 0 +diffuse_mode = 3 +specular_mode = 2 +vertex_color_use_as_albedo = true +albedo_color = Color(0.121152334, 0.121152334, 0.121152334, 1) +grow = true +grow_amount = 0.007 +proximity_fade_distance = 0.1 +distance_fade_mode = 1 +distance_fade_min_distance = 10.0 +distance_fade_max_distance = 9.0 +stencil_outline_thickness = 0.029 diff --git a/project/objects/player_vehicle.tscn b/project/objects/player_vehicle.tscn index 624f4894..c9282027 100644 --- a/project/objects/player_vehicle.tscn +++ b/project/objects/player_vehicle.tscn @@ -21,7 +21,7 @@ mass = 400.0 [node name="bike" parent="." unique_id=1819523012 instance=ExtResource("1_qt1cm")] transform = Transform3D(1.0000004, 0, 0, 0, 1.0000001, 0, 0, 0, 0.9999994, -0.48627073, 0, 0) -[node name="character_fem" parent="bike" unique_id=1503004367 instance=ExtResource("2_buo3h")] +[node name="character_fem" parent="bike" unique_id=111626287 instance=ExtResource("2_buo3h")] [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=1803684826] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.48627073, 0.7048377, 0.074576735) @@ -40,10 +40,11 @@ transform = Transform3D(1, 0, 0, 0, 0.72955376, -0.6839234, 0, 0.6839234, 0.7295 shape = SubResource("BoxShape3D_khxbi") [node name="SidecarWheel" type="VehicleWheel3D" parent="." unique_id=1869360183] -transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 0.7563137, 0.38881683, 0.74285626) -wheel_roll_influence = 1.0 +transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 0.7563137, 0.37474027, 0.7443161) +wheel_roll_influence = 0.3 wheel_radius = 0.389 wheel_rest_length = 0.05 +wheel_friction_slip = 1.0 suspension_travel = 0.1 suspension_stiffness = 500.0 suspension_max_force = 10500.0 @@ -51,11 +52,12 @@ damping_compression = 10.0 damping_relaxation = 11.0 [node name="BackWheel" type="VehicleWheel3D" parent="." unique_id=128773497] -transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -0.4791991, 0.38881683, 0.9504494) +transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -0.4791991, 0.37716705, 0.9504494) use_as_traction = true -wheel_roll_influence = 1.0 +wheel_roll_influence = 0.3 wheel_radius = 0.389 wheel_rest_length = 0.05 +wheel_friction_slip = 1.0 suspension_travel = 0.1 suspension_stiffness = 500.0 suspension_max_force = 10500.0 @@ -63,11 +65,12 @@ damping_compression = 10.0 damping_relaxation = 11.0 [node name="FrontWheel" type="VehicleWheel3D" parent="." unique_id=1222187628] -transform = Transform3D(-1, 6.4255117e-09, 8.7186315e-08, 4.371139e-08, 0.90043265, 0.43499538, -7.5710346e-08, 0.43499538, -0.90043265, -0.479199, 0.38881683, -0.73735744) +transform = Transform3D(-1, 6.4255117e-09, 8.7186315e-08, 4.371139e-08, 0.90043265, 0.43499538, -7.5710346e-08, 0.43499538, -0.90043265, -0.479199, 0.3713468, -0.73007745) use_as_steering = true -wheel_roll_influence = 1.0 +wheel_roll_influence = 0.3 wheel_radius = 0.389 wheel_rest_length = 0.05 +wheel_friction_slip = 1.0 suspension_travel = 0.1 suspension_stiffness = 500.0 suspension_max_force = 10500.0 diff --git a/project/project.godot b/project/project.godot index 9c15ea3a..477ade1f 100644 --- a/project/project.godot +++ b/project/project.godot @@ -56,5 +56,5 @@ move_backward={ lights_and_shadows/directional_shadow/soft_shadow_filter_quality=3 lights_and_shadows/positional_shadow/soft_shadow_filter_quality=3 shading/overrides/force_vertex_shading=true -anti_aliasing/quality/msaa_3d=2 +anti_aliasing/quality/msaa_3d=1 anti_aliasing/quality/use_debanding=true diff --git a/project/scenes/style_test_blockout.scn b/project/scenes/style_test_blockout.scn index 92ab9093..af2e6443 100644 Binary files a/project/scenes/style_test_blockout.scn and b/project/scenes/style_test_blockout.scn differ