Skip to content

Commit 7f862f9

Browse files
2004seraph2004seraph
committed
Fixed formatting 3
1 parent d19684a commit 7f862f9

File tree

6 files changed

+97
-99
lines changed

6 files changed

+97
-99
lines changed

‎.editorconfig

+6-8
Original file line numberDiff line numberDiff line change
@@ -220,19 +220,17 @@ ij_yaml_space_before_colon = false
220220
ij_yaml_spaces_within_braces = true
221221
ij_yaml_spaces_within_brackets = true
222222

223-
[*.{yaml,yml,json,manifest,csproj,nuspec,sln}]
223+
[*.{yaml,yml,json,csproj}]
224224
indent_size = 2
225225
tab_width = 2
226226

227-
[*.{json,csproj,nuspec,Config}]
228-
insert_final_newline = unset
229-
230-
[.nuspec]
227+
[*.{manifest,nuspec,sln}]
228+
indent_size = unset
229+
tab_width = unset
231230
max_line_length = unset
231+
insert_final_newline = unset
232232

233-
[*.sln]
234-
max_line_length = 400
235-
indent_style = tab
233+
[*.{json,csproj,Config}]
236234
insert_final_newline = unset
237235

238236
[*.{appxmanifest,asax,ascx,aspx,axaml,build,c,c++,cc,cginc,compute,cp,cpp,cppm,cs,cshtml,cu,cuh,cxx,dtd,fs,fsi,fsscript,fsx,fx,fxh,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,ixx,master,ml,mli,mpp,mq4,mq5,mqh,nuspec,paml,razor,resw,resx,shader,skin,tpp,usf,ush,vb,xaml,xamlx,xoml,xsd}]

