#2 Removed hard coded values, preparing scan line rendering

hagronnestad · Oct 21, 2019 · e55a801 · e55a801
1 parent 66c9f1e
commit e55a801
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/ComputerSystems/Commodore64/C64.cs b/ComputerSystems/Commodore64/C64.cs
@@ -6,6 +6,7 @@
 using Hardware.Mos6526Cia;
 using System.Threading.Tasks;
 using System;
+using static Commodore64.VicIi;
 
 namespace Commodore64 {
     public class C64 {
@@ -37,8 +38,9 @@ public void Initialize() {
             RemoveEventHandlers();
 
             Cia = new Cia();
-            Vic = new VicIi();
-            Vic.C64 = this;
+            Vic = new VicIi(TvSystem.PAL) {
+                C64 = this
+            };
             Memory = new C64Bus(Cia, Vic);
             Cpu = new Cpu(Memory);
 

diff --git a/ComputerSystems/Commodore64/FormC64Screen.cs b/ComputerSystems/Commodore64/FormC64Screen.cs
@@ -36,7 +36,7 @@ public FormC64Screen(C64 c64) {
 
             C64 = c64;
 
-            _bC64ScreenBuffer = new Bitmap(320, 200, PixelFormat.Format24bppRgb);
+            _bC64ScreenBuffer = new Bitmap(VicIi.USABLE_WIDTH_BORDER, VicIi.USABLE_HEIGHT_BORDER, PixelFormat.Format24bppRgb);
             _bC64ScreenOutputBuffer = new Bitmap(pScreen.Width, pScreen.Height);
             _gC64ScreenOutputBuffer = Graphics.FromImage(_bC64ScreenOutputBuffer);
             _penScanLine = new Pen(Color.FromArgb(100, 127, 127, 127));

diff --git a/ComputerSystems/Commodore64/VicIi.cs b/ComputerSystems/Commodore64/VicIi.cs
@@ -26,8 +26,9 @@ public class VicIi {
         private const byte REGISTER_INTERRUPT_STATUS_0x19 = 0x19;
         private const byte REGISTER_INTERRUPT_CONTROL_0x1A = 0x1A;
 
-        public Color[] ScreenBufferPixels { get; } = new Color[320 * 200];
+        public Color[] ScreenBufferPixels { get; }
 
+        private readonly TvSystem _tvSystem;
         private int _rasterLineToGenerateInterruptAt = 0;
 
         public byte this[int index] {
@@ -86,16 +87,15 @@ public enum TvSystem {
 
         public const int FULL_WIDTH = 504;
         public const int FULL_WIDTH_CYCLES = 63;
-        public const int USABLE_WIDTH_BORDER = 403;
+        public const int USABLE_WIDTH_BORDER = 320;
         public const int USABLE_WIDTH = 320;
         public const int USABLE_WIDTH_CYCLES = 40;
 
         public const int FULL_HEIGHT_NTSC = 262;
         public const int FULL_HEIGHT_PAL = 312;
         public const int USABLE_HEIGHT = 200;
-        public const int USABLE_HEIGHT_BORDER = 284;
-
-
+        public const int USABLE_HEIGHT_BORDER = 200;
+
         public int CurrentLine = 0;
         public int CurrentLineCycle = 0;
 
@@ -118,31 +118,33 @@ public enum TvSystem {
 
         //public bool IsInBorder =>
 
-        public VicIi() {
+        public VicIi(TvSystem tvSystem) {
+            _tvSystem = tvSystem;
 
+            ScreenBufferPixels = new Color[USABLE_WIDTH_BORDER * USABLE_HEIGHT_BORDER];
         }
 
         public int X = 0;
         public int Y = 0;
 
         public void Cycle() {
 
-            if (InBorder && CurrentLine >= 0 && CurrentLine <= 200) {
-                var bgColor = Colors.FromByte((byte)(_registers[0x20] & 0b00001111));
+            //if (InBorder && CurrentLine >= 0 && CurrentLine <= 200) {
+            //    var bgColor = Colors.FromByte((byte)(_registers[0x20] & 0b00001111));
 
-                for (int i = 0; i < 8; i++) {
-                    ScreenBufferPixels[Y * 320 + X + i] = bgColor;
-                }
+            //    for (int i = 0; i < 8; i++) {
+            //        ScreenBufferPixels[Y * 320 + X + i] = bgColor;
+            //    }
 
-                X += 8;
+            //    X += 8;
 
-                if (X == 40) {
-                    X = 0;
-                    Y++;
+            //    if (X == 40) {
+            //        X = 0;
+            //        Y++;
 
-                    if (Y == 200) Y = 0;
-                }
-            }
+            //        if (Y == 200) Y = 0;
+            //    }
+            //}
 
             CurrentLineCycle++;
 
@@ -187,7 +189,7 @@ public void UpdateScreenBufferPixels() {
                 for (int row = 0; row <= 7; row++) {
                     var charRow = vicRead((ushort)(getCharacterMemoryPointer() + (petsciiCode * 8) + row));
 
-                    var indexRowOffset = indexLineOffset + (320 * row);
+                    var indexRowOffset = indexLineOffset + (USABLE_WIDTH_BORDER * row);
 
                     for (int col = 0; col <= 7; col++) {
                         var indexPixelOffset = indexRowOffset + col;