From 406ade993e08a3102d768b5691ad4e821bed8368 Mon Sep 17 00:00:00 2001
From: Andrii Kurdiumov <kant2002@gmail.com>
Date: Sat, 18 Jun 2022 23:49:04 +0600
Subject: [PATCH 1/4] Prepare code to run in NativeAOT In order to publish
 using NativeAOT last change required is to target net7.0 CUrrently executable
 have size 99MB so I would not force that direction

---
 desktop/FSharpWolfenstein.Desktop.fsproj | 2 ++
 desktop/Program.fs                       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/desktop/FSharpWolfenstein.Desktop.fsproj b/desktop/FSharpWolfenstein.Desktop.fsproj
index 6f99973..b59ddfc 100644
--- a/desktop/FSharpWolfenstein.Desktop.fsproj
+++ b/desktop/FSharpWolfenstein.Desktop.fsproj
@@ -4,6 +4,7 @@
         <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <PublishAot Condition="'$(TargetFramework)' == 'net7.0'">true</PublishAot>
     </PropertyGroup>
 
     <ItemGroup>
@@ -331,5 +332,6 @@
       <PackageReference Include="Silk.NET.Windowing" Version="2.15.0" />
       <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
       <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta13" />
+      <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
     </ItemGroup>
 </Project>
diff --git a/desktop/Program.fs b/desktop/Program.fs
index 86cc375..56f9bda 100644
--- a/desktop/Program.fs
+++ b/desktop/Program.fs
@@ -191,6 +191,8 @@ let main _ =
   let mutable options = WindowOptions.Default
   options.Size <- Vector2D<int>(screenWidth * zoom,screenHeight * zoom)
   options.Title <- "F# Wolfenstein"
+  Silk.NET.Input.Sdl.SdlInput.RegisterPlatform()
+  Silk.NET.Input.Glfw.GlfwInput.RegisterPlatform()
   let window = Window.Create(options)
   window.add_Load (load window)
   window.add_Render render

From 59ad221318cad201f31232c4048d60b3751b871a Mon Sep 17 00:00:00 2001
From: Andrii Kurdiumov <kant2002@gmail.com>
Date: Tue, 21 Jun 2022 10:35:57 +0600
Subject: [PATCH 2/4] This brings application to 14Mb.

---
 browser/src/CrossPlatform/AI.fs          | 17 ++++++++++++++++-
 desktop/FSharpWolfenstein.Desktop.fsproj |  4 +++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/browser/src/CrossPlatform/AI.fs b/browser/src/CrossPlatform/AI.fs
index 53a0538..edf8543 100644
--- a/browser/src/CrossPlatform/AI.fs
+++ b/browser/src/CrossPlatform/AI.fs
@@ -270,12 +270,27 @@ let getNextState canSeePlayer game enemy =
     else
       enemy
   | _ -> enemy
+
+// This conversion required because FSharp do not play
+// along with NativeAOT inside interpolated strings + enums.
+// Be explicit about how to display strings.
+let getStateString state =
+  match state with
+  | EnemyStateType.Standing -> "Standing"
+  | EnemyStateType.Ambushing -> "Ambushing"
+  | EnemyStateType.Attack -> "Attack"
+  | EnemyStateType.Path -> "Path"
+  | EnemyStateType.Pain -> "Pain"
+  | EnemyStateType.Shoot -> "Shoot"
+  | (EnemyStateType.Chase (x,y)) -> $"Chase ({x},{y})"
+  | EnemyStateType.Die -> "Die"
+  | EnemyStateType.Dead -> "Dead"
     
 let preProcess canSeePlayer game enemy =
   // preprocess looks for state changes based on the current game world state
   let newEnemy = enemy |> getNextState canSeePlayer game
   if newEnemy.State <> enemy.State then
-    Utils.log $"Enemy at {enemy.BasicGameObject.Position.vX}, {enemy.BasicGameObject.Position.vY} moving from {enemy.State} to {newEnemy.State}"
+    Utils.log $"Enemy at {enemy.BasicGameObject.Position.vX}, {enemy.BasicGameObject.Position.vY} moving from {getStateString enemy.State} to {getStateString newEnemy.State}"
   newEnemy
     
 let updateBasedOnCurrentState canSeePlayer (frameTime:float<ms>) game enemy =
diff --git a/desktop/FSharpWolfenstein.Desktop.fsproj b/desktop/FSharpWolfenstein.Desktop.fsproj
index b59ddfc..108ab9b 100644
--- a/desktop/FSharpWolfenstein.Desktop.fsproj
+++ b/desktop/FSharpWolfenstein.Desktop.fsproj
@@ -2,9 +2,11 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <PublishAot Condition="'$(TargetFramework)' == 'net7.0'">true</PublishAot>
+        <IlcTrimMetadata>true</IlcTrimMetadata>
+        <TrimmerDefaultAction>link</TrimmerDefaultAction>
     </PropertyGroup>
 
     <ItemGroup>

From 47f9961447ae6bbbbc28ce851cc3567c7aeef1c3 Mon Sep 17 00:00:00 2001
From: Andrii Kurdiumov <kant2002@gmail.com>
Date: Tue, 21 Jun 2022 11:05:53 +0600
Subject: [PATCH 3/4] Update data

---
 desktop/FSharp.Core.rd.xml               | 71 ++++++++++++++++++++++++
 desktop/FSharpWolfenstein.Desktop.fsproj |  4 ++
 2 files changed, 75 insertions(+)
 create mode 100644 desktop/FSharp.Core.rd.xml

