Skip to content

Migrate KAOS project to OpenTK 4 and SDK-style .csproj #2

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
stomppah wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Migrate KAOS project to OpenTK 4 and SDK-style .csproj #2

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
354 changes: 81 additions & 273 deletions KAOS/KAOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,273 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{43E7C301-7345-49D7-B8E8-F02B097F599F}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>KAOS</RootNamespace>
<AssemblyName>KAOS</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="AssimpNet, Version=3.2.0.0, Culture=neutral, PublicKeyToken=0d51b391f59f42a6, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Dependencies\AssimpNet\Net45-Debug\AssimpNet.dll</HintPath>
</Reference>
<Reference Include="MataliPhysics">
<HintPath>..\Dependencies\MataliPhysicsBasic\MataliPhysicsOpenTK\Mono\MataliPhysics\AnyCPU\MataliPhysics.dll</HintPath>
</Reference>
<Reference Include="MataliRender">
<HintPath>..\Dependencies\MataliPhysicsBasic\MataliPhysicsOpenTK\Mono\MataliPhysics\AnyCPU\MataliRender.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="OpenTK">
<HintPath>..\packages\OpenTK.1.1.1508.5724\lib\NET40\OpenTK.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Interfaces\IGameObject.cs" />
<Compile Include="Managers\VertexBufferManager.cs" />
<Compile Include="Interfaces\IDrawableShape.cs" />
<Compile Include="Managers\InputManager.cs" />
<Compile Include="Managers\ShaderManager.cs" />
<Compile Include="Managers\StateManager.cs" />
<Compile Include="Managers\TextureManager.cs" />
<Compile Include="Nodes\GraphLinesNode.cs" />
<Compile Include="Nodes\PolygonNode.cs" />
<Compile Include="Shapes\Capsule.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Shapes\ChamferCube.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Shapes\KochTetrahedron.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Shapes\MengerSponge.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Shapes\Old\IsoSphere.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Shapes\Old\Plane.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Shapes\Old\Shape.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Shapes\Old\SierpinskiTetrahedron.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Shapes\SlicedHose.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Shapes\SlicedSphere.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Shapes\TorusKnot.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Shapes\VertexPositionColor.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="States\AbstractState.cs" />
<Compile Include="States\MandelbrotState.cs" />
<Compile Include="States\ModelState.cs" />
<Compile Include="States\SceneGraphState.cs" />
<Compile Include="States\Skyboxstate.cs" />
<Compile Include="States\VoxelState.cs" />
<Compile Include="Utilities\VertexBuffer.cs" />
<Compile Include="Utilities\Camera.cs" />
<Compile Include="Utilities\Extensions.cs" />
<Compile Include="Utilities\Logger.cs" />
<Compile Include="Nodes\GroupNode.cs" />
<Compile Include="Interfaces\IGroupNode.cs" />
<Compile Include="Interfaces\ISceneNode.cs" />
<Compile Include="KAOSEngine.cs" />
<Compile Include="Shapes\Base\DrawableShape.cs" />
<Compile Include="Shapes\Base\VertexStructs.cs" />
<Compile Include="Shapes\Helpers\Chunk.cs" />
<Compile Include="Shapes\Helpers\MengerCube.cs" />
<Compile Include="Shapes\Helpers\TetrahedronFace.cs" />
<Compile Include="Shapes\Helpers\VboShape.cs" />
<Compile Include="Shapes\Old\Cube.cs" />
<Compile Include="Nodes\Node.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Utilities\AnimationTimer.cs" />
<Compile Include="Utilities\Renderer.cs" />
<Compile Include="Utilities\Shader.cs" />
<Compile Include="Utilities\TextRenderer.cs" />
<Compile Include="Utilities\Texture.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Data\Shaders\assimp-vs.glsl">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Data\Shaders\assimp-fs.glsl">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Data\Shaders\mbrot-fs.glsl">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Data\Shaders\fractal-fs.glsl">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Data\Shaders\fractal-vs.glsl">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Data\Shaders\render-fs.glsl">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Data\Shaders\render-vs.glsl">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Data\Shaders\skybox-fs.glsl">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Data\Shaders\skybox-vs.glsl">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Data\Textures\earth-cubemap.dds">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Data\Textures\swizzled-rock-diffuse-height.dds">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Data\Textures\swizzled-rock-normal-gloss.dds">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="libSDL2.dylib" />
<None Include="OpenTK.dll.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
<None Include="pal.ppm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="Assimp64.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="AssimpLicense.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="Data\Shaders\mbrot-vs.glsl">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<Content Include="Data\Textures\skybox\neg_x.bmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\skybox\neg_y.bmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\skybox\neg_z.bmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\skybox\pos_x.bmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\skybox\pos_y.bmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\skybox\pos_z.bmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\JuliaColorTable.bmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\logo-dark.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\logo.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\metal.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\sundown\neg_z.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\sundown\pos_z.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\sundown\jajsundown1_left.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\sundown\jajsundown1_right.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\sundown\pos_y.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Data\Textures\sundown\Note.txt" />
<Content Include="Data\Textures\Swizzled Textures License.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="openal32.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="pal.bmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="SDL2.dll" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<AssemblyName>KAOS</AssemblyName>
<RootNamespace>KAOS</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<EnableDefaultItems>false</EnableDefaultItems>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.8.2" />
<PackageReference Include="OpenTK.GLControl" Version="4.8.2" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="AssimpNet" Version="5.0.0-beta1" />
</ItemGroup>

