Skip to content

Merge v7-1C editor refactor#64

Merged
stainlu merged 2 commits into
mainfrom
fix-merge-v7
Mar 21, 2026
Merged

Merge v7-1C editor refactor#64
stainlu merged 2 commits into
mainfrom
fix-merge-v7

Conversation

@stainlu
Copy link
Copy Markdown
Owner

@stainlu stainlu commented Mar 21, 2026

Conflict resolution for editor.rs refactor

stainlu and others added 2 commits March 21, 2026 15:41
Refactor examples/editor.rs from 1512 to 1346 lines by extracting
8 helper functions from EditorApp methods:

- setup_default_resources(): all 20 world resource insertions
- run_gameplay_systems(): physics/gameplay/combat/rules/audio tick
- collect_draw_commands(): base renderable entity collection
- append_selection_outline(): selection highlight draw command
- append_gizmo_commands(): gizmo axis handle draw commands
- append_foliage_instances(): foliage instancing draw commands
- draw_health_bars(): world-space health bar overlay
- draw_hud_overlay(): in-game HUD text/bars/rects

Also condenses the material palette upload from 70+ lines of
individual upload() calls into a 12-entry table-driven loop.

Pure refactoring — no behavioral changes.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@stainlu stainlu merged commit 80fcfe5 into main Mar 21, 2026
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant