New panel for setting cpu breakpoints.

Author: pherrymason

README.md

@@ -7,6 +7,7 @@
 
 ## Shortcuts
 - `p` Displays PPU Register debug panel.
+- `o` Displays Breakpoint debugger.
 
 
 # Status

src/debugger/breakpoints.go

@@ -0,0 +1,30 @@
+package debugger
+
+import "github.com/lachee/raylib-goplus/raylib"
+
+type breakpointDebugger struct {
+	panel *draggablePanel
+}
+
+const width = 300
+
+func NewBreakpointDebugger() *breakpointDebugger {
+	return &breakpointDebugger{
+		panel: NewDraggablePanel(
+			"Debugger · Breakpoints",
+			raylib.Vector2{300, 350},
+			width,
+			400,
+		),
+	}
+}
+
+func (bp *breakpointDebugger) Toggle() {
+	bp.panel.SetEnabled(!bp.panel.enabled)
+}
+
+func (dbg *breakpointDebugger) Draw() {
+	if !dbg.panel.Draw() {
+		return
+	}
+}

src/debugger/controller.go

@@ -11,42 +11,49 @@ import (
 
 const DEBUG_X_OFFSET = 300
 
-type DebuggerGUI struct {
+type Debugger struct {
 	chrPaletteSelector    uint8
 	overlayTileIdx        bool
 	overlayAttributeTable bool
 	font                  *raylib.Font
 
-	emulator    *nes.Nes
-	ppuDebugger *PPUDebugger
+	emulator           *nes.Nes
+	ppuDebugger        *PPUDebugger
+	breakpointDebugger *breakpointDebugger
 }
 
-func NewDebuggerGUI(emulator *nes.Nes) DebuggerGUI {
+type Panel interface {
+	Draw()
+}
+
+func NewDebugger(emulator *nes.Nes) Debugger {
 	font := raylib.LoadFont("./assets/Pixel_NES.otf")
+	raylib.GuiLoadStyle("./assets/style.rgs")
 
-	return DebuggerGUI{
+	return Debugger{
 		chrPaletteSelector:    0,
 		overlayTileIdx:        false,
 		overlayAttributeTable: false,
 		font:                  font,
 		emulator:              emulator,
 		ppuDebugger:           NewPPUDebugger(emulator.PPU()),
+		breakpointDebugger:    NewBreakpointDebugger(),
 	}
 }
 
-func (dbg *DebuggerGUI) Close() {
+func (dbg *Debugger) Close() {
 	defer raylib.UnloadFont(dbg.font)
 }
 
-func (dbg *DebuggerGUI) Tick() {
+func (dbg *Debugger) Tick() {
 	dbg.listenKeyboard()
 	raylib.DrawFPS(0, 0)
 	dbg.ppuDebugger.Draw()
-
+	dbg.breakpointDebugger.Draw()
 	//dbg.DrawDebugger(dbg.emulator)
 }
 
-func (dbg *DebuggerGUI) DrawDebugger(emulator *nes.Nes) {
+func (dbg *Debugger) DrawDebugger(emulator *nes.Nes) {
 	x := DEBUG_X_OFFSET
 	y := 10
 
@@ -99,13 +106,17 @@ func (dbg *DebuggerGUI) DrawDebugger(emulator *nes.Nes) {
 	//drawObjectAttributeEntries(emulator)
 }
 
-func (dbg *DebuggerGUI) listenKeyboard() {
+func (dbg *Debugger) listenKeyboard() {
 	if raylib.IsKeyPressed(raylib.KeyP) {
 		//dbg.chrPaletteSelector += 1
 		//if dbg.chrPaletteSelector > (8 - 1) {
 		//	dbg.chrPaletteSelector = 0
 		//}
-		dbg.ppuDebugger.SetEnabled(true)
+		dbg.ppuDebugger.Toggle()
+	}
+
+	if raylib.IsKeyPressed(raylib.KeyO) {
+		dbg.breakpointDebugger.Toggle()
 	}
 }
 
@@ -140,7 +151,7 @@ func drawASM(console *nes.Nes) {
 	}
 }
 
-func drawPalettes(console *nes.Nes, scale int, xOffset int, yOffset int, debuggerGUI *DebuggerGUI) {
+func drawPalettes(console *nes.Nes, scale int, xOffset int, yOffset int, debuggerGUI *Debugger) {
 	// Draw defined palettes (8)
 	x := xOffset
 	y := yOffset
@@ -182,7 +193,7 @@ func drawColorWatch(coordX int, coordY int, width int, height int, color color.C
 	raylib.DrawRectangle(coordX, coordY, width, height, pixelColor2RaylibColor(color))
 }
 
-func drawCHR(console *nes.Nes, scale int, xOffset int, yOffset int, font *raylib.Font, debuggerGUI *DebuggerGUI) {
+func drawCHR(console *nes.Nes, scale int, xOffset int, yOffset int, font *raylib.Font, debuggerGUI *Debugger) {
 	drawIndexes := false
 
 	if raylib.IsKeyDown(raylib.KeyZero) {

src/debugger/debuggerPanel.go

@@ -0,0 +1,85 @@
+package debugger
+
+import "github.com/lachee/raylib-goplus/raylib"
+
+type draggablePanel struct {
+	title               string
+	enabled             bool
+	position            raylib.Vector2
+	width               float32
+	height              float32
+	dragWindow          bool
+	positionOnStartDrag raylib.Vector2
+}
+
+func NewDraggablePanel(title string, position raylib.Vector2, width int, height int) *draggablePanel {
+	return &draggablePanel{
+		title:    title,
+		enabled:  false,
+		position: position,
+		width:    float32(width),
+		height:   float32(height),
+	}
+}
+
+func (panel *draggablePanel) SetEnabled(enabled bool) {
+	panel.enabled = enabled
+}
+
+// Draw returns true if panel is active
+func (panel *draggablePanel) Draw() bool {
+	if panel.enabled == false {
+		return panel.enabled
+	}
+
+	panel.updateWindowPosition()
+	shouldClose := raylib.GuiWindowBox(
+		raylib.Rectangle{
+			X:      panel.position.X,
+			Y:      panel.position.Y,
+			Width:  panel.width,
+			Height: panel.height,
+		},
+		panel.title,
+	)
+	if shouldClose {
+		panel.Close()
+	}
+
+	return true
+}
+
+func (panel *draggablePanel) Close() {
+	panel.enabled = false
+}
+
+func (panel *draggablePanel) updateWindowPosition() {
+	mousePosition := raylib.GetMousePosition()
+	if raylib.IsMouseButtonPressed(raylib.MouseLeftButton) {
+
+		if raylib.CheckCollisionPointRec(mousePosition, panel.statusBarPosition()) {
+			panel.dragWindow = true
+			panel.positionOnStartDrag = raylib.Vector2{
+				X: mousePosition.X - panel.position.X,
+				Y: mousePosition.Y - panel.position.Y,
+			}
+		}
+	}
+
+	if panel.dragWindow {
+		panel.position.X = mousePosition.X - panel.positionOnStartDrag.X
+		panel.position.Y = mousePosition.Y - panel.positionOnStartDrag.Y
+		if raylib.IsMouseButtonReleased(raylib.MouseLeftButton) {
+			panel.dragWindow = false
+		}
+	}
+}
+
+func (panel *draggablePanel) statusBarPosition() raylib.Rectangle {
+	return raylib.Rectangle{
+		X:      panel.position.X,
+		Y:      panel.position.Y,
+		Width:  ppuPanelWidth - 20,
+		Height: 20,
+	}
+}

src/debugger/ppu.go

@@ -6,59 +6,53 @@ import (
 	"github.com/raulferras/nes-golang/src/nes/ppu"
 )
 
-const debuggerWidth = 350
+const ppuPanelWidth = 350
 
 type PPUDebugger struct {
-	enabled             bool
-	windowRectangle     raylib.Rectangle
-	ppu                 *ppu.Ppu2c02
-	dragWindow          bool
-	positionOnStartDrag raylib.Vector2
+	panel *draggablePanel
+	ppu   *ppu.Ppu2c02
 }
 
 func NewPPUDebugger(ppu *ppu.Ppu2c02) *PPUDebugger {
 	return &PPUDebugger{
-		enabled:         false,
-		windowRectangle: raylib.Rectangle{X: 300, Width: debuggerWidth, Height: 450},
-		dragWindow:      false,
-		ppu:             ppu,
+		panel: NewDraggablePanel(
+			"PPU Registers",
+			raylib.Vector2{300, 0},
+			ppuPanelWidth,
+			450,
+		),
+		ppu: ppu,
 	}
 }
 
-func (dbg *PPUDebugger) SetEnabled(enabled bool) {
-	dbg.enabled = enabled
+func (dbg *PPUDebugger) Toggle() {
+	dbg.panel.SetEnabled(!dbg.panel.enabled)
 }
 
 func (dbg *PPUDebugger) Draw() {
-	if dbg.enabled == false {
+	if !dbg.panel.Draw() {
 		return
 	}
-
-	dbg.updateWindowPosition()
-	shouldClose := raylib.GuiWindowBox(dbg.windowRectangle, "PPU Registers")
-	if shouldClose {
-		dbg.Close()
-	}
 	padding := float32(5)
-	fullWidth := debuggerWidth - (padding * 2)
+	fullWidth := ppuPanelWidth - (padding * 2)
 
-	y := dbg.windowRectangle.Y + 30 + padding
-	dbg.ppuControlGroup(fullWidth, dbg.windowRectangle.X+padding, y)
+	y := dbg.panel.position.Y + 30 + padding
+	dbg.ppuControlGroup(fullWidth, dbg.panel.position.X+padding, y)
 
 	y += 64 + padding*2
-	dbg.ppuStatusGroup(fullWidth, dbg.windowRectangle.X+padding, y)
+	dbg.ppuStatusGroup(fullWidth, dbg.panel.position.X+padding, y)
 
 	y += 32 + padding*2
-	dbg.ppuMaskGroup(fullWidth, dbg.windowRectangle.X+padding, y)
+	dbg.ppuMaskGroup(fullWidth, dbg.panel.position.X+padding, y)
 
 	y += 64 + padding*2
-	dbg.loopyRegister(fullWidth, dbg.windowRectangle.X+padding, y, dbg.ppu.VRam(), "V")
+	dbg.loopyRegister(fullWidth, dbg.panel.position.X+padding, y, dbg.ppu.VRam(), "V")
 
 	y += 64 + padding*2
-	dbg.loopyRegister(fullWidth, dbg.windowRectangle.X+padding, y, dbg.ppu.TRam(), "T")
+	dbg.loopyRegister(fullWidth, dbg.panel.position.X+padding, y, dbg.ppu.TRam(), "T")
 
 	y += 64 + padding*2
-	dbg.renderingInfo(fullWidth, dbg.windowRectangle.X+padding, y)
+	dbg.renderingInfo(fullWidth, dbg.panel.position.X+padding, y)
 }
 
 func (dbg *PPUDebugger) ppuControlGroup(fullWidth float32, x float32, y float32) {
@@ -227,38 +221,3 @@ func (dbg *PPUDebugger) renderingInfo(fullWidth float32, x float32, y float32) {
 		fmt.Sprintf("Render Cycle: %d", dbg.ppu.RenderCycle()),
 	)
 }
-
-func (dbg *PPUDebugger) updateWindowPosition() {
-	mousePosition := raylib.GetMousePosition()
-	if raylib.IsMouseButtonPressed(raylib.MouseLeftButton) {
-
-		if raylib.CheckCollisionPointRec(mousePosition, dbg.statusBarPosition()) {
-			dbg.dragWindow = true
-			dbg.positionOnStartDrag = raylib.Vector2{
-				X: mousePosition.X - dbg.windowRectangle.X,
-				Y: mousePosition.Y - dbg.windowRectangle.Y,
-			}
-		}
-	}
-
-	if dbg.dragWindow {
-		dbg.windowRectangle.X = mousePosition.X - dbg.positionOnStartDrag.X
-		dbg.windowRectangle.Y = mousePosition.Y - dbg.positionOnStartDrag.Y
-		if raylib.IsMouseButtonReleased(raylib.MouseLeftButton) {
-			dbg.dragWindow = false
-		}
-	}
-}
-
-func (dbg *PPUDebugger) statusBarPosition() raylib.Rectangle {
-	return raylib.Rectangle{
-		X:      dbg.windowRectangle.X,
-		Y:      dbg.windowRectangle.Y,
-		Width:  debuggerWidth - 20,
-		Height: 20,
-	}
-}
-
-func (dbg *PPUDebugger) Close() {
-	dbg.enabled = false
-}

src/main.go

@@ -78,7 +78,7 @@ func loop(console *nes.Nes) {
 	cpuAdvance = true
 	console.Start()
 	_timestamp := r.GetTime()
-	debuggerGUI := debugger.NewDebuggerGUI(console)
+	debuggerGUI := debugger.NewDebugger(console)
 
 	for !r.WindowShouldClose() {
 		if console.Stopped() {
@@ -91,14 +91,9 @@ func loop(console *nes.Nes) {
 		if dt > 1 {
 			dt = 0
 		}
-		//fmt.Printf("%f sec\n", dt)
-		//if r.IsKeyPressed(r.KeySpace) {
-		//	cpuAdvance = true
-		//}
 
 		// Update emulator
 		if cpuAdvance {
-			//console.Tick()
 			console.TickForTime(dt)
 		}