Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
373 changes: 373 additions & 0 deletions .editorconfig

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
</PropertyGroup>
</Project>
</Project>
40 changes: 40 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0"/>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Serilog" Version="4.2.0"/>
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0"/>
<PackageVersion Include="CSharpFunctionalExtensions" Version="3.3.0"/>
<PackageVersion Include="ImGui.NET" Version="1.91.0.1"/>
<PackageVersion Include="BepuPhysics" Version="2.5.0-beta.24"/>
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.6"/>
<PackageVersion Include="SharpGLTF.Core" Version="1.0.3"/>
<!--PackageVersion Include="Ktx2Sharp" Version="1.0.2" /-->

<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
<PackageVersion Include="FluentAssertions" Version="7.0.0"/>
<PackageVersion Include="NSubstitute" Version="5.3.0"/>
<PackageVersion Include="xunit" Version="2.9.2"/>
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageVersion>
<PackageVersion Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageVersion>
<PackageVersion Include="Xunit.SkippableFact" Version="1.5.23"/>
</ItemGroup>
</Project>
23 changes: 23 additions & 0 deletions EngineKit.sln
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_items", "_items", "{7641AC
.github\workflows\cd.yml = .github\workflows\cd.yml
Directory.Build.props = Directory.Build.props
EngineKit.sln.DotSettings = EngineKit.sln.DotSettings
.editorconfig = .editorconfig
Directory.Packages.props = Directory.Packages.props
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineKit", "src\EngineKit\EngineKit.csproj", "{8E305337-228C-4930-B355-91F1E82C64C8}"
Expand Down Expand Up @@ -49,6 +51,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Complex.Assets", "examples\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Complex", "examples\Complex\Complex\Complex.csproj", "{2BDAC710-9074-441E-8AF3-4D50B2C37EE7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Complex.Engine", "examples\Complex\Complex.Engine\Complex.Engine.csproj", "{08D90EF4-115E-4969-8149-DEB681FEEF5D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Complex.Game", "examples\Complex\Complex.Game\Complex.Game.csproj", "{C4B24C11-BE84-4AFD-9335-129CF467808B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Complex.Game.Assets", "examples\Complex\Complex.Game.Assets\Complex.Game.Assets.csproj", "{DD5FA21A-C190-4F31-9F05-F081862F3465}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -72,6 +80,9 @@ Global
{7E9EF27C-3748-4782-959F-3AEBF26416F2} = {1E1BD9CA-189A-45FD-8A36-A57C836C6BB6}
{3D623AB0-0EB7-4DD9-9C27-04819106A57F} = {7E9EF27C-3748-4782-959F-3AEBF26416F2}
{2BDAC710-9074-441E-8AF3-4D50B2C37EE7} = {7E9EF27C-3748-4782-959F-3AEBF26416F2}
{08D90EF4-115E-4969-8149-DEB681FEEF5D} = {7E9EF27C-3748-4782-959F-3AEBF26416F2}
{C4B24C11-BE84-4AFD-9335-129CF467808B} = {7E9EF27C-3748-4782-959F-3AEBF26416F2}
{DD5FA21A-C190-4F31-9F05-F081862F3465} = {7E9EF27C-3748-4782-959F-3AEBF26416F2}
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8E305337-228C-4930-B355-91F1E82C64C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -118,5 +129,17 @@ Global
{2BDAC710-9074-441E-8AF3-4D50B2C37EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2BDAC710-9074-441E-8AF3-4D50B2C37EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2BDAC710-9074-441E-8AF3-4D50B2C37EE7}.Release|Any CPU.Build.0 = Release|Any CPU
{08D90EF4-115E-4969-8149-DEB681FEEF5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{08D90EF4-115E-4969-8149-DEB681FEEF5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08D90EF4-115E-4969-8149-DEB681FEEF5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{08D90EF4-115E-4969-8149-DEB681FEEF5D}.Release|Any CPU.Build.0 = Release|Any CPU
{C4B24C11-BE84-4AFD-9335-129CF467808B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C4B24C11-BE84-4AFD-9335-129CF467808B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C4B24C11-BE84-4AFD-9335-129CF467808B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C4B24C11-BE84-4AFD-9335-129CF467808B}.Release|Any CPU.Build.0 = Release|Any CPU
{DD5FA21A-C190-4F31-9F05-F081862F3465}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DD5FA21A-C190-4F31-9F05-F081862F3465}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DD5FA21A-C190-4F31-9F05-F081862F3465}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DD5FA21A-C190-4F31-9F05-F081862F3465}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
13 changes: 13 additions & 0 deletions EngineKit.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_DECLARATION_PARENS_ARRANGEMENT/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_PRIMARY_CONSTRUCTOR_DECLARATION_PARENS_ARRANGEMENT/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/MAX_FORMAL_PARAMETERS_ON_LINE/@EntryValue">1</s:Int64>
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/MAX_PRIMARY_CONSTRUCTOR_PARAMETERS_ON_LINE/@EntryValue">10000</s:Int64>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_PRIMARY_CONSTRUCTOR_DECLARATION_LPAR/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_PRIMARY_CONSTRUCTOR_DECLARATION_RPAR/@EntryValue">False</s:Boolean>
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">140</s:Int64>
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_PARAMETERS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EUnitTestFramework_002EMigrations_002EEnableDisabledProvidersMigration/@EntryIndexedValue">True</s:Boolean>

<s:Int64 x:Key="/Default/Environment/UnitTesting/ParallelProcessesCount/@EntryValue">8</s:Int64>
Expand Down
Binary file not shown.
Binary file not shown.
117 changes: 117 additions & 0 deletions examples/Complex/Complex.Assets/Data/Props/SM_Cubes_10by10by10.gltf
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
{
"asset":{
"generator":"Khronos glTF Blender I/O v4.1.63",
"version":"2.0"
},
"scene":0,
"scenes":[
{
"name":"Scene",
"nodes":[
0
]
}
],
"nodes":[
{
"mesh":0,
"name":"Cube"
}
],
"meshes":[
{
"name":"Cube",
"primitives":[
{
"attributes":{
"POSITION":0,
"NORMAL":1,
"TEXCOORD_0":2,
"TANGENT":3
},
"indices":4
}
]
}
],
"accessors":[
{
"bufferView":0,
"componentType":5126,
"count":24,
"max":[
1,
1,
1
],
"min":[
-1,
-1,
-1
],
"type":"VEC3"
},
{
"bufferView":1,
"componentType":5126,
"count":24,
"type":"VEC3"
},
{
"bufferView":2,
"componentType":5126,
"count":24,
"type":"VEC2"
},
{
"bufferView":3,
"componentType":5126,
"count":24,
"type":"VEC4"
},
{
"bufferView":4,
"componentType":5123,
"count":36,
"type":"SCALAR"
}
],
"bufferViews":[
{
"buffer":0,
"byteLength":288,
"byteOffset":0,
"target":34962
},
{
"buffer":0,
"byteLength":288,
"byteOffset":288,
"target":34962
},
{
"buffer":0,
"byteLength":192,
"byteOffset":576,
"target":34962
},
{
"buffer":0,
"byteLength":384,
"byteOffset":768,
"target":34962
},
{
"buffer":0,
"byteLength":72,
"byteOffset":1152,
"target":34963
}
],
"buffers":[
{
"byteLength":1224,
"uri":"SM_Cubes_10by10by10.bin"
}
]
}
Binary file not shown.
117 changes: 117 additions & 0 deletions examples/Complex/Complex.Assets/Data/Props/SM_Cubes_10by10by10_i.gltf
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
{
"asset":{
"generator":"Khronos glTF Blender I/O v4.1.63",
"version":"2.0"
},
"scene":0,
"scenes":[
{
"name":"Scene",
"nodes":[
0
]
}
],
"nodes":[
{
"mesh":0,
"name":"Cube.001"
}
],
"meshes":[
{
"name":"Cube",
"primitives":[
{
"attributes":{
"POSITION":0,
"NORMAL":1,
"TEXCOORD_0":2,
"TANGENT":3
},
"indices":4
}
]
}
],
"accessors":[
{
"bufferView":0,
"componentType":5126,
"count":24000,
"max":[
73,
73,
1
],
"min":[
-1,
-1,
-73
],
"type":"VEC3"
},
{
"bufferView":1,
"componentType":5126,
"count":24000,
"type":"VEC3"
},
{
"bufferView":2,
"componentType":5126,
"count":24000,
"type":"VEC2"
},
{
"bufferView":3,
"componentType":5126,
"count":24000,
"type":"VEC4"
},
{
"bufferView":4,
"componentType":5123,
"count":36000,
"type":"SCALAR"
}
],
"bufferViews":[
{
"buffer":0,
"byteLength":288000,
"byteOffset":0,
"target":34962
},
{
"buffer":0,
"byteLength":288000,
"byteOffset":288000,
"target":34962
},
{
"buffer":0,
"byteLength":192000,
"byteOffset":576000,
"target":34962
},
{
"buffer":0,
"byteLength":384000,
"byteOffset":768000,
"target":34962
},
{
"buffer":0,
"byteLength":72000,
"byteOffset":1152000,
"target":34963
}
],
"buffers":[
{
"byteLength":1224000,
"uri":"SM_Cubes_10by10by10_i.bin"
}
]
}
Binary file not shown.
16 changes: 16 additions & 0 deletions examples/Complex/Complex.Engine/Complex.Engine.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<ProjectReference Include="..\..\..\src\EngineKit\EngineKit.csproj"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="BepuPhysics"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection"/>
<PackageReference Include="Microsoft.Extensions.Configuration.Json"/>
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions"/>
<PackageReference Include="Serilog.Sinks.Console"/>
<PackageReference Include="Serilog.Settings.Configuration"/>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using BepuPhysics.Collidables;

namespace Complex.Ecs.Components;
namespace Complex.Engine.Ecs.Components;

public class ColliderComponent : Component
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Runtime.CompilerServices;

namespace Complex.Ecs.Components;
namespace Complex.Engine.Ecs.Components;

public abstract class Component
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Complex.Ecs.Components;
namespace Complex.Engine.Ecs.Components;

public class GlobalLightComponent : Component
{
Expand Down
Loading
Loading