<ItemGroup>
<Reference Include="MataliPhysics">
<HintPath>..\Dependencies\MataliPhysicsBasic\MataliPhysicsOpenTK\Mono\MataliPhysics\AnyCPU\MataliPhysics.dll</HintPath>
</Reference>
<Reference Include="MataliRender">
<HintPath>..\Dependencies\MataliPhysicsBasic\MataliPhysicsOpenTK\Mono\MataliPhysics\AnyCPU\MataliRender.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
<Compile Include="Interfaces\IGameObject.cs" />
<Compile Include="Managers\VertexBufferManager.cs" />
<Compile Include="Interfaces\IDrawableShape.cs" />
<Compile Include="Managers\InputManager.cs" />
<Compile Include="Managers\ShaderManager.cs" />
<Compile Include="Managers\StateManager.cs" />
<Compile Include="Managers\TextureManager.cs" />
<Compile Include="Nodes\GraphLinesNode.cs" />
<Compile Include="Nodes\PolygonNode.cs" />
<Compile Include="Shapes\Capsule.cs" />
<Compile Include="Shapes\ChamferCube.cs" />
<Compile Include="Shapes\KochTetrahedron.cs" />
<Compile Include="Shapes\MengerSponge.cs" />
<Compile Include="Shapes\Old\IsoSphere.cs" />
<Compile Include="Shapes\Old\Plane.cs" />
<Compile Include="Shapes\Old\Shape.cs" />
<Compile Include="Shapes\Old\SierpinskiTetrahedron.cs" />
<Compile Include="Shapes\SlicedHose.cs" />
<Compile Include="Shapes\SlicedSphere.cs" />
<Compile Include="Shapes\TorusKnot.cs" />
<Compile Include="Shapes\VertexPositionColor.cs" />
<Compile Include="States\AbstractState.cs" />
<Compile Include="States\MandelbrotState.cs" />
<Compile Include="States\ModelState.cs" />
<Compile Include="States\SceneGraphState.cs" />
<Compile Include="States\Skyboxstate.cs" />
<Compile Include="States\VoxelState.cs" />
<Compile Include="Utilities\VertexBuffer.cs" />
<Compile Include="Utilities\Camera.cs" />
<Compile Include="Utilities\Extensions.cs" />
<Compile Include="Utilities\Logger.cs" />
<Compile Include="Nodes\GroupNode.cs" />
<Compile Include="Interfaces\IGroupNode.cs" />
<Compile Include="Interfaces\ISceneNode.cs" />
<Compile Include="KAOSEngine.cs" />
<Compile Include="Shapes\Base\DrawableShape.cs" />
<Compile Include="Shapes\Base\VertexStructs.cs" />
<Compile Include="Shapes\Helpers\Chunk.cs" />
<Compile Include="Shapes\Helpers\MengerCube.cs" />
<Compile Include="Shapes\Helpers\TetrahedronFace.cs" />
<Compile Include="Shapes\Helpers\VboShape.cs" />
<Compile Include="Shapes\Old\Cube.cs" />
<Compile Include="Nodes\Node.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Utilities\AnimationTimer.cs" />
<Compile Include="Utilities\Renderer.cs" />
<Compile Include="Utilities\Shader.cs" />
<Compile Include="Utilities\TextRenderer.cs" />
<Compile Include="Utilities\Texture.cs" />
</ItemGroup>
</Project>
27 changes: 27 additions & 0 deletions KAOS/OpenTK4-MIGRATION.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# OpenTK 4 Migration Notes

This repository has been moved off the legacy OpenTK 1.x package and onto OpenTK 4 package references at the project level.

## What changed

- `KAOS.csproj` was upgraded from a legacy .NET Framework-style MSBuild project to SDK-style.
- Target framework was modernized to `net8.0-windows` to support current runtime/tooling.
- OpenTK package references were upgraded to:
- `OpenTK` 4.8.2
- `OpenTK.GLControl` 4.8.2
- Legacy `packages.config` style dependencies were replaced with `PackageReference`.
- NUnit and AssimpNet dependencies were upgraded to maintained package versions.

## Next migration steps

The runtime code currently uses legacy OpenTK namespaces and APIs (e.g. `OpenTK.Input`, `OpenTK.GameWindow` constructor signatures, and old event args). To fully complete OpenTK 4 migration, update in this order:

1. `KAOSEngine` inheritance and constructors to `OpenTK.Windowing.Desktop.GameWindow` with `GameWindowSettings`/`NativeWindowSettings`.
2. Input manager and keyboard/mouse usage to `OpenTK.Windowing.GraphicsLibraryFramework.Keys` and new input event model.
3. Math types to `OpenTK.Mathematics` where needed.
4. GL compatibility calls (fixed-function matrix stack) to modern shader-uniform matrix flow where required.
5. Any Editor/Game projects that directly reference old OpenTK APIs.

## Scope choice

This commit prioritizes project-system modernization first to make the source tree OpenTK 4-capable for iterative code migration.