diff --git a/desktop/FSharp.Core.rd.xml b/desktop/FSharp.Core.rd.xml
new file mode 100644
index 0000000..fdcbfac
--- /dev/null
+++ b/desktop/FSharp.Core.rd.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Directives>
+  <!--
+	  This file is part of RdXmlLibrary project.
+	  Visit https://github.com/kant2002/rdxmllibrary for latest version.
+	  If you have modifications specific to this Nuget package,
+	  please contribute back.
+  -->
+  <Application>
+    <Assembly Name="FSharp.Core">
+      <!--
+          This is less developed version then other RD.xml files.
+          Depending on the sprint usages, these commands would have slight variance.
+          I think more examples mapped to existing printf commands should be added here. 
+      -->
+      <Type Name="Microsoft.FSharp.Core.PrintfImpl+Specializations`3[[System.IO.TextWriter,System.Private.CoreLib],[Microsoft.FSharp.Core.Unit,FSharp.Core],[Microsoft.FSharp.Core.Unit,FSharp.Core]]" Dynamic="Required All">
+        <!-- Pattern for printfn "%f" 1.0 -->
+        <Method Name="CaptureFinal1" Dynamic="Required">
+          <GenericArgument Name="System.Double, System.Private.CoreLib" />
+        </Method>
+        <Method Name="OneStepWithArg" Dynamic="Required">
+          <GenericArgument Name="System.Double, System.Private.CoreLib" />
+        </Method>
+
+        <!-- Pattern for printfn "%s %f" "" 3.0 -->
+        <Method Name="CaptureFinal2" Dynamic="Required">
+          <GenericArgument Name="System.String, System.Private.CoreLib" />
+          <GenericArgument Name="System.Double, System.Private.CoreLib" />
+        </Method>
+        <Method Name="TwoStepWithArg" Dynamic="Required">
+          <GenericArgument Name="System.String, System.Private.CoreLib" />
+          <GenericArgument Name="System.Double, System.Private.CoreLib" />
+        </Method>
+
+        <Method Name="CaptureFinal3" Dynamic="Required">
+          <GenericArgument Name="System.String, System.Private.CoreLib" />
+          <GenericArgument Name="System.String, System.Private.CoreLib" />
+          <GenericArgument Name="System.Double, System.Private.CoreLib" />
+        </Method>
+
+        <!-- Pattern for printfn "%d %s" 3 "" -->
+        <Method Name="CaptureFinal2" Dynamic="Required">
+          <GenericArgument Name="System.Int32, System.Private.CoreLib" />
+          <GenericArgument Name="System.String, System.Private.CoreLib" />
+        </Method>
+        <Method Name="TwoStepWithArg" Dynamic="Required">
+          <GenericArgument Name="System.Int32, System.Private.CoreLib" />
+          <GenericArgument Name="System.String, System.Private.CoreLib" />
+        </Method>
+
+        <!-- Pattern for printfn "%d" 1 -->
+        <Method Name="CaptureFinal1" Dynamic="Required">
+          <GenericArgument Name="System.Int32, System.Private.CoreLib" />
+        </Method>
+        <Method Name="OneStepWithArg" Dynamic="Required">
+          <GenericArgument Name="System.Int32, System.Private.CoreLib" />
+        </Method>
+
+        <!-- Pattern for printfn "%f %d" 3.0 2 -->
+        <Method Name="CaptureFinal2" Dynamic="Required">
+          <GenericArgument Name="System.Double, System.Private.CoreLib" />
+          <GenericArgument Name="System.Int32, System.Private.CoreLib" />
+        </Method>
+        <Method Name="TwoStepWithArg" Dynamic="Required">
+          <GenericArgument Name="System.Double, System.Private.CoreLib" />
+          <GenericArgument Name="System.Int32, System.Private.CoreLib" />
+        </Method>
+      </Type>
+    </Assembly>
+  </Application>
+</Directives>
\ No newline at end of file
diff --git a/desktop/FSharpWolfenstein.Desktop.fsproj b/desktop/FSharpWolfenstein.Desktop.fsproj
index 108ab9b..73814e3 100644
--- a/desktop/FSharpWolfenstein.Desktop.fsproj
+++ b/desktop/FSharpWolfenstein.Desktop.fsproj
@@ -10,6 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <Content Include="FSharp.Core.rd.xml" />
         <Compile Include="OpenGl\BufferObject.fs" />
         <Compile Include="OpenGl\VertexArrayObject.fs" />
         <Compile Include="OpenGl\Shader.fs" />
@@ -336,4 +337,7 @@
       <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta13" />
       <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
     </ItemGroup>
+  <ItemGroup>
+    <RdXmlFile Include="*.rd.xml" />
+  </ItemGroup>
 </Project>

From 8aa5a7bbb10bb3053aa02e33c6ceb43f13425f38 Mon Sep 17 00:00:00 2001
From: Andrii Kurdiumov <kant2002@gmail.com>
Date: Mon, 4 Jul 2022 12:47:33 +0600
Subject: [PATCH 4/4] Remove not needed changes

---
 desktop/FSharpWolfenstein.Desktop.fsproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/desktop/FSharpWolfenstein.Desktop.fsproj b/desktop/FSharpWolfenstein.Desktop.fsproj
index b62197f..9bffd58 100644
--- a/desktop/FSharpWolfenstein.Desktop.fsproj
+++ b/desktop/FSharpWolfenstein.Desktop.fsproj
@@ -2,7 +2,8 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <!-- Set target framework to .NET 7 to publish with NativeAOT -->
+        <TargetFramework>net6.0</TargetFramework>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <PublishAot Condition="'$(TargetFramework)' == 'net7.0'">true</PublishAot>
         <IlcTrimMetadata>true</IlcTrimMetadata>
@@ -11,7 +12,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Content Include="FSharp.Core.rd.xml" />
         <Compile Include="OpenGl\BufferObject.fs" />
         <Compile Include="OpenGl\VertexArrayObject.fs" />
         <Compile Include="OpenGl\Shader.fs" />