dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-06-13 03:31:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

VGADriver rework

Browse source
This commit is contained in:
Arawn Davies 2018-05-08 02:14:19 +01:00
parent 55019dee44
commit 1fdcbc71be
3 changed files with 178 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/Cosmos.HAL2/Drivers/Video/VGAScreen.cs → source/Cosmos.HAL2/Drivers/Video/VGADriver.cs
View file

@ -14,7 +14,7 @@ Sets VGA-compatible video modes without using the BIOS
namespace Cosmos.HAL
{
public class VGAScreen
public class VGADriver
{
internal Debugger mDebugger = new Debugger("HAL", "VGA");
private const byte NumSeqRegs = 5;
@ -174,7 +174,7 @@ namespace Cosmos.HAL
public SetPixelDelegate SetPixel;
public GetPixelDelegate GetPixel;
public VGAScreen()
public VGADriver()
{
SetPixel = new SetPixelDelegate(SetPixelNoMode);
GetPixel = new GetPixelDelegate(GetPixelNoMode);

159
source/Cosmos.System2/Graphics/VGACanvas.cs Normal file
View file

@ -0,0 +1,159 @@
using System;
using System.Collections.Generic;
using System.Text;
using Cosmos.HAL;
namespace Cosmos.System.Graphics
{
class VGACanvas : Canvas
{
private VGADriver VGADriver;
public VGACanvas(Mode mode) : base(mode)
{
}
public VGACanvas() : base()
{
}
public override Mode Mode { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public override void Clear(Color color)
{
base.Clear(color);
}
public override void Disable()
{
throw new NotImplementedException();
}
public override void DrawArray(Color[] colors, Point point, int width, int height)
{
base.DrawArray(colors, point, width, height);
}
public override void DrawArray(Color[] colors, int x, int y, int width, int height)
{
throw new NotImplementedException();
}
public override void DrawCircle(Pen pen, int x_center, int y_center, int radius)
{
base.DrawCircle(pen, x_center, y_center, radius);
}
public override void DrawCircle(Pen pen, Point point, int radius)
{
base.DrawCircle(pen, point, radius);
}
public override void DrawEllipse(Pen pen, int x_center, int y_center, int x_radius, int y_radius)
{
base.DrawEllipse(pen, x_center, y_center, x_radius, y_radius);
}
public override void DrawEllipse(Pen pen, Point point, int x_radius, int y_radius)
{
base.DrawEllipse(pen, point, x_radius, y_radius);
}
public override void DrawFilledCircle(Pen pen, int x0, int y0, int radius)
{
base.DrawFilledCircle(pen, x0, y0, radius);
}
public override void DrawFilledCircle(Pen pen, Point point, int radius)
{
base.DrawFilledCircle(pen, point, radius);
}
public override void DrawFilledEllipse(Pen pen, Point point, int height, int width)
{
base.DrawFilledEllipse(pen, point, height, width);
}
public override void DrawFilledEllipse(Pen pen, int x, int y, int height, int width)
{
base.DrawFilledEllipse(pen, x, y, height, width);
}
public override void DrawFilledRectangle(Pen pen, Point point, int width, int height)
{
base.DrawFilledRectangle(pen, point, width, height);
}
public override void DrawFilledRectangle(Pen pen, int x_start, int y_start, int width, int height)
{
base.DrawFilledRectangle(pen, x_start, y_start, width, height);
}
public override void DrawLine(Pen pen, int x1, int y1, int x2, int y2)
{
base.DrawLine(pen, x1, y1, x2, y2);
}
public override void DrawPoint(Pen pen, int x, int y)
{
throw new NotImplementedException();
}
public override void DrawPoint(Pen pen, float x, float y)
{
throw new NotImplementedException();
}
public override void DrawPolygon(Pen pen, params Point[] points)
{
base.DrawPolygon(pen, points);
}
public override void DrawRectangle(Pen pen, Point point, int width, int height)
{
base.DrawRectangle(pen, point, width, height);
}
public override void DrawRectangle(Pen pen, int x, int y, int width, int height)
{
base.DrawRectangle(pen, x, y, width, height);
}
public override void DrawSquare(Pen pen, Point point, int size)
{
base.DrawSquare(pen, point, size);
}
public override void DrawSquare(Pen pen, int x, int y, int size)
{
base.DrawSquare(pen, x, y, size);
}
public override void DrawTriangle(Pen pen, Point point0, Point point1, Point point2)
{
base.DrawTriangle(pen, point0, point1, point2);
}
public override void DrawTriangle(Pen pen, int v1x, int v1y, int v2x, int v2y, int v3x, int v3y)
{
base.DrawTriangle(pen, v1x, v1y, v2x, v2y, v3x, v3y);
}
public override List<Mode> getAvailableModes()
{
throw new NotImplementedException();
}
public override Color GetPointColor(int x, int y)
{
throw new NotImplementedException();
}
protected override Mode getDefaultGraphicMode()
{
throw new NotImplementedException();
}
}
}

34
source/Cosmos.System2/Graphics/VGAScreen.cs
View file

@ -1,5 +1,5 @@
using System;
using HALVGAScreen = Cosmos.HAL.VGAScreen;
using Cosmos.HAL;
namespace Cosmos.System.Graphics
{
@ -19,23 +19,23 @@ namespace Cosmos.System.Graphics
BitDepth2, BitDepth4, BitDepth8, BitDepth16
};
private static HALVGAScreen mScreen = new HALVGAScreen();
private static VGADriver mScreen = new VGADriver();
public static void SetGraphicsMode(ScreenSize screenSize, ColorDepth colorDepth)
{
HALVGAScreen.ScreenSize ScrSize = HALVGAScreen.ScreenSize.Size320x200;
HALVGAScreen.ColorDepth ClrDepth = HALVGAScreen.ColorDepth.BitDepth8;
VGADriver.ScreenSize ScrSize = VGADriver.ScreenSize.Size320x200;
VGADriver.ColorDepth ClrDepth = VGADriver.ColorDepth.BitDepth8;
switch (screenSize)
{
case ScreenSize.Size320x200:
ScrSize = HALVGAScreen.ScreenSize.Size320x200;
ScrSize = VGADriver.ScreenSize.Size320x200;
break;
case ScreenSize.Size640x480:
ScrSize = HALVGAScreen.ScreenSize.Size640x480;
ScrSize = VGADriver.ScreenSize.Size640x480;
break;
case ScreenSize.Size720x480:
ScrSize = HALVGAScreen.ScreenSize.Size720x480;
ScrSize = VGADriver.ScreenSize.Size720x480;
break;
default:
throw new Exception("This situation is not implemented!");
@ -44,16 +44,16 @@ namespace Cosmos.System.Graphics
switch (colorDepth)
{
case ColorDepth.BitDepth2:
ClrDepth = HALVGAScreen.ColorDepth.BitDepth2;
ClrDepth = VGADriver.ColorDepth.BitDepth2;
break;
case ColorDepth.BitDepth4:
ClrDepth = HALVGAScreen.ColorDepth.BitDepth4;
ClrDepth = VGADriver.ColorDepth.BitDepth4;
break;
case ColorDepth.BitDepth8:
ClrDepth = HALVGAScreen.ColorDepth.BitDepth8;
ClrDepth = VGADriver.ColorDepth.BitDepth8;
break;
case ColorDepth.BitDepth16:
ClrDepth = HALVGAScreen.ColorDepth.BitDepth16;
ClrDepth = VGADriver.ColorDepth.BitDepth16;
break;
default:
throw new Exception("This situation is not implemented!");
@ -97,22 +97,22 @@ namespace Cosmos.System.Graphics
switch (Size)
{
case TextSize.Size40x25:
mScreen.SetTextMode(HALVGAScreen.TextSize.Size40x25);
mScreen.SetTextMode(VGADriver.TextSize.Size40x25);
break;
case TextSize.Size40x50:
mScreen.SetTextMode(HALVGAScreen.TextSize.Size40x50);
mScreen.SetTextMode(VGADriver.TextSize.Size40x50);
break;
case TextSize.Size80x25:
mScreen.SetTextMode(HALVGAScreen.TextSize.Size80x25);
mScreen.SetTextMode(VGADriver.TextSize.Size80x25);
break;
case TextSize.Size80x50:
mScreen.SetTextMode(HALVGAScreen.TextSize.Size80x50);
mScreen.SetTextMode(VGADriver.TextSize.Size80x50);
break;
case TextSize.Size90x30:
mScreen.SetTextMode(HALVGAScreen.TextSize.Size90x30);
mScreen.SetTextMode(VGADriver.TextSize.Size90x30);
break;
case TextSize.Size90x60:
mScreen.SetTextMode(HALVGAScreen.TextSize.Size90x60);
mScreen.SetTextMode(VGADriver.TextSize.Size90x60);
break;
default:
throw new Exception("This situation is not implemented!");