Compare commits

...

29 Commits

Author SHA1 Message Date
Logan McNaughton b8ce85b9fd update parallel rdp 2024-05-24 11:22:14 -06:00
Logan McNaughton 49ba66f0a3 Fix linter errors (#55) 2024-05-02 07:29:48 -06:00
dependabot[bot] 0bad5999c1 Update zip requirement from 0.6 to 1.1 (#53)
---
updated-dependencies:
- dependency-name: zip
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-21 20:44:19 -06:00
dependabot[bot] 2911be7deb Update sevenz-rust requirement from 0.5 to 0.6 (#52)
---
updated-dependencies:
- dependency-name: sevenz-rust
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-07 20:49:42 -06:00
dependabot[bot] 7ea1516d52 Update eframe requirement from 0.26 to 0.27 (#51)
Updates the requirements on [eframe](https://github.com/emilk/egui) to permit the latest version.
- [Release notes](https://github.com/emilk/egui/releases)
- [Changelog](https://github.com/emilk/egui/blob/master/CHANGELOG.md)
- [Commits](https://github.com/emilk/egui/compare/0.26.0...0.27.0)

---
updated-dependencies:
- dependency-name: eframe
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-03-26 20:53:38 -06:00
Logan McNaughton 3bac21a908 bump version to 0.1.5 (#50) 2024-03-21 12:05:28 -06:00
Logan McNaughton 182cb78649 Use rust stable (#39) 2024-03-21 07:19:34 -06:00
Logan McNaughton 42919d141a clean up RFD features (#49) 2024-02-25 19:25:26 -07:00
dependabot[bot] 979c3666df Update rfd requirement from 0.13 to 0.14 (#48)
Updates the requirements on [rfd](https://github.com/PolyMeilex/rfd) to permit the latest version.
- [Release notes](https://github.com/PolyMeilex/rfd/releases)
- [Changelog](https://github.com/PolyMeilex/rfd/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PolyMeilex/rfd/compare/0.13.0...0.14.0)

---
updated-dependencies:
- dependency-name: rfd
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-25 19:18:51 -07:00
Logan McNaughton 4ff7a640d8 Update rust beta (#44) 2024-02-08 07:29:35 -07:00
dependabot[bot] 97928e1612 Update eframe requirement from 0.25 to 0.26 (#46)
Updates the requirements on [eframe](https://github.com/emilk/egui) to permit the latest version.
- [Release notes](https://github.com/emilk/egui/releases)
- [Changelog](https://github.com/emilk/egui/blob/master/CHANGELOG.md)
- [Commits](https://github.com/emilk/egui/compare/0.25.0...0.26.0)

---
updated-dependencies:
- dependency-name: eframe
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-05 21:17:15 -07:00
Logan McNaughton 19354fe732 bump version to 0.1.4 (#41) 2024-01-28 12:42:20 -07:00
Logan McNaughton febf321d58 Update download link (#42) 2024-01-28 12:33:52 -07:00
Logan McNaughton 1dcfe3a25d Use sdl crate v0.36 (#40) 2024-01-28 12:11:56 -07:00
Logan McNaughton 93aafafa75 Remove string_remove_matches (#38) 2024-01-22 08:47:57 -07:00
Logan McNaughton 44dd53b367 round_ties_even is default now (#37) 2024-01-22 08:31:19 -07:00
Logan McNaughton 1ffa586789 bump version to 0.1.3 (#36) 2024-01-14 21:05:28 -07:00
Logan McNaughton f12baef633 Update rfd (#35) 2024-01-14 20:45:58 -07:00
dependabot[bot] 3e4efe110b Update eframe requirement from 0.24 to 0.25 (#33)
Updates the requirements on [eframe](https://github.com/emilk/egui) to permit the latest version.
- [Release notes](https://github.com/emilk/egui/releases)
- [Changelog](https://github.com/emilk/egui/blob/master/CHANGELOG.md)
- [Commits](https://github.com/emilk/egui/compare/0.24.0...0.25.0)

---
updated-dependencies:
- dependency-name: eframe
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-08 19:36:18 -07:00
dependabot[bot] 981a8e8f05 Bump actions/upload-artifact from 3 to 4 (#32)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-14 19:56:37 -07:00
Logan McNaughton 13d6992ca1 bump ver to 0.1.2 2023-11-24 09:03:23 -07:00
Logan McNaughton 5af1c1f7ee Update eframe/egui (#29) 2023-11-24 09:03:01 -07:00
Logan McNaughton 00c236ce8c fix linter 2023-11-05 21:51:41 -07:00
Logan McNaughton 034fa7c29c fix window resize 2023-11-05 20:31:08 -07:00
Logan McNaughton ac30d7a6dd update ver to 0.1.1 2023-11-05 20:08:59 -07:00
Logan McNaughton e848789965 Create FUNDING.yml 2023-11-04 12:54:15 -06:00
Logan McNaughton 2f1a1b1479 fix small gui bug 2023-11-03 09:03:01 -06:00
Logan McNaughton 52caa9cee3 more 2023-11-02 12:44:49 -06:00
Logan McNaughton e848bfbd81 fix crash 2023-11-02 12:17:39 -06:00
16 changed files with 40 additions and 27 deletions
+2
View File
@@ -0,0 +1,2 @@
github: loganmc10
patreon: loganmc10
+4 -4
View File
@@ -26,7 +26,7 @@ jobs:
run: |
cargo build --release -v
- name: Upload file
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: gopher64-linux
path: target/release/gopher64
@@ -44,13 +44,13 @@ jobs:
run: |
cargo build --release -v
- name: Upload file
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: gopher64-windows
path: target/release/gopher64.exe
build-macos:
runs-on: macos-latest
runs-on: macos-13
steps:
- uses: actions/checkout@v4
with:
@@ -65,7 +65,7 @@ jobs:
run: |
cargo build --release -v
- name: Upload file
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: gopher64-mac
path: target/release/gopher64
+7 -7
View File
@@ -1,28 +1,28 @@
[package]
name = "gopher64"
version = "0.1.0"
version = "0.1.5"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
dirs = "5.0"
zip = "0.6"
zip = "1.1"
governor = "0.6"
sevenz-rust = "0.5"
sevenz-rust = "0.6"
chrono = "0.4"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
eframe = "0.23"
rfd = {version = "0.12", default-features = false, features = ["xdg-portal"] }
eframe = "0.27"
rfd = "0.14"
sha2 = "0.10"
rusttype = "0.9"
futures = "0.3"
sdl2-sys = { git = "https://github.com/Rust-SDL2/rust-sdl2.git" }
sdl2-sys = "0.36"
clap = { version = "4.4", features = ["derive"] }
[dependencies.sdl2]
git = "https://github.com/Rust-SDL2/rust-sdl2.git"
version = "0.36"
default-features = false
features = ["static-link","bundled"]
+1 -1
View File
@@ -56,4 +56,4 @@ Gopher64 is licensed under the GPLv3 license. Many portions of gopher64 have bee
## where to download
Builds can be found as artifacts on [GitHub Actions](https://github.com/gopher64/gopher64/actions?query=branch%3Amain)
https://github.com/gopher64/gopher64/releases
File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 79 KiB

+4
View File
@@ -184,11 +184,15 @@ int sdl_event_filter(void *userdata, SDL_Event *event)
{
if (event->type == SDL_WINDOWEVENT)
{
SDL_WSIPlatform *platform = (SDL_WSIPlatform *)&wsi->get_platform();
switch (event->window.event)
{
case SDL_WINDOWEVENT_CLOSE:
emu_running = 0;
break;
case SDL_WINDOWEVENT_RESIZED:
platform->do_resize();
break;
default:
break;
}
+5
View File
@@ -58,3 +58,8 @@ void SDL_WSIPlatform::set_window(SDL_Window *_window)
{
window = _window;
}
void SDL_WSIPlatform::do_resize()
{
resize = true;
}
+1
View File
@@ -14,6 +14,7 @@ public:
bool alive(Vulkan::WSI &wsi) override;
void poll_input() override;
void set_window(SDL_Window *_window);
void do_resize();
private:
VkSurfaceKHR surface;
-2
View File
@@ -1,2 +0,0 @@
[toolchain]
channel = "nightly"
+1 -1
View File
@@ -247,7 +247,7 @@ impl Device {
enabled: false,
count: u64::MAX,
handler: events::dummy_event,
}; events::EventType::EventTypeCount as usize],
}; events::EventType::Count as usize],
next_event_count: u64::MAX,
next_event: 0,
},
+1 -1
View File
@@ -31,7 +31,7 @@ pub struct Cpu {
pub instrs: [fn(&mut device::Device, u32); 64],
pub special_instrs: [fn(&mut device::Device, u32); 64],
pub regimm_instrs: [fn(&mut device::Device, u32); 32],
pub events: [device::events::Event; device::events::EventType::EventTypeCount as usize],
pub events: [device::events::Event; device::events::EventType::Count as usize],
pub next_event_count: u64,
pub next_event: usize,
}
+1 -1
View File
@@ -11,7 +11,7 @@ pub enum EventType {
InterruptCheck,
SPDma,
Compare,
EventTypeCount,
Count,
}
#[derive(PartialEq, Copy, Clone)]
+3 -3
View File
@@ -1,5 +1,3 @@
#![feature(round_ties_even)]
#![feature(string_remove_matches)]
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
mod device;
@@ -56,8 +54,10 @@ struct Args {
}
fn main() {
let config_dir = dirs::config_dir().unwrap().join("gopher64");
let cache_dir = dirs::cache_dir().unwrap().join("gopher64");
let _ = std::fs::create_dir_all(config_dir.clone());
let _ = std::fs::create_dir_all(cache_dir.clone());
let _ = std::fs::remove_file(cache_dir.clone().join("game_running"));
@@ -120,7 +120,7 @@ fn main() {
}
} else {
let options = eframe::NativeOptions {
initial_window_size: Some(eframe::egui::vec2(640.0, 480.0)),
viewport: eframe::egui::ViewportBuilder::default().with_inner_size([640.0, 480.0]),
..Default::default()
};
eframe::run_native(
+3 -1
View File
@@ -115,7 +115,9 @@ impl eframe::App for GopherEguiApp {
ui::input::configure_input_profile(&mut game_ui, profile_name);
});
self.configure_profile = false;
if !self.profile_name.is_empty() && self.profile_name != "default" {
if !self.profile_name.is_empty()
&& !self.input_profiles.contains(&self.profile_name)
{
self.input_profiles.push(self.profile_name.clone())
}
};
+5 -5
View File
@@ -97,27 +97,27 @@ pub fn init(ui: &mut ui::Ui) {
panic!("could not create save dir")
}
ui.paths.eep_file_path = base_path.clone();
ui.paths.eep_file_path.clone_from(&base_path);
ui.paths
.eep_file_path
.push(ui.game_id.to_owned() + "-" + &ui.game_hash + ".eep");
ui.paths.sra_file_path = base_path.clone();
ui.paths.sra_file_path.clone_from(&base_path);
ui.paths
.sra_file_path
.push(ui.game_id.to_owned() + "-" + &ui.game_hash + ".sra");
ui.paths.fla_file_path = base_path.clone();
ui.paths.fla_file_path.clone_from(&base_path);
ui.paths
.fla_file_path
.push(ui.game_id.to_owned() + "-" + &ui.game_hash + ".fla");
ui.paths.pak_file_path = base_path.clone();
ui.paths.pak_file_path.clone_from(&base_path);
ui.paths
.pak_file_path
.push(ui.game_id.to_owned() + "-" + &ui.game_hash + ".mpk");
ui.paths.romsave_file_path = base_path.clone();
ui.paths.romsave_file_path.clone_from(&base_path);
ui.paths
.romsave_file_path
.push(ui.game_id.to_owned() + "-" + &ui.game_hash + ".romsave");