Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb82c6ae

Browse files
authored
Code review feedback for minheap.hpp (#240)
1 parent653395c commitb82c6ae

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Release available for download on [GitHub](https://github.com/microsoft/UVAtlas/
1010
* Reformat source using updated .editorconfig settings and general lint cleanup
1111
* Minor code review
1212
* CMake project updates
13+
* uvatlastool:
14+
* Updated for July 2025 DirectXTex & DirectXMesh releases
1315

1416
###March 26, 2025
1517
* Retired support for Windows 7 and Windows 8.0

‎UVAtlas/geodesics/minheap.hpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,17 @@ namespace Internal
1919
public:
2020
ReverseComparison() : m_data{}
2121
{}
22-
ReverseComparison(const T &R)
23-
{
24-
m_data = R;
25-
}
22+
ReverseComparison(const T &R) : m_data(R)
23+
{}
2624

2725
ReverseComparison(const ReverseComparison &) =default;
2826
ReverseComparison &operator=(const ReverseComparison &) =default;
2927

30-
booloperator>(const ReverseComparison &R)
28+
booloperator>(const ReverseComparison &R)const
3129
{
3230
return m_data < R.m_data;
3331
}
34-
booloperator<(const ReverseComparison &R)
32+
booloperator<(const ReverseComparison &R)const
3533
{
3634
return m_data > R.m_data;
3735
}

‎UVAtlasTool/UVAtlasTool_2019.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,14 +317,14 @@
317317
</ItemGroup>
318318
<ImportProject="$(VCTargetsPath)\Microsoft.Cpp.targets" />
319319
<ImportGroupLabel="ExtensionTargets">
320-
<ImportProject="..\packages\directxmesh_desktop_2019.2025.3.25.2\build\native\directxmesh_desktop_2019.targets"Condition="Exists('..\packages\directxmesh_desktop_2019.2025.3.25.2\build\native\directxmesh_desktop_2019.targets')" />
321-
<ImportProject="..\packages\directxtex_desktop_2019.2025.3.25.2\build\native\directxtex_desktop_2019.targets"Condition="Exists('..\packages\directxtex_desktop_2019.2025.3.25.2\build\native\directxtex_desktop_2019.targets')" />
320+
<ImportProject="..\packages\directxmesh_desktop_2019.2025.7.10.1\build\native\directxmesh_desktop_2019.targets"Condition="Exists('..\packages\directxmesh_desktop_2019.2025.7.10.1\build\native\directxmesh_desktop_2019.targets')" />
321+
<ImportProject="..\packages\directxtex_desktop_2019.2025.7.10.1\build\native\directxtex_desktop_2019.targets"Condition="Exists('..\packages\directxtex_desktop_2019.2025.7.10.1\build\native\directxtex_desktop_2019.targets')" />
322322
</ImportGroup>
323323
<TargetName="EnsureNuGetPackageBuildImports"BeforeTargets="PrepareForBuild">
324324
<PropertyGroup>
325325
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
326326
</PropertyGroup>
327-
<ErrorCondition="!Exists('..\packages\directxmesh_desktop_2019.2025.3.25.2\build\native\directxmesh_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2025.3.25.2\build\native\directxmesh_desktop_2019.targets'))" />
328-
<ErrorCondition="!Exists('..\packages\directxtex_desktop_2019.2025.3.25.2\build\native\directxtex_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2025.3.25.2\build\native\directxtex_desktop_2019.targets'))" />
327+
<ErrorCondition="!Exists('..\packages\directxmesh_desktop_2019.2025.7.10.1\build\native\directxmesh_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2025.7.10.1\build\native\directxmesh_desktop_2019.targets'))" />
328+
<ErrorCondition="!Exists('..\packages\directxtex_desktop_2019.2025.7.10.1\build\native\directxtex_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2025.7.10.1\build\native\directxtex_desktop_2019.targets'))" />
329329
</Target>
330330
</Project>

‎UVAtlasTool/UVAtlasTool_2022.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,14 +317,14 @@
317317
</ItemGroup>
318318
<ImportProject="$(VCTargetsPath)\Microsoft.Cpp.targets" />
319319
<ImportGroupLabel="ExtensionTargets">
320-
<ImportProject="..\packages\directxmesh_desktop_2019.2025.3.25.2\build\native\directxmesh_desktop_2019.targets"Condition="Exists('..\packages\directxmesh_desktop_2019.2025.3.25.2\build\native\directxmesh_desktop_2019.targets')" />
321-
<ImportProject="..\packages\directxtex_desktop_2019.2025.3.25.2\build\native\directxtex_desktop_2019.targets"Condition="Exists('..\packages\directxtex_desktop_2019.2025.3.25.2\build\native\directxtex_desktop_2019.targets')" />
320+
<ImportProject="..\packages\directxmesh_desktop_2019.2025.7.10.1\build\native\directxmesh_desktop_2019.targets"Condition="Exists('..\packages\directxmesh_desktop_2019.2025.7.10.1\build\native\directxmesh_desktop_2019.targets')" />
321+
<ImportProject="..\packages\directxtex_desktop_2019.2025.7.10.1\build\native\directxtex_desktop_2019.targets"Condition="Exists('..\packages\directxtex_desktop_2019.2025.7.10.1\build\native\directxtex_desktop_2019.targets')" />
322322
</ImportGroup>
323323
<TargetName="EnsureNuGetPackageBuildImports"BeforeTargets="PrepareForBuild">
324324
<PropertyGroup>
325325
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
326326
</PropertyGroup>
327-
<ErrorCondition="!Exists('..\packages\directxmesh_desktop_2019.2025.3.25.2\build\native\directxmesh_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2025.3.25.2\build\native\directxmesh_desktop_2019.targets'))" />
328-
<ErrorCondition="!Exists('..\packages\directxtex_desktop_2019.2025.3.25.2\build\native\directxtex_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2025.3.25.2\build\native\directxtex_desktop_2019.targets'))" />
327+
<ErrorCondition="!Exists('..\packages\directxmesh_desktop_2019.2025.7.10.1\build\native\directxmesh_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2025.7.10.1\build\native\directxmesh_desktop_2019.targets'))" />
328+
<ErrorCondition="!Exists('..\packages\directxtex_desktop_2019.2025.7.10.1\build\native\directxtex_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2025.7.10.1\build\native\directxtex_desktop_2019.targets'))" />
329329
</Target>
330330
</Project>

‎UVAtlasTool/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="directxmesh_desktop_2019"version="2025.3.25.2"targetFramework="native" />
4-
<packageid="directxtex_desktop_2019"version="2025.3.25.2"targetFramework="native" />
3+
<packageid="directxmesh_desktop_2019"version="2025.7.10.1"targetFramework="native" />
4+
<packageid="directxtex_desktop_2019"version="2025.7.10.1"targetFramework="native" />
55
</packages>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp