Skip to content

Separate logic from WPF rendering #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Henkoglobin wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Separate logic from WPF rendering #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Compass.Core/Compass.Core.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<RootNamespace>Compass.Core</RootNamespace>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Compass.Parser\Compass.Parser.fsproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Compass/Display/DisplayEngine.vb → Compass.Core/Display/DisplayEngine.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports Compass.Geometry
Imports Compass.Core.Geometry

Namespace Display
Public MustInherit Class DisplayEngine
Expand Down
2 changes: 1 addition & 1 deletion Compass/Geometry/Circle.vb → Compass.Core/Geometry/Circle.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Option Strict On

Imports System.Math
Imports Compass.Maths
Imports Compass.Core.Maths

Namespace Geometry

Expand Down
0 Compass/Geometry/Geometry.vb → Compass.Core/Geometry/Geometry.vb
View file
Open in desktop
File renamed without changes.
0 Compass/Geometry/Lambda.vb → Compass.Core/Geometry/Lambda.vb
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Compass/Geometry/Line.vb → Compass.Core/Geometry/Line.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports Compass.Maths
Imports Compass.Core.Maths

Namespace Geometry
Public Class Line
Expand Down
2 changes: 1 addition & 1 deletion Compass/Geometry/Point.vb → Compass.Core/Geometry/Point.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports Compass.Maths
Imports Compass.Core.Maths

Namespace Geometry
Public Class Point
Expand Down
2 changes: 1 addition & 1 deletion Compass/Geometry/PointSet.vb → Compass.Core/Geometry/PointSet.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Imports System.Runtime.CompilerServices
Imports Compass.Maths
Imports Compass.Core.Maths

Namespace Geometry

Expand Down
2 changes: 1 addition & 1 deletion Compass/Geometry/Ray.vb → Compass.Core/Geometry/Ray.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports Compass.Maths
Imports Compass.Core.Maths

Namespace Geometry
Public Class Ray
Expand Down
2 changes: 1 addition & 1 deletion Compass/Geometry/Segment.vb → Compass.Core/Geometry/Segment.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports Compass.Maths
Imports Compass.Core.Maths

Namespace Geometry
Public Class Segment
Expand Down
2 changes: 1 addition & 1 deletion Compass/Interpreter/Context.vb → Compass.Core/Interpreter/Context.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports Compass.Display
Imports Compass.Core.Display

Namespace Interpreter
Public Class Context
Expand Down
0 Compass/Interpreter/Exceptions.vb → Compass.Core/Interpreter/Exceptions.vb
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Compass/Interpreter/ExpressionInterpreter.vb → ...Core/Interpreter/ExpressionInterpreter.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports Compass.Geometry
Imports Compass.Core.Geometry
Imports Parser

Namespace Interpreter
Expand Down
2 changes: 1 addition & 1 deletion Compass/Interpreter/Scope.vb → Compass.Core/Interpreter/Scope.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports Compass.Geometry
Imports Compass.Core.Geometry

Namespace Interpreter
Public Class Scope
Expand Down
2 changes: 1 addition & 1 deletion Compass/Interpreter/StatementInterpreter.vb → ....Core/Interpreter/StatementInterpreter.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports Compass.Geometry
Imports Compass.Core.Geometry
Imports Parser

Namespace Interpreter
Expand Down
2 changes: 1 addition & 1 deletion Compass/Interpreter/ValueExtension.vb → Compass.Core/Interpreter/ValueExtension.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Imports System.Runtime.CompilerServices
Imports Compass.Geometry
Imports Compass.Core.Geometry

Namespace Interpreter

Expand Down
2 changes: 1 addition & 1 deletion Compass/Maths/Intersections.vb → Compass.Core/Maths/Intersections.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Option Strict On

Imports System.Math
Imports Compass.Geometry
Imports Compass.Core.Geometry

Namespace Maths

Expand Down
0 Compass/Maths/MathGlobals.vb → Compass.Core/Maths/MathGlobals.vb
View file
Open in desktop
File renamed without changes.
10 changes: 8 additions & 2 deletions Compass.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31025.218
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Compass", "Compass\Compass.vbproj", "{294F6F37-BA15-490D-B1C0-F07AB3476C55}"
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Compass", "Compass\Compass.vbproj", "{294F6F37-BA15-490D-B1C0-F07AB3476C55}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Compass.Parser", "Compass.Parser\Compass.Parser.fsproj", "{A40DE1CD-813B-4C89-8DE0-7B27A49DF268}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Compass.Parser", "Compass.Parser\Compass.Parser.fsproj", "{A40DE1CD-813B-4C89-8DE0-7B27A49DF268}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DE9E15B3-08BE-44AD-A2DC-9105A9353DE2}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
EndProjectSection
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Compass.Core", "Compass.Core\Compass.Core.vbproj", "{513F5D1E-2278-45A9-BA9E-4E3E75A701A3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -26,6 +28,10 @@ Global
{A40DE1CD-813B-4C89-8DE0-7B27A49DF268}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A40DE1CD-813B-4C89-8DE0-7B27A49DF268}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A40DE1CD-813B-4C89-8DE0-7B27A49DF268}.Release|Any CPU.Build.0 = Release|Any CPU
{513F5D1E-2278-45A9-BA9E-4E3E75A701A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{513F5D1E-2278-45A9-BA9E-4E3E75A701A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{513F5D1E-2278-45A9-BA9E-4E3E75A701A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{513F5D1E-2278-45A9-BA9E-4E3E75A701A3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
1 change: 1 addition & 0 deletions Compass/Compass.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Compass.Core\Compass.Core.vbproj" />
<ProjectReference Include="..\Compass.Parser\Compass.Parser.fsproj" />
</ItemGroup>

Expand Down
5 changes: 3 additions & 2 deletions Compass/Display/CanvasDisplay.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
Option Strict On

Imports Compass.Geometry
Imports Compass.Maths
Imports Compass.Core.Display
Imports Compass.Core.Geometry
Imports Compass.Core.Maths
Imports WPFLine = System.Windows.Shapes.Line

Namespace Display
Expand Down
3 changes: 2 additions & 1 deletion Compass/MainWindow.xaml.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Imports System.IO
Imports Compass.Display
Imports Compass.Interpreter
Imports Compass.Core.Display
Imports Compass.Core.Interpreter

Class MainWindow
Dim engine As DisplayEngine
Expand Down