diff --git a/assets/car_convex.obj b/assets/car_convex.obj index 4fbb6ba..927953e 100644 --- a/assets/car_convex.obj +++ b/assets/car_convex.obj @@ -1,60 +1,55 @@ -# Blender 4.4.0 +# Blender 4.4.1 # www.blender.org o Object_5 -v -0.809354 0.177497 1.254802 -v -0.651350 -0.191484 1.848460 +v -0.812577 0.172395 1.254792 +v -0.646673 -0.190612 1.848713 v -0.666983 -0.006338 1.874366 v -0.635056 0.256211 1.783894 v -0.508939 0.803110 -0.009132 v -0.769510 0.352081 -1.291787 -v -0.764234 0.008374 -1.721554 -v 0.681867 -0.190619 1.840616 +v -0.761933 0.013607 -1.722252 +v 0.677186 -0.189706 1.840916 v -0.590011 0.087673 1.933771 -v -0.664853 -0.223466 -1.336528 -v -0.470980 -0.291467 1.091400 -v 0.501574 -0.290622 1.087594 +v -0.669674 -0.180060 -1.336290 v -0.512564 0.833925 -0.989792 v -0.627160 0.507336 -2.050498 -v -0.682346 0.022742 -2.244179 +v -0.682347 0.022719 -2.244187 v 0.678533 0.090349 1.926879 -v 0.695498 -0.222497 -1.337535 -v 0.794826 0.008397 -1.721544 -v 0.839974 0.177449 1.254803 +v 0.700321 -0.179143 -1.337300 +v 0.792520 0.013658 -1.722244 +v 0.843208 0.172325 1.254793 v 0.665671 0.258142 1.777555 v 0.539534 0.803109 -0.009139 v 0.543159 0.833925 -0.989791 v 0.657754 0.507336 -2.050497 -v 0.712874 0.023341 -2.243943 +v 0.712870 0.023363 -2.243935 v 0.800105 0.352079 -1.291788 s 0 f 1 2 3 f 1 3 4 f 1 4 5 -f 25 22 21 19 +f 23 20 19 17 f 1 6 7 -f 18 19 8 17 +f 16 17 8 15 f 2 9 3 -f 2 10 11 -f 17 12 11 10 f 3 9 4 -f 9 16 20 4 -f 6 13 14 -f 23 25 18 24 -f 7 15 10 -f 8 12 17 -f 8 19 16 -f 8 16 9 2 -f 14 23 24 15 -f 22 13 5 21 -f 17 10 15 24 -f 16 19 20 -f 17 24 18 -f 18 25 19 +f 9 14 18 4 +f 6 11 12 +f 21 23 16 22 +f 7 13 10 +f 8 17 14 +f 8 14 9 2 +f 12 21 22 13 +f 20 11 5 19 +f 15 10 13 22 +f 14 17 18 +f 15 22 16 +f 16 23 17 f 7 10 2 1 -f 19 21 20 -f 22 25 23 -f 12 8 2 11 -f 5 13 6 1 -f 5 4 20 21 -f 15 7 6 14 -f 14 13 22 23 +f 17 19 18 +f 20 23 21 +f 5 11 6 1 +f 5 4 18 19 +f 13 7 6 12 +f 12 11 20 21 +f 8 2 10 15 diff --git a/game/game.odin b/game/game.odin index 2680aae..b7b03ec 100644 --- a/game/game.odin +++ b/game/game.odin @@ -325,13 +325,13 @@ update_runtime_world :: proc(runtime_world: ^Runtime_World, dt: f32) { wheel_extent_x_front := f32(1.355) / 2 wheel_extent_x_back := f32(1.345) / 2 - wheel_y := f32(-0.1) - rest := f32(1) - natural_frequency := f32(0.35) - damping := f32(0.07) + wheel_y := f32(-0.4) + rest := f32(0.2) + natural_frequency := f32(1.2) + damping := f32(0.15) radius := f32(0.2888) - wheel_front_z := f32(1.3) - wheel_back_z := f32(-1.1) + wheel_front_z := f32(1.35) + wheel_back_z := f32(-1.05) wheel_mass := f32(14) wheel_fl := physics.immediate_suspension_constraint( @@ -408,7 +408,7 @@ update_runtime_world :: proc(runtime_world: ^Runtime_World, dt: f32) { axle = physics.Drive_Axle_Config { wheels = {wheel_rl, wheel_rr}, wheel_count = 2, - diff_type = .Open, + diff_type = .Fixed, final_drive_ratio = 4.1, }, }, diff --git a/game/physics/collision/collision.odin b/game/physics/collision/collision.odin index 88001bd..7c853fe 100644 --- a/game/physics/collision/collision.odin +++ b/game/physics/collision/collision.odin @@ -633,7 +633,7 @@ intersect_segment_plane :: proc( if t >= 0 && t <= 1 { point = segment[0] + t * ab - return t, point, true + return t * linalg.length(ab), point, true } return linalg.length(ab), segment[1], false diff --git a/src_assets/ae86.blend b/src_assets/ae86.blend index 885204f..1f1e5a5 100644 --- a/src_assets/ae86.blend +++ b/src_assets/ae86.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbe4c8c906a122a90c6aa2df96b632d160e7133ecfa0d327913e7f4f66110213 -size 3964900 +oid sha256:274e285cb4fda4383e6437f2e3dec9f8d0289fd6e9ce7693e408deee06d50634 +size 3965428 diff --git a/src_assets/ae86.blend1 b/src_assets/ae86.blend1 index cbee1fd..885204f 100644 --- a/src_assets/ae86.blend1 +++ b/src_assets/ae86.blend1 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcbc61da461eaf1612edc7828735e9a0a98b95fd6820d74c3e275dcb5af0351d -size 3993296 +oid sha256:dbe4c8c906a122a90c6aa2df96b632d160e7133ecfa0d327913e7f4f66110213 +size 3964900 diff --git a/src_assets/car_convex.blend b/src_assets/car_convex.blend index 5693764..8b58a4b 100644 --- a/src_assets/car_convex.blend +++ b/src_assets/car_convex.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:361ef2bd754f6007d9a8195cba65fe74b0a8737128b6db1045722bf2c8e70259 -size 473691 +oid sha256:fa2e92eafb9dcf95ea196dc5e7ee2cf14034d172a6816b0cf780ef27533b7d77 +size 477254 diff --git a/src_assets/car_convex.blend1 b/src_assets/car_convex.blend1 index 65b8e79..a703a3a 100644 --- a/src_assets/car_convex.blend1 +++ b/src_assets/car_convex.blend1 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f18018b0dc4edd7ffd82a19159b120a3028f6757cc07a18bf28e52f4e6e992be -size 473691 +oid sha256:3a2bb3d3a2f97f42d63f92c93bcfb523768b1c5b61db453db9e188634dcae52c +size 477254