Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/drhelius/geargrafx
Browse files Browse the repository at this point in the history
  • Loading branch information
drhelius committed Sep 1, 2024
2 parents 693d54a + 51c4afa commit 55b8406
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 9 deletions.
38 changes: 36 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,26 @@
This is an open source project with its ongoing development made possible thanks to the support by these awesome [backers](backers.md). If you find it useful, please, consider [sponsoring](https://github.com/sponsors/drhelius).

----------

![Geargrafx](https://github.com/user-attachments/assets/7db9eab6-e9c4-422d-a75f-3fde73d3d7f2)

## Downloads

- **Latest Builds**: [here](https://github.com/drhelius/Geargrafx/actions/workflows/geargrafx.yml)
- **Windows**:
- [Geargrafx-0.0.3-windows-x64.zip](https://github.com/drhelius/Geargrafx/releases/download/0.0.3/Geargrafx-0.0.3-windows-x64.zip)
- [Geargrafx-0.0.3-windows-arm64.zip](https://github.com/drhelius/Geargrafx/releases/download/0.0.3/Geargrafx-0.0.3-windows-arm64.zip)
- NOTE: If you have errors you may need to install:
- [Microsoft Visual C++ Redistributable](https://go.microsoft.com/fwlink/?LinkId=746572)
- [OpenGL Compatibility Pack](https://apps.microsoft.com/detail/9nqpsl29bfff)
- **macOS**:
- [Geargrafx-0.0.3-macos-arm.zip](https://github.com/drhelius/Geargrafx/releases/download/0.0.3/Geargrafx-0.0.3-macos-arm.zip)
- [Geargrafx-0.0.3-macos-intel.zip](https://github.com/drhelius/Geargrafx/releases/download/0.0.3/Geargrafx-0.0.3-macos-intel.zip)
- **Linux**:
- [Geargrafx-0.0.3-ubuntu-24.04.zip](https://github.com/drhelius/Geargrafx/releases/download/0.0.3/Geargrafx-1.1.0-ubuntu-24.04.zip)
- [Geargrafx-0.0.3-ubuntu-22.04.zip](https://github.com/drhelius/Geargrafx/releases/download/0.0.3/Geargrafx-1.1.0-ubuntu-22.04.zip)
- [Geargrafx-0.0.3-ubuntu-20.04.zip](https://github.com/drhelius/Geargrafx/releases/download/0.0.3/Geargrafx-1.1.0-ubuntu-20.04.zip)
- NOTE: You may need to install `libsdl2` and `libglew`

## Build Instructions

### Windows
Expand Down Expand Up @@ -70,6 +86,24 @@ cd platforms/bsd
gmake
```

### Libretro

- Ubuntu / Debian / Raspberry Pi (Raspbian):

``` shell
sudo apt install build-essential
cd platforms/libretro
make
```

- Fedora:

``` shell
sudo dnf install @development-tools gcc-c++
cd platforms/libretro
make
```

## Contributors

Thank you to all the people who have already contributed to Geargrafx!
Expand Down
4 changes: 2 additions & 2 deletions platforms/shared/desktop/emu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static void update_debug_sprites(void);

void emu_init(void)
{
emu_frame_buffer = new u8[HUC6270_MAX_RESOLUTION_WIDTH * HUC6270_MAX_RESOLUTION_HEIGHT * 4];
emu_frame_buffer = new u8[1024 * 512 * 4];
audio_buffer = new s16[GG_AUDIO_BUFFER_SIZE];

init_debug();
Expand Down Expand Up @@ -381,7 +381,7 @@ static void reset_buffers(void)
emu_debug_background_buffer_width = 32;
emu_debug_background_buffer_height = 32;

for (int i = 0; i < HUC6270_MAX_RESOLUTION_WIDTH * HUC6270_MAX_RESOLUTION_HEIGHT * 4; i++)
for (int i = 0; i < 1024 * 512 * 4; i++)
emu_frame_buffer[i] = 0;

for (int i = 0; i < GG_AUDIO_BUFFER_SIZE; i++)
Expand Down
10 changes: 5 additions & 5 deletions platforms/shared/desktop/gui_debug_memeditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -432,13 +432,13 @@ void MemEditor::DrawSelectionFrame(int x, int y, int address, ImVec2 cell_pos, I
cell_size.x += m_separator_column_width + 1;
}

if (x == 0 || address == start)
m_draw_list->AddLine(cell_pos + ImVec2(-1, -1), cell_pos + ImVec2(-1, cell_size.y - (multiline ? 1.0f: 0.0f)), ImColor(frame_color), 1);
if ((x == 0) || (address == start))
m_draw_list->AddLine(cell_pos + ImVec2(-1, -1), cell_pos + ImVec2(-1, cell_size.y), ImColor(frame_color), 1);

if (x == (m_bytes_per_row - 1) || (address) == end)
m_draw_list->AddLine(cell_pos + ImVec2(cell_size.x, (multiline ? 0.0f: -1.0f)), cell_pos + ImVec2(cell_size.x, cell_size.y), ImColor(frame_color), 1);
if ((x == (m_bytes_per_row - 1)) || (address == end))
m_draw_list->AddLine(cell_pos + ImVec2(cell_size.x, multiline && (address == end) && (x != (m_bytes_per_row - 1)) ? 0 : -1), cell_pos + ImVec2(cell_size.x, cell_size.y), ImColor(frame_color), 1);

if (y == 0 || (address - m_bytes_per_row) < start)
if ((y == 0) || ((address - m_bytes_per_row) < start))
m_draw_list->AddLine(cell_pos + ImVec2(-1, -1), cell_pos + ImVec2(cell_size.x, -1), ImColor(frame_color), 1);

if ((address + m_bytes_per_row) > end)
Expand Down

0 comments on commit 55b8406

Please sign in to comment.