Skip to content

Commit 749e9ba

Browse files
TheFocusManTheFocusMan
committed
Merge branch 'master' of https://github.com/TheFocusMan/Cosmos 
2 parents ff91d46 + 649a78b commit 749e9ba

File tree

154 files changed

+421
-456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+421
-456
lines changed

‎Demos.sln

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎Demos/BeepDemo/BeepDemo.sln

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.sln

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎Demos/ZMachine/ZMachine.sln

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎Demos/ZMachine/ZTestConsoleApp/ZTestConsoleApp.csproj

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎Docs/articles/Kernel/CGS.md

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,33 +78,28 @@ namespace GraphicTest
7878
{
7979
try
8080
{
81-
Pen pen = new Pen(Color.Red);
81+
Pen pen = new Pen();
8282

8383
// A red Point
84-
canvas.DrawPoint(pen, 69, 69);
84+
canvas.DrawPoint(Color.Red, 69, 69);
8585

8686
// A GreenYellow horizontal line
87-
pen.Color = Color.GreenYellow;
88-
canvas.DrawLine(pen, 250, 100, 400, 100);
87+
canvas.DrawLine(Color.GreenYellow, 250, 100, 400, 100);
8988

9089
// An IndianRed vertical line
91-
pen.Color = Color.IndianRed;
92-
canvas.DrawLine(pen, 350, 150, 350, 250);
90+
canvas.DrawLine(Color.IndianRed, 350, 150, 350, 250);
9391

9492
// A MintCream diagonal line
95-
pen.Color = Color.MintCream;
96-
canvas.DrawLine(pen, 250, 150, 400, 250);
93+
canvas.DrawLine(Color.MintCream, 250, 150, 400, 250);
9794

9895
// A PaleVioletRed rectangle
99-
pen.Color = Color.PaleVioletRed;
100-
canvas.DrawRectangle(pen, 350, 350, 80, 60);
96+
canvas.DrawRectangle(Color.PaleVioletRed, 350, 350, 80, 60);
10197

10298
// A LimeGreen rectangle
103-
pen.Color = Color.LimeGreen;
104-
canvas.DrawRectangle(pen, 450, 450, 80, 60);
99+
canvas.DrawRectangle(Color.LimeGreen, 450, 450, 80, 60);
105100

106101
// A bitmap
107-
canvas.DrawImage(bitmap, new Point(100, 150));
102+
canvas.DrawImage(bitmap, 100, 150);
108103

109104
canvas.Display(); // Required for something to be displayed when using a double buffered driver
110105

‎Examples.sln

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.4.33110.190
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZKernel", "Examples\ZMachine Emulator\ZKernel\ZKernel.csproj", "{54876871-D090-45CB-81A7-DE92788065F7}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZLibrary", "Examples\ZMachine Emulator\ZLibrary\ZLibrary.csproj", "{9D75A72C-9721-4B9B-AC7E-C920E6B0047D}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZTestConsoleApp", "Examples\ZMachine Emulator\ZTestConsoleApp\ZTestConsoleApp.csproj", "{E4BB51D4-6F98-4001-BDC5-A24B6F68AEB7}"
11+
EndProject
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ZMachine", "ZMachine", "{9832638C-A006-4E2B-B5B5-1B883EA1130E}"
13+
EndProject
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GuessKernel", "Examples\Guess Number Game\GuessKernel.csproj", "{A462D9B3-F72A-4EC9-95CE-1172A0E11114}"
15+
EndProject
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CosmosGraphicSubsystem", "Examples\Cosmos Graphic Subsystem\CosmosGraphicSubsystem.csproj", "{4A3CCFAF-687E-4E75-8A4F-4005593259E7}"
17+
EndProject
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeepDemo", "Examples\Console Beep Demo\BeepDemo.csproj", "{E36B1862-E376-4A6C-AE5A-729081C4DCB5}"
19+
EndProject
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTerminalShell", "Examples\Basic Terminal Shell\BasicTerminalShell.csproj", "{C1844DF5-3A07-4473-A137-D763B89E8C9F}"
21+
EndProject
22+
Global
23+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
24+
Debug|Any CPU = Debug|Any CPU
25+
Debug|x86 = Debug|x86
26+
Release|Any CPU = Release|Any CPU
27+
Release|x86 = Release|x86
28+
EndGlobalSection
29+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30+
{54876871-D090-45CB-81A7-DE92788065F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{54876871-D090-45CB-81A7-DE92788065F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{54876871-D090-45CB-81A7-DE92788065F7}.Debug|x86.ActiveCfg = Debug|Any CPU
33+
{54876871-D090-45CB-81A7-DE92788065F7}.Debug|x86.Build.0 = Debug|Any CPU
34+
{54876871-D090-45CB-81A7-DE92788065F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{54876871-D090-45CB-81A7-DE92788065F7}.Release|Any CPU.Build.0 = Release|Any CPU
36+
{54876871-D090-45CB-81A7-DE92788065F7}.Release|x86.ActiveCfg = Release|Any CPU
37+
{54876871-D090-45CB-81A7-DE92788065F7}.Release|x86.Build.0 = Release|Any CPU
38+
{9D75A72C-9721-4B9B-AC7E-C920E6B0047D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{9D75A72C-9721-4B9B-AC7E-C920E6B0047D}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{9D75A72C-9721-4B9B-AC7E-C920E6B0047D}.Debug|x86.ActiveCfg = Debug|Any CPU
41+
{9D75A72C-9721-4B9B-AC7E-C920E6B0047D}.Debug|x86.Build.0 = Debug|Any CPU
42+
{9D75A72C-9721-4B9B-AC7E-C920E6B0047D}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{9D75A72C-9721-4B9B-AC7E-C920E6B0047D}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{9D75A72C-9721-4B9B-AC7E-C920E6B0047D}.Release|x86.ActiveCfg = Release|Any CPU
45+
{9D75A72C-9721-4B9B-AC7E-C920E6B0047D}.Release|x86.Build.0 = Release|Any CPU
46+
{E4BB51D4-6F98-4001-BDC5-A24B6F68AEB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{E4BB51D4-6F98-4001-BDC5-A24B6F68AEB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{E4BB51D4-6F98-4001-BDC5-A24B6F68AEB7}.Debug|x86.ActiveCfg = Debug|x86
49+
{E4BB51D4-6F98-4001-BDC5-A24B6F68AEB7}.Debug|x86.Build.0 = Debug|x86
50+
{E4BB51D4-6F98-4001-BDC5-A24B6F68AEB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
51+
{E4BB51D4-6F98-4001-BDC5-A24B6F68AEB7}.Release|Any CPU.Build.0 = Release|Any CPU
52+
{E4BB51D4-6F98-4001-BDC5-A24B6F68AEB7}.Release|x86.ActiveCfg = Release|x86
53+
{E4BB51D4-6F98-4001-BDC5-A24B6F68AEB7}.Release|x86.Build.0 = Release|x86
54+
{A462D9B3-F72A-4EC9-95CE-1172A0E11114}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55+
{A462D9B3-F72A-4EC9-95CE-1172A0E11114}.Debug|Any CPU.Build.0 = Debug|Any CPU
56+
{A462D9B3-F72A-4EC9-95CE-1172A0E11114}.Debug|x86.ActiveCfg = Debug|Any CPU
57+
{A462D9B3-F72A-4EC9-95CE-1172A0E11114}.Debug|x86.Build.0 = Debug|Any CPU
58+
{A462D9B3-F72A-4EC9-95CE-1172A0E11114}.Release|Any CPU.ActiveCfg = Release|Any CPU
59+
{A462D9B3-F72A-4EC9-95CE-1172A0E11114}.Release|Any CPU.Build.0 = Release|Any CPU
60+
{A462D9B3-F72A-4EC9-95CE-1172A0E11114}.Release|x86.ActiveCfg = Release|Any CPU
61+
{A462D9B3-F72A-4EC9-95CE-1172A0E11114}.Release|x86.Build.0 = Release|Any CPU
62+
{4A3CCFAF-687E-4E75-8A4F-4005593259E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63+
{4A3CCFAF-687E-4E75-8A4F-4005593259E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
64+
{4A3CCFAF-687E-4E75-8A4F-4005593259E7}.Debug|x86.ActiveCfg = Debug|Any CPU
65+
{4A3CCFAF-687E-4E75-8A4F-4005593259E7}.Debug|x86.Build.0 = Debug|Any CPU
66+
{4A3CCFAF-687E-4E75-8A4F-4005593259E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
67+
{4A3CCFAF-687E-4E75-8A4F-4005593259E7}.Release|Any CPU.Build.0 = Release|Any CPU
68+
{4A3CCFAF-687E-4E75-8A4F-4005593259E7}.Release|x86.ActiveCfg = Release|Any CPU
69+
{4A3CCFAF-687E-4E75-8A4F-4005593259E7}.Release|x86.Build.0 = Release|Any CPU
70+
{E36B1862-E376-4A6C-AE5A-729081C4DCB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
71+
{E36B1862-E376-4A6C-AE5A-729081C4DCB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
72+
{E36B1862-E376-4A6C-AE5A-729081C4DCB5}.Debug|x86.ActiveCfg = Debug|Any CPU
73+
{E36B1862-E376-4A6C-AE5A-729081C4DCB5}.Debug|x86.Build.0 = Debug|Any CPU
74+
{E36B1862-E376-4A6C-AE5A-729081C4DCB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
75+
{E36B1862-E376-4A6C-AE5A-729081C4DCB5}.Release|Any CPU.Build.0 = Release|Any CPU
76+
{E36B1862-E376-4A6C-AE5A-729081C4DCB5}.Release|x86.ActiveCfg = Release|Any CPU
77+
{E36B1862-E376-4A6C-AE5A-729081C4DCB5}.Release|x86.Build.0 = Release|Any CPU
78+
{C1844DF5-3A07-4473-A137-D763B89E8C9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79+
{C1844DF5-3A07-4473-A137-D763B89E8C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
80+
{C1844DF5-3A07-4473-A137-D763B89E8C9F}.Debug|x86.ActiveCfg = Debug|Any CPU
81+
{C1844DF5-3A07-4473-A137-D763B89E8C9F}.Debug|x86.Build.0 = Debug|Any CPU
82+
{C1844DF5-3A07-4473-A137-D763B89E8C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
83+
{C1844DF5-3A07-4473-A137-D763B89E8C9F}.Release|Any CPU.Build.0 = Release|Any CPU
84+
{C1844DF5-3A07-4473-A137-D763B89E8C9F}.Release|x86.ActiveCfg = Release|Any CPU
85+
{C1844DF5-3A07-4473-A137-D763B89E8C9F}.Release|x86.Build.0 = Release|Any CPU
86+
EndGlobalSection
87+
GlobalSection(SolutionProperties) = preSolution
88+
HideSolutionNode = FALSE
89+
EndGlobalSection
90+
GlobalSection(NestedProjects) = preSolution
91+
{54876871-D090-45CB-81A7-DE92788065F7} = {9832638C-A006-4E2B-B5B5-1B883EA1130E}
92+
{9D75A72C-9721-4B9B-AC7E-C920E6B0047D} = {9832638C-A006-4E2B-B5B5-1B883EA1130E}
93+
{E4BB51D4-6F98-4001-BDC5-A24B6F68AEB7} = {9832638C-A006-4E2B-B5B5-1B883EA1130E}
94+
EndGlobalSection
95+
GlobalSection(ExtensibilityGlobals) = postSolution
96+
SolutionGuid = {CDCC44E7-6647-4887-B1D0-7761436578FD}
97+
EndGlobalSection
98+
EndGlobal

‎Examples/Basic Terminal Shell/BasicTerminalShell.csproj

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<!--<RuntimeIdentifier>cosmos</RuntimeIdentifier>-->
6+
<Platform>cosmos</Platform>
7+
<SupportsX86Intrinsics>false</SupportsX86Intrinsics>
8+
<SelfContained>True</SelfContained>
9+
</PropertyGroup>
10+
11+
<PropertyGroup>
12+
<EnableGDB>False</EnableGDB>
13+
<StartCosmosGDB>False</StartCosmosGDB>
14+
<VisualStudioDebugPort>Pipe: Cosmos\Serial</VisualStudioDebugPort>
15+
<CosmosDebugPort>Serial: COM1</CosmosDebugPort>
16+
<Launch>VMware</Launch>
17+
<Profile>VMware</Profile>
18+
<Description>Use VMware Player or Workstation to deploy and debug.</Description>
19+
<PxeInterface>192.168.0.8</PxeInterface>
20+
</PropertyGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="Cosmos.Build" Version="0-*" NoWarn="NU1604" />
24+
<PackageReference Include="Cosmos.Debug.Kernel" Version="0-*" NoWarn="NU1604" />
25+
<PackageReference Include="Cosmos.System2" Version="0-*" NoWarn="NU1604" />
26+
</ItemGroup>
27+
28+
</Project>

0 commit comments

Comments
 (0)