Added images.

Added show border feature
abbruzze · Jul 23, 2024 · f2bc9a7 · f2bc9a7
1 parent d062f86
commit f2bc9a7
Show file tree

Hide file tree

Showing 47 changed files with 54 additions and 9 deletions.
diff --git a/images/Earthworm.PNG b/images/Earthworm.PNG
diff --git a/images/aladdin.PNG b/images/aladdin.PNG
diff --git a/images/anotherworld.PNG b/images/anotherworld.PNG
diff --git a/images/atomicrunner.PNG b/images/atomicrunner.PNG
diff --git a/images/batman_robin.PNG b/images/batman_robin.PNG
diff --git a/images/battlemania2.PNG b/images/battlemania2.PNG
diff --git a/images/castelvania.PNG b/images/castelvania.PNG
diff --git a/images/comix.PNG b/images/comix.PNG
diff --git a/images/debugger.PNG b/images/debugger.PNG
diff --git a/images/dragonball.PNG b/images/dragonball.PNG
diff --git a/images/dukenukem.PNG b/images/dukenukem.PNG
diff --git a/images/fifa98.PNG b/images/fifa98.PNG
diff --git a/images/flashback.PNG b/images/flashback.PNG
diff --git a/images/formula1.PNG b/images/formula1.PNG
diff --git a/images/ghost.PNG b/images/ghost.PNG
diff --git a/images/gunstarheroes.PNG b/images/gunstarheroes.PNG
diff --git a/images/lemmings.PNG b/images/lemmings.PNG
diff --git a/images/lighteningforce.PNG b/images/lighteningforce.PNG
diff --git a/images/megaturrican.PNG b/images/megaturrican.PNG
diff --git a/images/mk1.PNG b/images/mk1.PNG
diff --git a/images/nbajam.PNG b/images/nbajam.PNG
diff --git a/images/outrun.PNG b/images/outrun.PNG
diff --git a/images/pop.PNG b/images/pop.PNG
diff --git a/images/roadrash.PNG b/images/roadrash.PNG
diff --git a/images/rocketnight.PNG b/images/rocketnight.PNG
diff --git a/images/shinobi3.PNG b/images/shinobi3.PNG
diff --git a/images/skeletoncrew.PNG b/images/skeletoncrew.PNG
diff --git a/images/sonic1.PNG b/images/sonic1.PNG
diff --git a/images/sonic2.PNG b/images/sonic2.PNG
diff --git a/images/sonic3.PNG b/images/sonic3.PNG
diff --git a/images/sonic3d.PNG b/images/sonic3d.PNG
diff --git a/images/ssf2.PNG b/images/ssf2.PNG
diff --git a/images/streeracer.PNG b/images/streeracer.PNG
diff --git a/images/streetfight2.PNG b/images/streetfight2.PNG
diff --git a/images/streetofrage3.PNG b/images/streetofrage3.PNG
diff --git a/images/streetsofrage.PNG b/images/streetsofrage.PNG
diff --git a/images/subterrania.PNG b/images/subterrania.PNG
diff --git a/images/titanoverdrive.PNG b/images/titanoverdrive.PNG
diff --git a/images/titanoverdrive2.PNG b/images/titanoverdrive2.PNG
diff --git a/images/vectorman.PNG b/images/vectorman.PNG
diff --git a/images/virtuafighter2.PNG b/images/virtuafighter2.PNG
diff --git a/images/vr.PNG b/images/vr.PNG
diff --git a/images/wolfstein3d.PNG b/images/wolfstein3d.PNG
diff --git a/src/ucesoft/smd/Model.scala b/src/ucesoft/smd/Model.scala
@@ -136,13 +136,29 @@ enum VideoType(val clockFrequency:Int,
   final def bottomBorderPos(v30:Boolean): Int =
     topBlankingPixels + topBorderPixels + (if v30 then 240 else 224)
 
-  final def getClipArea(h40:Boolean): DisplayClipArea =
+  final def getClipArea(h40:Boolean,keepBorder:Boolean): DisplayClipArea =
     if h40 then
       // remaining hsync = 4, left black = 32, left border = 13, display = 320, right border = 14
-      DisplayClipArea(32 + 4,topBlankingPixels,379 + 4,topBlankingPixels + topBorderPixels + maxActiveLines + bottomBorderPixels)
+      inline val hsync = 4
+      inline val leftBlack = 32
+      inline val leftBorder = 13
+      inline val displayWidth = 320
+      inline val rightBorder = 14
+      if keepBorder then
+        DisplayClipArea(leftBlack + hsync,topBlankingPixels,displayWidth + leftBlack + leftBorder + rightBorder + hsync,topBlankingPixels + topBorderPixels + maxActiveLines + bottomBorderPixels)
+      else
+        DisplayClipArea(leftBlack + hsync + leftBorder,topBlankingPixels + topBorderPixels,displayWidth + leftBlack + leftBorder + hsync,topBlankingPixels + topBorderPixels + maxActiveLines)
     else
       // remaining hsync = 10, left black = 24, left border = 13, display = 256, right border = 14
-      DisplayClipArea(24 + 10,topBlankingPixels,307 + 10,topBlankingPixels + topBorderPixels + maxActiveLines + bottomBorderPixels)
+      inline val hsync = 10
+      inline val leftBlack = 24
+      inline val leftBorder = 13
+      inline val displayWidth = 256
+      inline val rightBorder = 14
+      if keepBorder then
+        DisplayClipArea(leftBlack + hsync,topBlankingPixels,displayWidth + leftBlack + leftBorder + rightBorder + hsync,topBlankingPixels + topBorderPixels + maxActiveLines + bottomBorderPixels)
+      else
+        DisplayClipArea(leftBlack + hsync + leftBorder, topBlankingPixels + topBorderPixels, displayWidth + leftBlack + leftBorder + hsync, topBlankingPixels + topBorderPixels + maxActiveLines)
 
   case NTSC extends VideoType(clockFrequency = 53_693_175,
                               topBlankingPixels = 13,

diff --git a/src/ucesoft/smd/VDP.scala b/src/ucesoft/smd/VDP.scala
@@ -878,7 +878,18 @@ class VDP(busArbiter:BusArbiter) extends SMDComponent with Clock.Clockable with
   private var lightgunProvider : LightgunProvider = scala.compiletime.uninitialized
 
   private var svpEnabled = false
+
+  private var showBorder = true
   // =================================================================================
+  def setShowBorder(enabled:Boolean): Unit =
+    showBorder = enabled
+    if model != null then
+      val clip = model.videoType.getClipArea(h40 = !REG_H32, showBorder)
+      if interlaceModeEnabled then
+        display.setClipArea(clip.getInterlacedTuple)
+      else
+        display.setClipArea(clip.getTuple)
+
   def setSVPEnabled(enabled:Boolean): Unit =
     svpEnabled = enabled
   def enableLightgun(enabled:Boolean,lightgunProvider : LightgunProvider): Unit =
@@ -1293,11 +1304,11 @@ class VDP(busArbiter:BusArbiter) extends SMDComponent with Clock.Clockable with
               interlaceModeEnabled = true
               display.setInterlaceMode(true)
               videoPixels = display.displayMem
-              display.setClipArea(model.videoType.getClipArea(h40 = !h32).getInterlacedTuple)
+              display.setClipArea(model.videoType.getClipArea(h40 = !h32,showBorder).getInterlacedTuple)
               sendMessage("Interlace mode on")
             case _ =>
               display.setInterlaceMode(false)
-              display.setClipArea(model.videoType.getClipArea(h40 = !h32).getTuple)
+              display.setClipArea(model.videoType.getClipArea(h40 = !h32,showBorder).getTuple)
 
               videoPixels = display.displayMem
               interlaceModeEnabled = false
@@ -1310,7 +1321,7 @@ class VDP(busArbiter:BusArbiter) extends SMDComponent with Clock.Clockable with
           if enableInfoLogging then log.info("HMode set to %s", hmode)
           sendMessage(s"HMode set to $hmode")
 
-          val clip = model.videoType.getClipArea(h40 = !h32)
+          val clip = model.videoType.getClipArea(h40 = !h32,showBorder)
           if interlaceModeEnabled then
             display.setClipArea(clip.getInterlacedTuple)
           else

diff --git a/src/ucesoft/smd/misc/Preferences.scala b/src/ucesoft/smd/misc/Preferences.scala
@@ -22,6 +22,7 @@ object Preferences {
   val INIT_VRAM_PREF = "init-vram"
   val EXTRA_RAM_DIR_PREF = "extra-ram-path"
   val LOAD_SAVE_EXTRA_RAM_PREF = "load-save-extra-ram"
+  val SHOW_BORDER = "vdp-show-border"
 
   class PreferenceIllegalArgumentException(msg:String) extends Exception(msg)
 

diff --git a/src/ucesoft/smd/ui/MegaDriveUI.scala b/src/ucesoft/smd/ui/MegaDriveUI.scala
@@ -124,6 +124,8 @@ class MegaDriveUI extends MessageBus.MessageListener with CheatManager:
     "3826f26" -> (Oversea,VideoType.NTSC)          // Titan 1
   )
 
+  private var showBorder = true
+
   override def onMessage(msg: MessageBus.Message): Unit =
     msg match
       case MessageBus.CartRemoved(_,cart) if cart != null =>
@@ -206,7 +208,7 @@ class MegaDriveUI extends MessageBus.MessageListener with CheatManager:
     // display
     val display = new Display(SCREEN_WIDTH, megaDrive.model.videoType.totalLines, frame.getTitle, frame, megaDrive.masterClock)
     display.setFocusable(true)
-    display.setClipArea(megaDrive.model.videoType.getClipArea(h40 = false).getTuple)
+    display.setClipArea(megaDrive.model.videoType.getClipArea(h40 = false,showBorder).getTuple)
     megaDrive.setDisplay(display)
     frame.getContentPane.add("Center",display)
     zoom(2)
@@ -552,7 +554,7 @@ class MegaDriveUI extends MessageBus.MessageListener with CheatManager:
 
   private def applyNewModel(newModel:Model): Unit =
     megaDrive.display.setNewResolution(newModel.videoType.totalLines, SCREEN_WIDTH)
-    megaDrive.display.setPreferredSize(newModel.videoType.getClipArea(h40 = true).getPreferredSize(if zoom4CB.isSelected then 4 else 2))
+    megaDrive.display.setPreferredSize(newModel.videoType.getClipArea(h40 = true,showBorder).getPreferredSize(if zoom4CB.isSelected then 4 else 2))
     megaDrive.display.invalidate()
     frame.pack()
     MessageBus.send(MessageBus.ModelChanged(this, newModel))
@@ -651,6 +653,14 @@ class MegaDriveUI extends MessageBus.MessageListener with CheatManager:
     debuggerCB.addActionListener(_ => debugger.showDebugger(debuggerCB.isSelected))
     debuggerCB.setAccelerator(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_D, java.awt.event.InputEvent.ALT_DOWN_MASK))
   private def buildToolsMenu(toolsMenu:JMenu): Unit =
+    val showBorderItem = new JCheckBoxMenuItem("VDP show border")
+    showBorderItem.setSelected(true)
+    showBorderItem.addActionListener(_ => setBorder(showBorderItem.isSelected))
+    toolsMenu.add(showBorderItem)
+    megaDrive.pref.add(Preferences.SHOW_BORDER, "show border",true) { show =>
+      showBorderItem.setSelected(show)
+      showBorder = show
+    }
     val regionMenu = new JMenu("Region")
     toolsMenu.add(regionMenu)
     val group = new ButtonGroup
@@ -835,6 +845,12 @@ class MegaDriveUI extends MessageBus.MessageListener with CheatManager:
     toolsMenu.add(fixchecksumItem)
   end buildToolsMenu
 
+  private def setBorder(show: Boolean): Unit =
+    showBorder = show
+    megaDrive.vdp.setShowBorder(showBorder)
+    zoom(if zoom4CB.isSelected then 4 else 2)
+    megaDrive.pref.updateWithoutNotify(Preferences.SHOW_BORDER,show)
+
   private def buildCartMenu(cartMenu:JMenu): Unit =
     val cartInfoItem = new JMenuItem("Cart info ...")
     cartMenu.add(cartInfoItem)
@@ -887,7 +903,7 @@ class MegaDriveUI extends MessageBus.MessageListener with CheatManager:
   private def zoom(factor:Int): Unit =
     if factor == 4 then
       zoom4CB.setSelected(true)
-    megaDrive.display.setPreferredSize(megaDrive.model.videoType.getClipArea(h40 = true).getPreferredSize(factor))
+    megaDrive.display.setPreferredSize(megaDrive.model.videoType.getClipArea(h40 = true,showBorder).getPreferredSize(factor))
     megaDrive.display.invalidate()
     frame.pack()
   private def enableMouseCapture(enabled:Boolean): Unit =
@@ -1013,6 +1029,7 @@ class MegaDriveUI extends MessageBus.MessageListener with CheatManager:
     fullScreenMode.setEnabled(true)
     cartMenu.setEnabled(true)
     MouseHider.hideMouseOn(megaDrive.display)
+    megaDrive.vdp.setShowBorder(showBorder)
 
     if cheatList.nonEmpty then
       JOptionPane.showConfirmDialog(frame,s"Apply ${cheatList.size} configured cheats on this cartridge ?","Cheats confirm",JOptionPane.YES_NO_OPTION) match