diff --git a/Game/GigLine/Content/Hollywood/Site/Crossing_Markings.uasset b/Game/GigLine/Content/Hollywood/Site/Crossing_Markings.uasset index 78b30f8..056b009 100644 --- a/Game/GigLine/Content/Hollywood/Site/Crossing_Markings.uasset +++ b/Game/GigLine/Content/Hollywood/Site/Crossing_Markings.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbe6957a64e5066e8cb39d6cc0dfac32e8b8467f1ce96f79efbfc4f0164caffc +oid sha256:ebac8b2f24eb5a9694ae773afd066c8119b35e508b9768443a115591943ef3d0 size 75501 diff --git a/Game/GigLine/Content/Hollywood/Site/Kerb_North.uasset b/Game/GigLine/Content/Hollywood/Site/Kerb_North.uasset index 21d946d..a565fe5 100644 --- a/Game/GigLine/Content/Hollywood/Site/Kerb_North.uasset +++ b/Game/GigLine/Content/Hollywood/Site/Kerb_North.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a0290a913eb20cf7a4cb0babf9c85873fa27a8702bd668e2f5ba7183fe1ba32 +oid sha256:afc0287a2021ac3c8249a6071a34c1b7d20e86329071bb0ec47971f675703f13 size 83550 diff --git a/Game/GigLine/Content/Hollywood/Site/Kerb_South.uasset b/Game/GigLine/Content/Hollywood/Site/Kerb_South.uasset index 78fe5ab..a5257be 100644 --- a/Game/GigLine/Content/Hollywood/Site/Kerb_South.uasset +++ b/Game/GigLine/Content/Hollywood/Site/Kerb_South.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8a457f7846e3be2baec0e7c67a1483b631a000b62ea84fab512d17e1d5dcf9b +oid sha256:244dc615c604332bc8046c61305264997f63d03bc6ed33281e22436a8fb17127 size 83797 diff --git a/Game/GigLine/Content/Hollywood/Site/Road_Hollywood.uasset b/Game/GigLine/Content/Hollywood/Site/Road_Hollywood.uasset index d1752f5..affcbe6 100644 --- a/Game/GigLine/Content/Hollywood/Site/Road_Hollywood.uasset +++ b/Game/GigLine/Content/Hollywood/Site/Road_Hollywood.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d1b18b0fd9a8cf03bdd4167adc7c522ba317534e5cb218e61dc35d800b93846 -size 309810 +oid sha256:484203d50293ca93dcdfceb275c24587a40f70892698b6f6950b600358522fa3 +size 309812 diff --git a/Game/GigLine/Content/Hollywood/Site/Sidewalk_North.uasset b/Game/GigLine/Content/Hollywood/Site/Sidewalk_North.uasset index 22407dd..c335f1a 100644 --- a/Game/GigLine/Content/Hollywood/Site/Sidewalk_North.uasset +++ b/Game/GigLine/Content/Hollywood/Site/Sidewalk_North.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b2ae64e3b75e91a020f8064a6dc3ecd338c1c221e22913207e520d41bbed1d7 -size 150676 +oid sha256:53bc30b5df51eabe14e5a31e33fd5b0d641160289c92dd3717df5af8b9bd43e2 +size 150678 diff --git a/Game/GigLine/Content/Hollywood/Site/Sidewalk_South.uasset b/Game/GigLine/Content/Hollywood/Site/Sidewalk_South.uasset index bfcd3dc..11756b3 100644 --- a/Game/GigLine/Content/Hollywood/Site/Sidewalk_South.uasset +++ b/Game/GigLine/Content/Hollywood/Site/Sidewalk_South.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0d59d5e94bf4d80f26f4642dfccd3e81f95de31c21200f75889483be055b660 -size 164347 +oid sha256:a1f11f8a3448a0e26a530d928d5e613c673f3b899ee1922ef7d9eb7b3c428c06 +size 164349 diff --git a/Game/GigLine/Content/Hollywood/Site/Terrain_DEM.uasset b/Game/GigLine/Content/Hollywood/Site/Terrain_DEM.uasset index 4d876fc..4f38add 100644 --- a/Game/GigLine/Content/Hollywood/Site/Terrain_DEM.uasset +++ b/Game/GigLine/Content/Hollywood/Site/Terrain_DEM.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c69a8740d12b055236a1e178fee029affb2c15a76e76a57456545469319828ee -size 335528 +oid sha256:7c01d12a342abd31999ada2f3cc98defdff53bb831ed8f39dd6523654b2bc8d4 +size 335530 diff --git a/Tools/ue_import_site.py b/Tools/ue_import_site.py index 48f1f94..67fee09 100644 --- a/Tools/ue_import_site.py +++ b/Tools/ue_import_site.py @@ -77,8 +77,12 @@ def import_fbx(path, name, collision="complex"): log(f"{name:18} import ok size=({mx.x - mn.x:.0f}, {mx.y - mn.y:.0f}, {mx.z - mn.z:.0f}) cm " f"min_z={mn.z:.1f} collision=none") return - trace = (unreal.CollisionTraceFlag.CTF_USE_COMPLEX_AS_SIMPLE - if collision == "complex" else unreal.CollisionTraceFlag.CTF_USE_SIMPLE_AND_COMPLEX) + # Walkable surfaces block with SIMPLE + COMPLEX collision so the player's + # capsule always has ground: CFG_USE_SIMPLE_AND_COMPLEX uses the auto- + # generated simple collision AND the mesh triangles. (Complex-as-simple + # alone only worked if the mesh carried complex collision, which a default + # FBX static-mesh import does not.) + trace = unreal.CollisionTraceFlag.CTF_USE_SIMPLE_AND_COMPLEX try: body = mesh.get_editor_property("body_setup") body.set_editor_property("collision_trace_flag", trace)