‎.github/linters/.ecrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"IgnoreDefaults": false,
55
"SpacesAftertabs": false,
66
"NoColor": false,
7-
"exclude": ["LICENSE", "Doxyfile", "\\.md$"],
7+
"exclude": ["LICENSE", "Doxyfile", "\\.md$", "\\.sln$"],
88
"AllowedContentTypes": [],
99
"PassedFiles": [],
1010
"Disable": {

‎GREngine.Core/GREngine.Core.Physics2D/GREngine.Core.Physics2D.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<PrivateAssets>All</PrivateAssets>
99
</PackageReference>
1010
</ItemGroup>
11-
<ItemGroup>
12-
<ProjectReference Include="..\GREngine.Core.PebbleRenderer\GREngine.Core.PebbleRenderer.csproj" />
13-
<ProjectReference Include="..\GREngine.Core.System\GREngine.Core.System.csproj" />
11+
<ItemGroup>
12+
<ProjectReference Include="..\GREngine.Core.PebbleRenderer\GREngine.Core.PebbleRenderer.csproj" />
13+
<ProjectReference Include="..\GREngine.Core.System\GREngine.Core.System.csproj" />
1414
</ItemGroup>
1515
</Project>

‎GREngine.sln

+84-84
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,84 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.0.31903.59
5-
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GREngine.Core", "GREngine.Core", "{2DFA445B-45BB-41E8-BF4E-598F86710492}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine.Core.System", "GREngine.Core\GREngine.Core.System\GREngine.Core.System.csproj", "{7B462971-E2CE-44AB-92D0-9A758485F962}"
9-
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine.Core.Sound", "GREngine.Core\GREngine.Core.Sound\GREngine.Core.Sound.csproj", "{C77339AE-F05F-4DBF-A1EE-A35D295E08B0}"
11-
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine.Core.Physics2D", "GREngine.Core\GREngine.Core.Physics2D\GREngine.Core.Physics2D.csproj", "{5CED2ABB-B245-4E81-840F-4A2483968D3F}"
13-
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine.Core.PebbleRenderer", "GREngine.Core\GREngine.Core.PebbleRenderer\GREngine.Core.PebbleRenderer.csproj", "{7F8E767D-3561-414F-B644-5384D1FA543F}"
15-
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine", "GREngine\GREngine.csproj", "{5D3F3B34-D405-4A30-9998-298611F19E3A}"
17-
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine.Debug", "GREngine.Debug\GREngine.Debug.csproj", "{E63418FA-3511-4081-9281-B92E9F72E97D}"
19-
EndProject
20-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine.Algorithms", "GREngine.Algorithms\GREngine.Algorithms.csproj", "{64931E53-E013-4496-981F-B03D27A712D5}"
21-
EndProject
22-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testing", "Testing\Testing.csproj", "{3CB0CC3B-43CC-4736-A744-8AF7B9A09F1B}"
23-
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine.GameBehaviour", "GREngine.GameBehaviour\GREngine.GameBehaviour.csproj", "{36FCCDC3-0497-48D2-84AC-1E5CD8E0ECD4}"
25-
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameDemo1", "GameDemo1\GameDemo1.csproj", "{C83618C0-4241-4C3E-ACC4-37AA864905BE}"
27-
EndProject
28-
Global
29-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
30-
Debug|Any CPU = Debug|Any CPU
31-
Release|Any CPU = Release|Any CPU
32-
EndGlobalSection
33-
GlobalSection(SolutionProperties) = preSolution
34-
HideSolutionNode = FALSE
35-
EndGlobalSection
36-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
37-
{7B462971-E2CE-44AB-92D0-9A758485F962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{7B462971-E2CE-44AB-92D0-9A758485F962}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{7B462971-E2CE-44AB-92D0-9A758485F962}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{7B462971-E2CE-44AB-92D0-9A758485F962}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{C77339AE-F05F-4DBF-A1EE-A35D295E08B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{C77339AE-F05F-4DBF-A1EE-A35D295E08B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{C77339AE-F05F-4DBF-A1EE-A35D295E08B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{C77339AE-F05F-4DBF-A1EE-A35D295E08B0}.Release|Any CPU.Build.0 = Release|Any CPU
45-
{5CED2ABB-B245-4E81-840F-4A2483968D3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46-
{5CED2ABB-B245-4E81-840F-4A2483968D3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
47-
{5CED2ABB-B245-4E81-840F-4A2483968D3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
48-
{5CED2ABB-B245-4E81-840F-4A2483968D3F}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{7F8E767D-3561-414F-B644-5384D1FA543F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{7F8E767D-3561-414F-B644-5384D1FA543F}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{7F8E767D-3561-414F-B644-5384D1FA543F}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{7F8E767D-3561-414F-B644-5384D1FA543F}.Release|Any CPU.Build.0 = Release|Any CPU
53-
{5D3F3B34-D405-4A30-9998-298611F19E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54-
{5D3F3B34-D405-4A30-9998-298611F19E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
55-
{5D3F3B34-D405-4A30-9998-298611F19E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
56-
{5D3F3B34-D405-4A30-9998-298611F19E3A}.Release|Any CPU.Build.0 = Release|Any CPU
57-
{E63418FA-3511-4081-9281-B92E9F72E97D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58-
{E63418FA-3511-4081-9281-B92E9F72E97D}.Debug|Any CPU.Build.0 = Debug|Any CPU
59-
{E63418FA-3511-4081-9281-B92E9F72E97D}.Release|Any CPU.ActiveCfg = Release|Any CPU
60-
{E63418FA-3511-4081-9281-B92E9F72E97D}.Release|Any CPU.Build.0 = Release|Any CPU
61-
{64931E53-E013-4496-981F-B03D27A712D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62-
{64931E53-E013-4496-981F-B03D27A712D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
63-
{64931E53-E013-4496-981F-B03D27A712D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
64-
{64931E53-E013-4496-981F-B03D27A712D5}.Release|Any CPU.Build.0 = Release|Any CPU
65-
{3CB0CC3B-43CC-4736-A744-8AF7B9A09F1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66-
{3CB0CC3B-43CC-4736-A744-8AF7B9A09F1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
67-
{3CB0CC3B-43CC-4736-A744-8AF7B9A09F1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
68-
{3CB0CC3B-43CC-4736-A744-8AF7B9A09F1B}.Release|Any CPU.Build.0 = Release|Any CPU
69-
{36FCCDC3-0497-48D2-84AC-1E5CD8E0ECD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70-
{36FCCDC3-0497-48D2-84AC-1E5CD8E0ECD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
71-
{36FCCDC3-0497-48D2-84AC-1E5CD8E0ECD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
72-
{36FCCDC3-0497-48D2-84AC-1E5CD8E0ECD4}.Release|Any CPU.Build.0 = Release|Any CPU
73-
{C83618C0-4241-4C3E-ACC4-37AA864905BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74-
{C83618C0-4241-4C3E-ACC4-37AA864905BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
75-
{C83618C0-4241-4C3E-ACC4-37AA864905BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
76-
{C83618C0-4241-4C3E-ACC4-37AA864905BE}.Release|Any CPU.Build.0 = Release|Any CPU
77-
EndGlobalSection
78-
GlobalSection(NestedProjects) = preSolution
79-
{7B462971-E2CE-44AB-92D0-9A758485F962} = {2DFA445B-45BB-41E8-BF4E-598F86710492}
80-
{C77339AE-F05F-4DBF-A1EE-A35D295E08B0} = {2DFA445B-45BB-41E8-BF4E-598F86710492}
81-
{5CED2ABB-B245-4E81-840F-4A2483968D3F} = {2DFA445B-45BB-41E8-BF4E-598F86710492}
82-
{7F8E767D-3561-414F-B644-5384D1FA543F} = {2DFA445B-45BB-41E8-BF4E-598F86710492}
83-
EndGlobalSection
84-
EndGlobal
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31903.59
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GREngine.Core", "GREngine.Core", "{2DFA445B-45BB-41E8-BF4E-598F86710492}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine.Core.System", "GREngine.Core\GREngine.Core.System\GREngine.Core.System.csproj", "{7B462971-E2CE-44AB-92D0-9A758485F962}"
9+
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine.Core.Sound", "GREngine.Core\GREngine.Core.Sound\GREngine.Core.Sound.csproj", "{C77339AE-F05F-4DBF-A1EE-A35D295E08B0}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine.Core.Physics2D", "GREngine.Core\GREngine.Core.Physics2D\GREngine.Core.Physics2D.csproj", "{5CED2ABB-B245-4E81-840F-4A2483968D3F}"
13+
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine.Core.PebbleRenderer", "GREngine.Core\GREngine.Core.PebbleRenderer\GREngine.Core.PebbleRenderer.csproj", "{7F8E767D-3561-414F-B644-5384D1FA543F}"
15+
EndProject
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine", "GREngine\GREngine.csproj", "{5D3F3B34-D405-4A30-9998-298611F19E3A}"
17+
EndProject
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine.Debug", "GREngine.Debug\GREngine.Debug.csproj", "{E63418FA-3511-4081-9281-B92E9F72E97D}"
19+
EndProject
20+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine.Algorithms", "GREngine.Algorithms\GREngine.Algorithms.csproj", "{64931E53-E013-4496-981F-B03D27A712D5}"
21+
EndProject
22+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testing", "Testing\Testing.csproj", "{3CB0CC3B-43CC-4736-A744-8AF7B9A09F1B}"
23+
EndProject
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GREngine.GameBehaviour", "GREngine.GameBehaviour\GREngine.GameBehaviour.csproj", "{36FCCDC3-0497-48D2-84AC-1E5CD8E0ECD4}"
25+
EndProject
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameDemo1", "GameDemo1\GameDemo1.csproj", "{C83618C0-4241-4C3E-ACC4-37AA864905BE}"
27+
EndProject
28+
Global
29+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
30+
Debug|Any CPU = Debug|Any CPU
31+
Release|Any CPU = Release|Any CPU
32+
EndGlobalSection
33+
GlobalSection(SolutionProperties) = preSolution
34+
HideSolutionNode = FALSE
35+
EndGlobalSection
36+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
37+
{7B462971-E2CE-44AB-92D0-9A758485F962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38+
{7B462971-E2CE-44AB-92D0-9A758485F962}.Debug|Any CPU.Build.0 = Debug|Any CPU
39+
{7B462971-E2CE-44AB-92D0-9A758485F962}.Release|Any CPU.ActiveCfg = Release|Any CPU
40+
{7B462971-E2CE-44AB-92D0-9A758485F962}.Release|Any CPU.Build.0 = Release|Any CPU
41+
{C77339AE-F05F-4DBF-A1EE-A35D295E08B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42+
{C77339AE-F05F-4DBF-A1EE-A35D295E08B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
43+
{C77339AE-F05F-4DBF-A1EE-A35D295E08B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{C77339AE-F05F-4DBF-A1EE-A35D295E08B0}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{5CED2ABB-B245-4E81-840F-4A2483968D3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46+
{5CED2ABB-B245-4E81-840F-4A2483968D3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
47+
{5CED2ABB-B245-4E81-840F-4A2483968D3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
48+
{5CED2ABB-B245-4E81-840F-4A2483968D3F}.Release|Any CPU.Build.0 = Release|Any CPU
49+
{7F8E767D-3561-414F-B644-5384D1FA543F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{7F8E767D-3561-414F-B644-5384D1FA543F}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{7F8E767D-3561-414F-B644-5384D1FA543F}.Release|Any CPU.ActiveCfg = Release|Any CPU
52+
{7F8E767D-3561-414F-B644-5384D1FA543F}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{5D3F3B34-D405-4A30-9998-298611F19E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{5D3F3B34-D405-4A30-9998-298611F19E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{5D3F3B34-D405-4A30-9998-298611F19E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{5D3F3B34-D405-4A30-9998-298611F19E3A}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{E63418FA-3511-4081-9281-B92E9F72E97D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58+
{E63418FA-3511-4081-9281-B92E9F72E97D}.Debug|Any CPU.Build.0 = Debug|Any CPU
59+
{E63418FA-3511-4081-9281-B92E9F72E97D}.Release|Any CPU.ActiveCfg = Release|Any CPU
60+
{E63418FA-3511-4081-9281-B92E9F72E97D}.Release|Any CPU.Build.0 = Release|Any CPU
61+
{64931E53-E013-4496-981F-B03D27A712D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62+
{64931E53-E013-4496-981F-B03D27A712D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
63+
{64931E53-E013-4496-981F-B03D27A712D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
64+
{64931E53-E013-4496-981F-B03D27A712D5}.Release|Any CPU.Build.0 = Release|Any CPU
65+
{3CB0CC3B-43CC-4736-A744-8AF7B9A09F1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66+
{3CB0CC3B-43CC-4736-A744-8AF7B9A09F1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
67+
{3CB0CC3B-43CC-4736-A744-8AF7B9A09F1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
68+
{3CB0CC3B-43CC-4736-A744-8AF7B9A09F1B}.Release|Any CPU.Build.0 = Release|Any CPU
69+
{36FCCDC3-0497-48D2-84AC-1E5CD8E0ECD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70+
{36FCCDC3-0497-48D2-84AC-1E5CD8E0ECD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
71+
{36FCCDC3-0497-48D2-84AC-1E5CD8E0ECD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
72+
{36FCCDC3-0497-48D2-84AC-1E5CD8E0ECD4}.Release|Any CPU.Build.0 = Release|Any CPU
73+
{C83618C0-4241-4C3E-ACC4-37AA864905BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74+
{C83618C0-4241-4C3E-ACC4-37AA864905BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
75+
{C83618C0-4241-4C3E-ACC4-37AA864905BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
76+
{C83618C0-4241-4C3E-ACC4-37AA864905BE}.Release|Any CPU.Build.0 = Release|Any CPU
77+
EndGlobalSection
78+
GlobalSection(NestedProjects) = preSolution
79+
{7B462971-E2CE-44AB-92D0-9A758485F962} = {2DFA445B-45BB-41E8-BF4E-598F86710492}
80+
{C77339AE-F05F-4DBF-A1EE-A35D295E08B0} = {2DFA445B-45BB-41E8-BF4E-598F86710492}
81+
{5CED2ABB-B245-4E81-840F-4A2483968D3F} = {2DFA445B-45BB-41E8-BF4E-598F86710492}
82+
{7F8E767D-3561-414F-B644-5384D1FA543F} = {2DFA445B-45BB-41E8-BF4E-598F86710492}
83+
EndGlobalSection
84+
EndGlobal

‎GREngine/GREngine.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Company>Contraband Software</Company>
88
<!-- <GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
99
<Description>Small scale multiplatform engine used by Contraband Software</Description>
10-
10+
1111
<TargetFramework>net6.0</TargetFramework>
1212
<RootNamespace>GREngine</RootNamespace>
1313
</PropertyGroup>
@@ -24,4 +24,4 @@
2424
<ProjectReference Include="..\GREngine.Core\GREngine.Core.System\GREngine.Core.System.csproj" />
2525
<ProjectReference Include="..\GREngine.GameBehaviour\GREngine.GameBehaviour.csproj" />
2626
</ItemGroup>
27-
</Project>
27+
</Project>

‎GameDemo1/app.manifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
1313
<application>
1414
<!-- A list of the Windows versions that this application has been tested on and is
15-
is designed to work with. Uncomment the appropriate elements and Windows will
15+
is designed to work with. Uncomment the appropriate elements and Windows will
1616
automatically selected the most compatible environment. -->
1717

1818
<!-- Windows Vista -->

0 commit comments

Comments
 (0)