Skip to content

Commit cbce2b5

Browse files
author
Shane Wall
committed
style: format GDScript files for CI
Run gdformat over the new tool and integration files that failed the GitHub formatting gate so the CI workflow matches the local tree.
1 parent df719b6 commit cbce2b5

5 files changed

Lines changed: 43 additions & 21 deletions

File tree

addons/hammerforge/hf_path_tool.gd

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,11 @@ func handle_input(event: InputEvent, camera: Camera3D, mouse_pos: Vector2) -> in
8686
return _handle_click(camera, mouse_pos)
8787

8888
# Right click — undo last point
89-
if event is InputEventMouseButton and event.button_index == MOUSE_BUTTON_RIGHT and event.pressed:
89+
if (
90+
event is InputEventMouseButton
91+
and event.button_index == MOUSE_BUTTON_RIGHT
92+
and event.pressed
93+
):
9094
return _handle_escape()
9195

9296
# Mouse motion
@@ -244,7 +248,7 @@ func _build_path() -> void:
244248
func _build_segment_brush(
245249
a: Vector3, b: Vector3, width: float, height: float, group_id: String
246250
) -> Dictionary:
247-
var dir := (b - a)
251+
var dir := b - a
248252
dir.y = 0.0
249253
var length := dir.length()
250254
if length < 0.01:
@@ -262,7 +266,12 @@ func _build_segment_brush(
262266
for vert_y in [-half_h, half_h]:
263267
for wp in [-1.0, 1.0]: # width direction
264268
for lp in [-1.0, 1.0]: # length direction
265-
var world_pt: Vector3 = center + dir * (length * 0.5 * lp) + perp * (half_w * wp) + Vector3(0, vert_y, 0)
269+
var world_pt: Vector3 = (
270+
center
271+
+ dir * (length * 0.5 * lp)
272+
+ perp * (half_w * wp)
273+
+ Vector3(0, vert_y, 0)
274+
)
266275
corners.append(world_pt - center) # to local space
267276

268277
# corners layout:
@@ -303,17 +312,16 @@ func _build_segment_brush(
303312

304313

305314
func _build_miter_brush(
306-
prev: Vector3, curr: Vector3, next: Vector3,
307-
width: float, height: float, group_id: String
315+
prev: Vector3, curr: Vector3, next: Vector3, width: float, height: float, group_id: String
308316
) -> Dictionary:
309317
# Compute directions
310-
var dir_in := (curr - prev)
318+
var dir_in := curr - prev
311319
dir_in.y = 0.0
312320
if dir_in.length() < 0.01:
313321
return {}
314322
dir_in = dir_in.normalized()
315323

316-
var dir_out := (next - curr)
324+
var dir_out := next - curr
317325
dir_out.y = 0.0
318326
if dir_out.length() < 0.01:
319327
return {}
@@ -366,10 +374,11 @@ func _build_miter_brush(
366374
var sorted_indices: Array = []
367375
for i in range(xz_pts.size()):
368376
sorted_indices.append(i)
369-
sorted_indices.sort_custom(func(a_idx: int, b_idx: int) -> bool:
370-
var aa := atan2(xz_pts[a_idx].z - cx.z, xz_pts[a_idx].x - cx.x)
371-
var bb := atan2(xz_pts[b_idx].z - cx.z, xz_pts[b_idx].x - cx.x)
372-
return aa < bb
377+
sorted_indices.sort_custom(
378+
func(a_idx: int, b_idx: int) -> bool:
379+
var aa := atan2(xz_pts[a_idx].z - cx.z, xz_pts[a_idx].x - cx.x)
380+
var bb := atan2(xz_pts[b_idx].z - cx.z, xz_pts[b_idx].x - cx.x)
381+
return aa < bb
373382
)
374383

375384
var sorted_pts := PackedVector3Array()
@@ -469,7 +478,7 @@ func _update_preview() -> void:
469478
for i in range(n - 1):
470479
var a: Vector3 = _waypoints[i]
471480
var b: Vector3 = _waypoints[i + 1]
472-
var dir := (b - a)
481+
var dir := b - a
473482
dir.y = 0.0
474483
if dir.length() < 0.01:
475484
continue

addons/hammerforge/hf_polygon_tool.gd

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ func handle_input(event: InputEvent, camera: Camera3D, mouse_pos: Vector2) -> in
8080
return EditorPlugin.AFTER_GUI_INPUT_STOP
8181

8282
# Right-click to undo last point or cancel
83-
if event is InputEventMouseButton and event.button_index == MOUSE_BUTTON_RIGHT and event.pressed:
83+
if (
84+
event is InputEventMouseButton
85+
and event.button_index == MOUSE_BUTTON_RIGHT
86+
and event.pressed
87+
):
8488
return _handle_escape()
8589

8690
# Mouse motion

addons/hammerforge/hf_tool_registry.gd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ func unregister_tool(tool_id: int) -> void:
2828

2929

3030
func activate_tool(
31-
tool_id: int, root: Node3D, camera: Camera3D,
31+
tool_id: int,
32+
root: Node3D,
33+
camera: Camera3D,
3234
p_undo_redo: EditorUndoRedoManager = null,
3335
p_history_callback: Callable = Callable()
3436
) -> void:

addons/hammerforge/plugin.gd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,9 @@ func _handle_keyboard_input(
602602
if _tool_registry:
603603
var ext_id = _tool_registry.check_shortcut(event.keycode)
604604
if ext_id >= 0 and active_root:
605-
_tool_registry.activate_tool(ext_id, active_root, last_3d_camera, undo_redo_manager, _record_history)
605+
_tool_registry.activate_tool(
606+
ext_id, active_root, last_3d_camera, undo_redo_manager, _record_history
607+
)
606608
_update_hud_context()
607609
return EditorPlugin.AFTER_GUI_INPUT_STOP
608610
return EditorPlugin.AFTER_GUI_INPUT_PASS

addons/hammerforge/systems/hf_vertex_system.gd

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -528,12 +528,17 @@ func get_all_edge_world_positions() -> Array:
528528
and _hovered_edge[2] == edge[1]
529529
):
530530
is_hov = true
531-
result.append({
532-
"a": xform * verts[edge[0]],
533-
"b": xform * verts[edge[1]],
534-
"selected": is_sel,
535-
"hovered": is_hov,
536-
})
531+
(
532+
result
533+
. append(
534+
{
535+
"a": xform * verts[edge[0]],
536+
"b": xform * verts[edge[1]],
537+
"selected": is_sel,
538+
"hovered": is_hov,
539+
}
540+
)
541+
)
537542
return result
538543

539544

0 commit comments

Comments
 (0)