diff --git a/.github/workflows/linux_builds_deployment.yml b/.github/workflows/linux_builds_deployment.yml index fdee36bb..37e2ffe7 100644 --- a/.github/workflows/linux_builds_deployment.yml +++ b/.github/workflows/linux_builds_deployment.yml @@ -86,15 +86,15 @@ jobs: run: | strip bin/godot.* - - name: Shrink debug symbols - if: ${{ !matrix.strip }} - run: | - # remove duplicate symbols from binary - dwz ${{ matrix.bin }} -L none -o Middleman.debug - # make the debug symbols compressed - objcopy --compress-debug-sections Middleman.debug FinalMan.debug - # overwrite the original file - mv FinalMan.debug ${{ matrix.bin }} + # - name: Shrink debug symbols + # if: ${{ !matrix.strip }} + # run: | + # # remove duplicate symbols from binary + # dwz ${{ matrix.bin }} -L none -o Middleman.debug + # # make the debug symbols compressed + # objcopy --compress-debug-sections Middleman.debug FinalMan.debug + # # overwrite the original file + # mv FinalMan.debug ${{ matrix.bin }} - name: Prepare artifact if: ${{ matrix.artifact }} diff --git a/mirror-godot-app/gameplay/space_object/scaled_model.gd b/mirror-godot-app/gameplay/space_object/scaled_model.gd index cc71802d..9fd36657 100644 --- a/mirror-godot-app/gameplay/space_object/scaled_model.gd +++ b/mirror-godot-app/gameplay/space_object/scaled_model.gd @@ -259,7 +259,7 @@ func _setup_new_physics_colliders(desired_shape_type: String) -> void: model_body.set_layer_name(&"NO_COLLIDE") var asset_hash = Net.file_client._file_cache.get_hash_for_asset(_space_object.asset_data.file_url) var cache_key = asset_hash + "-" + desired_shape_type - + if desired_shape_type == "Model Shapes": var promise = await _generate_model_shape_collision(cache_key) await promise.wait_till_fulfilled() @@ -296,7 +296,7 @@ func _generate_model_shape_collision(cache_key: String) -> Promise: else: Zone.hash_requests[cache_key] = 1 Zone.physics_hash_promises[cache_key] = Promise.new() - + var shapes: Array[JShape3D] = [] var transforms: Array[Transform3D] = [] for model_body in _model_provided_bodies: @@ -337,7 +337,7 @@ func _generate_mesh_collision(cache_key: String, is_concave: bool) -> Promise: var async_collider_construction = true var shape: JShape3D = null - + if not async_collider_construction: shape = Zone.shapes_generator.generate_shape_for_meshes(body, mesh_instances, is_concave)[0] else: @@ -345,7 +345,7 @@ func _generate_mesh_collision(cache_key: String, is_concave: bool) -> Promise: assert(promise != null) await promise.wait_till_fulfilled() shape = promise.get_result() - + assert(shape != null) body.shape = shape # to ensure the pointers always match we must set it to the same reference diff --git a/mirror-godot-app/prefabs/autoload/zone/collision_shape_generator/collision_shape_generator.gd b/mirror-godot-app/prefabs/autoload/zone/collision_shape_generator/collision_shape_generator.gd index 41770eb6..d451a447 100644 --- a/mirror-godot-app/prefabs/autoload/zone/collision_shape_generator/collision_shape_generator.gd +++ b/mirror-godot-app/prefabs/autoload/zone/collision_shape_generator/collision_shape_generator.gd @@ -126,4 +126,4 @@ class MeshPromisePair: var meshes: Array[MeshInstance3D] var promise: Promise var is_concave: bool - var rid_map \ No newline at end of file + var rid_map