Skip to content

Commit e25035c

Browse files
committed
Format and YML CICD fixes
1 parent 2fa632c commit e25035c

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

.github/workflows/linux_builds_deployment.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ jobs:
8686
run: |
8787
strip bin/godot.*
8888
89-
- name: Shrink debug symbols
90-
if: ${{ !matrix.strip }}
91-
run: |
92-
# remove duplicate symbols from binary
93-
dwz ${{ matrix.bin }} -L none -o Middleman.debug
94-
# make the debug symbols compressed
95-
objcopy --compress-debug-sections Middleman.debug FinalMan.debug
96-
# overwrite the original file
97-
mv FinalMan.debug ${{ matrix.bin }}
89+
# - name: Shrink debug symbols
90+
# if: ${{ !matrix.strip }}
91+
# run: |
92+
# # remove duplicate symbols from binary
93+
# dwz ${{ matrix.bin }} -L none -o Middleman.debug
94+
# # make the debug symbols compressed
95+
# objcopy --compress-debug-sections Middleman.debug FinalMan.debug
96+
# # overwrite the original file
97+
# mv FinalMan.debug ${{ matrix.bin }}
9898

9999
- name: Prepare artifact
100100
if: ${{ matrix.artifact }}

mirror-godot-app/gameplay/space_object/scaled_model.gd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ func _setup_new_physics_colliders(desired_shape_type: String) -> void:
259259
model_body.set_layer_name(&"NO_COLLIDE")
260260
var asset_hash = Net.file_client._file_cache.get_hash_for_asset(_space_object.asset_data.file_url)
261261
var cache_key = asset_hash + "-" + desired_shape_type
262-
262+
263263
if desired_shape_type == "Model Shapes":
264264
var promise = await _generate_model_shape_collision(cache_key)
265265
await promise.wait_till_fulfilled()
@@ -296,7 +296,7 @@ func _generate_model_shape_collision(cache_key: String) -> Promise:
296296
else:
297297
Zone.hash_requests[cache_key] = 1
298298
Zone.physics_hash_promises[cache_key] = Promise.new()
299-
299+
300300
var shapes: Array[JShape3D] = []
301301
var transforms: Array[Transform3D] = []
302302
for model_body in _model_provided_bodies:
@@ -337,15 +337,15 @@ func _generate_mesh_collision(cache_key: String, is_concave: bool) -> Promise:
337337

338338
var async_collider_construction = true
339339
var shape: JShape3D = null
340-
340+
341341
if not async_collider_construction:
342342
shape = Zone.shapes_generator.generate_shape_for_meshes(body, mesh_instances, is_concave)[0]
343343
else:
344344
var promise = Zone.shapes_generator.async_generate_shape_for_meshes(body, mesh_instances, is_concave)
345345
assert(promise != null)
346346
await promise.wait_till_fulfilled()
347347
shape = promise.get_result()
348-
348+
349349
assert(shape != null)
350350
body.shape = shape
351351
# to ensure the pointers always match we must set it to the same reference

mirror-godot-app/prefabs/autoload/zone/collision_shape_generator/collision_shape_generator.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,4 +126,4 @@ class MeshPromisePair:
126126
var meshes: Array[MeshInstance3D]
127127
var promise: Promise
128128
var is_concave: bool
129-
var rid_map
129+
var rid_map

0 commit comments

Comments
 (0)