Compare commits

..

9 Commits

Author SHA1 Message Date
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
11 changed files with 24 additions and 7 deletions
+2
View File
@@ -0,0 +1,2 @@
github: loganmc10
patreon: loganmc10
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "gopher64"
version = "0.1.0"
version = "0.1.2"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -13,7 +13,7 @@ sevenz-rust = "0.5"
chrono = "0.4"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
eframe = "0.23"
eframe = "0.24"
rfd = {version = "0.12", default-features = false, features = ["xdg-portal"] }
sha2 = "0.10"
rusttype = "0.9"
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;
+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 -1
View File
@@ -56,8 +56,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 +122,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())
}
};