rearrange windows

This commit is contained in:
2023-07-08 23:21:47 -05:00
parent ff76817796
commit b9f0079854
2 changed files with 16 additions and 9 deletions
+12 -7
View File
@@ -248,7 +248,8 @@ fn main() {
if state.debug_options.show_debug_window { if state.debug_options.show_debug_window {
let window = imgui::Window::new("Debug window"); let window = imgui::Window::new("Debug window");
window window
.size([300.0, 100.0], Condition::FirstUseEver) .position([15.0, 885.0], imgui::Condition::FirstUseEver)
.size([300.0, 300.0], Condition::FirstUseEver)
.opened(&mut state.debug_options.show_debug_window) .opened(&mut state.debug_options.show_debug_window)
.build(&ui, || { .build(&ui, || {
ui.text("Controls:"); ui.text("Controls:");
@@ -295,7 +296,8 @@ fn main() {
if state.ppudebug.is_enabled { if state.ppudebug.is_enabled {
let window = imgui::Window::new("PPU Debugging options"); let window = imgui::Window::new("PPU Debugging options");
window window
.size([300.0, 400.0], Condition::FirstUseEver) .position([330.0, 885.0], imgui::Condition::FirstUseEver)
.size([180.0, 280.0], Condition::FirstUseEver)
.build(&ui, || { .build(&ui, || {
ui.text("Backgrounds:"); ui.text("Backgrounds:");
for bgdebug in state.ppudebug.backgrounds.iter_mut() { for bgdebug in state.ppudebug.backgrounds.iter_mut() {
@@ -352,7 +354,8 @@ fn main() {
if state.debug_options.show_cpu_registers { if state.debug_options.show_cpu_registers {
let window = imgui::Window::new("CPU Registers"); let window = imgui::Window::new("CPU Registers");
window window
.size([150.0, 200.0], Condition::FirstUseEver) .position([15.0, 480.0], Condition::FirstUseEver)
.size([220.0, 310.0], Condition::FirstUseEver)
.build(&ui, || { .build(&ui, || {
ui.text(format!("SP: | {:#06X}", emulator.cpu.registers.sp)); ui.text(format!("SP: | {:#06X}", emulator.cpu.registers.sp));
ui.text(format!("X: | {:#06X}", emulator.cpu.registers.x)); ui.text(format!("X: | {:#06X}", emulator.cpu.registers.x));
@@ -376,18 +379,19 @@ fn main() {
if state.debug_options.show_cpu_disassembler { if state.debug_options.show_cpu_disassembler {
let window = imgui::Window::new("CPU Disassembler"); let window = imgui::Window::new("CPU Disassembler");
window window
.size([150.0, 200.0], Condition::FirstUseEver) .position([15.0, 800.0], imgui::Condition::FirstUseEver)
.size([300.0, 70.0], Condition::FirstUseEver)
.build(&ui, || { .build(&ui, || {
ui.text("Upcoming instruction:"); ui.text("Upcoming instruction:");
ui.text(cpu_debug::CPUDisassembler::get_next_instruction(&mut emulator)); ui.text(cpu_debug::CPUDisassembler::get_next_instruction(&mut emulator));
ui.separator();
}); });
} }
if state.debug_options.memory_map.is_enabled { if state.debug_options.memory_map.is_enabled {
let window = imgui::Window::new("Memory Map"); let window = imgui::Window::new("Memory Map");
window window
.size([400.0, 400.0], Condition::FirstUseEver) .position([500.0, 30.0], Condition::FirstUseEver)
.size([450.0, 480.0], Condition::FirstUseEver)
.build(&ui, || { .build(&ui, || {
let page_start_input = ui.input_text( let page_start_input = ui.input_text(
"Page start", "Page start",
@@ -461,7 +465,8 @@ fn main() {
tex.write(&queue, &vec![0xAA; 400 * 400 * 4], 400, 400); tex.write(&queue, &vec![0xAA; 400 * 400 * 4], 400, 400);
let game_window = imgui::Window::new("Game"); let game_window = imgui::Window::new("Game");
game_window game_window
.size([600.0, 600.0], Condition::FirstUseEver) .position([15.0, 30.0], Condition::FirstUseEver)
.size([425.0, 440.0], Condition::FirstUseEver)
.collapsible(false) .collapsible(false)
.build(&ui, || { .build(&ui, || {
let game_image = imgui::Image::new(texture_id, [400.0, 400.0]); let game_image = imgui::Image::new(texture_id, [400.0, 400.0]);
+4 -2
View File
@@ -125,7 +125,8 @@ fn get_register_name(register: u16) -> &'static str {
pub fn registers_window(ppu_registers: &PPURegisters, show_registers: &mut bool, ui: &imgui::Ui) { pub fn registers_window(ppu_registers: &PPURegisters, show_registers: &mut bool, ui: &imgui::Ui) {
let window = imgui::Window::new("PPU Registers"); let window = imgui::Window::new("PPU Registers");
window window
.size([300.0, 400.0], imgui::Condition::FirstUseEver) .position([250.0, 480.0], imgui::Condition::FirstUseEver)
.size([230.0, 310.0], imgui::Condition::FirstUseEver)
.opened(show_registers) .opened(show_registers)
.build(ui, || { .build(ui, || {
ui.text("Registers:"); ui.text("Registers:");
@@ -140,7 +141,8 @@ pub fn registers_window(ppu_registers: &PPURegisters, show_registers: &mut bool,
pub fn vram_window(ppu_registers: &PPURegisters, vram_debug: &mut VRAMMap, show_vram: &mut bool, ui: &imgui::Ui) { pub fn vram_window(ppu_registers: &PPURegisters, vram_debug: &mut VRAMMap, show_vram: &mut bool, ui: &imgui::Ui) {
let window = imgui::Window::new("VRAM"); let window = imgui::Window::new("VRAM");
window window
.size([300.0, 400.0], imgui::Condition::FirstUseEver) .size([450.0, 435.0], imgui::Condition::FirstUseEver)
.position([500.0, 530.0], imgui::Condition::FirstUseEver)
.opened(show_vram) .opened(show_vram)
.build(ui, || { .build(ui, || {
let address_start_input = ui.input_text( let address_start_input = ui.input_text(