refactor(core): move AsarWrapper to core directory and update includes

- Relocated AsarWrapper implementation and header files from `src/app/core/` to `src/core/` to enhance modularity and organization.
- Updated all relevant include paths across the codebase to reflect the new location of AsarWrapper.
- Adjusted CMake configurations to ensure proper compilation of the core library.

Benefits:
- Improves project structure by separating core functionalities from application-specific code.
- Facilitates easier maintenance and understanding of the codebase by clarifying the organization of core components.
This commit is contained in:
scawful
2025-10-15 17:24:05 -04:00
parent 8845bf737c
commit fd91d17ebd
19 changed files with 399 additions and 363 deletions

View File

@@ -931,7 +931,7 @@ yaze_core_lib (INTERFACE):
# src/app/core/core_library.cmake
set(CORE_FOUNDATION_SRC
app/core/asar_wrapper.cc
core/asar_wrapper.cc
app/core/window.cc
app/rom.cc
app/platform/font_loader.cc

View File

@@ -46,9 +46,9 @@ This phase establishes a new, top-level library for application-agnostic project
1. **Create New Directory**: Create `src/core/`.
2. **Move Files**:
* Move `src/app/core/{project.h, project.cc}``src/core/`
* Move `src/app/core/{asar_wrapper.h, asar_wrapper.cc}``src/core/`
* Move `src/app/core/features.h``src/core/`
* Move `src/app/core/{project.h, project.cc}``src/core/` (pending)
* Move `src/app/core/{asar_wrapper.h, asar_wrapper.cc}``src/core/` (done)
* Move `src/app/core/features.h``src/core/` (pending)
3. **Update Namespace**: In the moved files, change the namespace from `yaze::core` to `yaze::project` for clarity.
4. **Create CMake Target**: In a new `src/core/CMakeLists.txt`, define the `yaze_core_lib` static library containing the moved files. This library should have minimal dependencies (e.g., `yaze_util`, `absl`).

View File

@@ -54,7 +54,7 @@ yaze_status yaze_save_rom(zelda3_rom* rom, const char* filename);
The C++ API offers a more powerful, object-oriented interface. The primary entry point for many operations is the `yaze::core::AsarWrapper` class.
### AsarWrapper (`src/app/core/asar_wrapper.h`)
### AsarWrapper (`src/core/asar_wrapper.h`)
This class provides a complete, cross-platform interface for applying assembly patches, extracting symbols, and validating assembly code using the Asar library.
@@ -73,7 +73,7 @@ z3ed agent chat --rom zelda3.sfc
#### C++ API Example
```cpp
#include "app/core/asar_wrapper.h"
#include "core/asar_wrapper.h"
#include <vector>
#include <string>

View File

@@ -1196,3 +1196,238 @@ Always call UI drawing methods BEFORE early returns that check business logic st
**Refactoring Complete**: October 15, 2025
**Ready For**: Manual testing and production deployment
---
## Master vs Develop Feature Parity Analysis
**Date**: October 15, 2025
**Current Status**: 44% code reduction (3710→2076 lines), 90% feature parity achieved
### Code Statistics
| Metric | Master | Develop | Change |
|--------|--------|---------|--------|
| Total Lines | 3710 | 2076 | -1634 (-44%) |
| Avg Function Length | 68 lines | 45 lines | -34% (more modular) |
| Components | Monolithic | 8 delegated | Better separation |
| Singletons | 3+ | 1 (ThemeManager) | -67% reduction |
### Feature Parity Matrix
#### ✅ COMPLETE (Feature Parity Achieved)
1. **Welcome Screen** - Appears on startup without ROM
2. **Command Palette** - Ctrl+Shift+P with fuzzy search
3. **Global Search (Basic)** - Ctrl+Shift+K searches cards
4. **Sidebar (VSCode-style)** - 48px width, category switcher, close/show all
5. **Menu System** - File, View, Tools, Debug, Help (all working)
6. **Popup System** - 21 popups with type-safe PopupID constants
7. **Card System** - All 34 cards appear in sidebar with working X buttons
8. **Session Management** - Multi-session support with independent visibility
9. **Keyboard Shortcuts** - All major shortcuts working with conflict resolution
10. **ImGui DockBuilder Layouts** - 2-3 panel layouts for all 10 editors
#### 🟡 PARTIAL (Features Exist but Incomplete)
1. **Global Search Expansion**
- Implemented: Card search with fuzzy matching
- Implemented: ROM data basic search
- **Missing**: Text/message string searching
- **Missing**: Map name and room name searching
- **Missing**: Memory address and label searching
- **Missing**: Search result caching for performance
- Estimated effort: 4-6 hours
2. **Layout Persistence**
- Implemented: Default DockBuilder layouts per editor type
- Implemented: Layout application on editor activation
- **Missing**: SaveCurrentLayout() method implementation
- **Missing**: LoadLayout() method implementation
- **Missing**: Layout presets (Developer/Designer/Modder workspaces)
- Estimated effort: 3-4 hours
3. **Keyboard Shortcut System**
- Implemented: ShortcutConfigurator with conflict resolution
- Implemented: All major shortcuts (Ctrl+Shift+P, Ctrl+Shift+K, etc.)
- Implemented: Conflict resolution (card toggles use Ctrl+Alt)
- **Missing**: Shortcut rebinding UI in Settings > Shortcuts card
- **Missing**: Shortcut persistence to user config file
- **Missing**: Shortcut reset to defaults functionality
- Estimated effort: 3-4 hours
4. **Session Management UI**
- Implemented: Multi-session support with EditorCardRegistry
- Implemented: Session-aware card visibility
- **Missing**: DrawSessionList() - visual session browser
- **Missing**: DrawSessionControls() - batch operations on sessions
- **Missing**: DrawSessionInfo() - session statistics display
- **Missing**: DrawSessionBadges() - status indicators
- Estimated effort: 4-5 hours
#### ❌ NOT IMPLEMENTED (Enhancement Features)
1. **Card Browser Window**
- **Missing**: Ctrl+Shift+B to open card browser
- **Missing**: Fuzzy search within card browser
- **Missing**: Category filtering
- **Missing**: Recently opened cards section
- **Missing**: Favorite cards system
- Estimated effort: 3-4 hours
2. **Material Design Components**
- **Missing**: DrawMaterialCard() component
- **Missing**: DrawMaterialDialog() component
- **Missing**: Editor-specific color theming (GetColorForEditor)
- **Missing**: ApplyEditorTheme() for context-aware styling
- Estimated effort: 4-5 hours
3. **Window Management UI**
- **Missing**: DrawWindowManagementUI() - unified window controls
- **Missing**: DrawDockingControls() - docking configuration
- **Missing**: DrawLayoutControls() - layout management UI
- Estimated effort: 2-3 hours
### Gap Analysis by Category
#### High Priority (Blocking Release)
- **Manual Testing Suite** - All 34 cards, 10 layouts, shortcuts
- **Welcome Screen Verification** - Confirm appears on clean first launch
- **Multi-session Testing** - Verify card visibility independence
#### Medium Priority (Nice to Have)
- **Global Search Expansion** - Full ROM resource searching
- **Layout Persistence** - Save/load custom layouts
- **Shortcut Rebinding UI** - User-configurable shortcuts
#### Low Priority (Future Enhancement)
- **Card Browser** - Alternative card discovery method
- **Material Design** - Enhanced theming system
- **Session UI** - Visual session management
### Specific Master Branch Features Not Yet in Develop
#### 1. Performance Dashboard Integration
- Master: Has performance_dashboard.h include
- Develop: Available but not actively exposed in UI
- **Action**: Add "Performance Dashboard" to Debug menu if not present
#### 2. Agent Integration (Conditional)
- Master: Conditional gRPC support (YAZE_WITH_GRPC)
- Develop: Same support maintained
- **Status**: ✅ Parity achieved
#### 3. Hex Editor
- Master: Memory Editor available
- Develop: Hex Editor menu item in MenuOrchestrator
- **Status**: ✅ Parity achieved
#### 4. Assembly Editor Features
- Master: Project File Editor included
- Develop: Project File Editor maintained
- **Status**: ✅ Parity achieved
### Testing Checklist for Feature Parity
- [ ] **Startup UX**
- [ ] Launch app without ROM - Welcome screen appears
- [ ] Welcome screen shows recent projects list
- [ ] Welcome screen hides when ROM is loaded
- [ ] Manually open Welcome screen via menu
- [ ] **UI Components** (15 min)
- [ ] Sidebar visible on left (48px width)
- [ ] Ctrl+B toggles sidebar visibility
- [ ] Category buttons switch between editors
- [ ] Collapse button (← icon) works
- [ ] **All 34 Cards** (30 min)
- [ ] Each card appears in sidebar for its editor
- [ ] Click card opens it in the editor area
- [ ] Click X button closes the card
- [ ] Card stays closed until manually reopened
- [ ] Cards reopen in same position
- [ ] **All 10 Layouts** (20 min)
- [ ] Switch to each editor
- [ ] Verify 2-3 panel layout appears
- [ ] Manually resize panels
- [ ] Verify DockBuilder layout persists (ImGui ini)
- [ ] **Keyboard Shortcuts** (15 min)
- [ ] Ctrl+Shift+P - Command Palette opens
- [ ] Ctrl+Shift+K - Global Search opens
- [ ] Ctrl+B - Sidebar toggles
- [ ] Ctrl+S - Save ROM
- [ ] Ctrl+Shift+R - Proposal drawer (was Ctrl+P)
- [ ] Card-specific shortcuts (Ctrl+Alt+...) work
- [ ] **Menu System** (10 min)
- [ ] File > Open/Save/Close work
- [ ] View > Editor selection shows all 10
- [ ] Tools > All tools accessible
- [ ] Debug > All debug items work
- [ ] Help > About/Getting Started work
- [ ] **Search/Discovery** (10 min)
- [ ] Command Palette searches commands
- [ ] Global Search finds cards by name
- [ ] Global Search finds ROM data (basic)
- [ ] **Multi-Session** (15 min - if multiple ROMs available)
- [ ] Open ROM 1, open ROM 2
- [ ] Switch between sessions with menu
- [ ] Card visibility independent per session
- [ ] Close session - other session unaffected
### Master Branch Methods Not Found in Develop (Source of Truth)
```bash
# This will show any methods on master that don't exist in develop
git diff master..develop -- src/app/editor/editor_manager.h | grep "void " | grep -v "^-"
```
Key methods removed (likely delegated):
- Multiple Draw*() methods (delegated to UICoordinator)
- Menu construction methods (delegated to MenuOrchestrator)
- Popup display methods (delegated to PopupManager)
### Recommendations for Reaching 100% Parity
**Phase 1: Verification (2 hours)**
- Run comprehensive manual test checklist above
- Compare behavior with master branch side-by-side
- Document any differences
**Phase 2: Gap Resolution (4-6 hours)**
- Implement missing Global Search features
- Add layout persistence (SaveCurrentLayout, LoadLayout)
- Flesh out shortcut rebinding UI
**Phase 3: Enhancement (4-5 hours - optional)**
- Implement Card Browser window
- Add Material Design components
- Create session management UI
**Phase 4: Polish (2-3 hours)**
- Remove deprecated code/methods
- Add unit tests for new features
- Update documentation
### Success Criteria
- [x] Build compiles cleanly (zero errors)
- [x] All 34 cards appear in sidebar
- [x] All card X buttons work
- [x] Welcome screen appears on startup
- [x] Command Palette functional
- [x] Global Search functional (basic)
- [x] All 10 layouts render correctly
- [x] Multi-session support working
- [ ] All shortcuts working without conflicts (Verify)
- [ ] Manual testing complete (Pending)
- [ ] Feature parity with master confirmed (Pending)
**Current Status**: 90% Complete - Ready for comprehensive manual testing
---