Skip to content

Commit

Permalink
Format and YML CICD fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
RevoluPowered committed Mar 26, 2024
1 parent 2fa632c commit e25035c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/linux_builds_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
8 changes: 4 additions & 4 deletions mirror-godot-app/gameplay/space_object/scaled_model.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -337,15 +337,15 @@ 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:
var promise = Zone.shapes_generator.async_generate_shape_for_meshes(body, mesh_instances, is_concave)
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@ class MeshPromisePair:
var meshes: Array[MeshInstance3D]
var promise: Promise
var is_concave: bool
var rid_map
var rid_map

0 comments on commit e25035c

Please sign in to comment.