refactoring

Xian55 · Jan 26, 2024 · 715da0a · 715da0a
1 parent d1e7a94
commit 715da0a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/AmeisenNavigation.Tester/AmeisenNavigation.Tester.csproj b/AmeisenNavigation.Tester/AmeisenNavigation.Tester.csproj
@@ -21,4 +21,8 @@
     <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Properties\PublishProfiles\" />
+  </ItemGroup>
+
 </Project>
diff --git a/AmeisenNavigation.Tester/Properties/PublishProfiles/FolderProfile.pubxml b/AmeisenNavigation.Tester/Properties/PublishProfiles/FolderProfile.pubxml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
+https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
   <PropertyGroup>
     <Configuration>Release</Configuration>
-    <Platform>x86</Platform>
-    <PublishDir>bin\Release\net5.0-windows\publish\</PublishDir>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net8.0-windows7.0\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0-windows</TargetFramework>
-    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <SelfContained>false</SelfContained>
-    <PublishSingleFile>True</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
   </PropertyGroup>
 </Project>
diff --git a/AmeisenNavigation/src/AmeisenNavigation.cpp b/AmeisenNavigation/src/AmeisenNavigation.cpp
@@ -455,7 +455,7 @@ bool AmeisenNavigation::TryGetClientAndQuery(size_t clientId, int mapId, Ameisen
     if (!IsValidClient(clientId)) { return false; }
 
     client = Clients.at(clientId);
-    auto& format = client->GetMmapFormat();
+    auto format = client->GetMmapFormat();
 
     // we already have a query
     if (query = client->GetNavmeshQuery(mapId)) { return true; }

diff --git a/AmeisenNavigation/src/Smoothing/CatmullRomSpline.hpp b/AmeisenNavigation/src/Smoothing/CatmullRomSpline.hpp
@@ -46,12 +46,9 @@ namespace CatmullRomSpline
 
                 ScaleAndAddVector3(B1, (t2 - t) / (t2 - t1), B2, (t - t1) / (t2 - t1), C);
 
-                if (!std::isnan(C.x) && !std::isnan(C.y) && !std::isnan(C.z))
-                {
-                    if (*outputSize > maxIndex) { return; }
+                InsertVector3(output, *outputSize, &C, 0);
 
-                    InsertVector3(output, *outputSize, &C, 0);
-                }
+                if (*outputSize > outputMaxSize - 1) { return; }
             }
         }
     }

diff --git a/AmeisenNavigation/src/Utils/Path.hpp b/AmeisenNavigation/src/Utils/Path.hpp
@@ -21,7 +21,9 @@ struct Path
     {}
 
     constexpr inline auto& operator[](int i) noexcept { return points[i]; }
+
     constexpr inline Vector3* begin() const noexcept { return points; }
     constexpr inline Vector3* end() const noexcept { return points + pointCount; }
+
     constexpr inline int GetSpace() const noexcept { return maxSize - pointCount; }
 };