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

Commit2d1da4c

Browse files
authored
October 28, 2024 (#192)
1 parent6abf4f5 commit2d1da4c

File tree

9 files changed

+56
-30
lines changed

9 files changed

+56
-30
lines changed

‎.nuget/uvatlas_desktop_2019.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<description>This version is for Windows desktop applications using Visual Studio 2019 (16.11) or Visual Studio 2022.
1111

1212
UVAtlas, a shared source library for creating and packing an isochart texture atlas.</description>
13-
<releaseNotes>Matches theSeptember 4, 2024 release on GitHub.</releaseNotes>
13+
<releaseNotes>Matches theOctober 29, 2024 release on GitHub.</releaseNotes>
1414
<projectUrl>http://go.microsoft.com/fwlink/?LinkID=512686</projectUrl>
1515
<repositorytype="git"url="https://github.com/microsoft/UVAtlas.git" />
1616
<icon>images\icon.jpg</icon>

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,19 @@ Release available for download on [GitHub](https://github.com/microsoft/UVAtlas/
66

77
##Release History
88

9+
###October 29, 2024
10+
* All enums now use``uint32_t`` as the underlying type rather than``unsigned long`` or``int``.
11+
* uvatlastool:
12+
* Add "GNU-style"*--long-options* to the command-line tools (all existing switches are still supported)
13+
* Refactored code to use shared header
14+
* Updated for October 2024 DirectXTex & DirectXMesh releases
15+
* CMake and MSBuild project updates
16+
917
###September 4, 2024
1018
* CMake project updates including support for ARM64EC
1119
* Code review
1220
* Added GitHub Actions YAML files
21+
* uvatlastool: Updated for September 2024 DirectXTex & DirectXMesh releases
1322

1423
###June 5, 2024
1524
* CMake project updates

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
cmake_minimum_required (VERSION 3.20)
55

6-
set(UVATLAS_VERSION 1.8.8)
6+
set(UVATLAS_VERSION 1.8.9)
77

88
if(WINDOWS_STOREOR (DEFINED XBOX_CONSOLE_TARGET))
99
set(CMAKE_TRY_COMPILE_TARGET_TYPE"STATIC_LIBRARY")

‎README.md‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkID=512686
66

77
Copyright (c) Microsoft Corporation.
88

9-
**September 4, 2024**
9+
**October 29, 2024**
1010

1111
This package contains UVAtlas, a shared source library for creating and packing an isochart texture atlas.
1212

@@ -16,25 +16,27 @@ These components are designed to work without requiring any content from the leg
1616

1717
##Directory Layout
1818

19-
*``Inc\``
19+
*``UVAtlas\``
2020

21-
+Public Header File (in the DirectX C++ namespace):
21+
+``Inc\``
2222

23-
* UVtlas.h
24-
- UVAtlasCreate
25-
- UVAtlasPartition
26-
- UVAtlasPack
27-
- UVAtlasComputeIMTFromPerVertexSignal
28-
- UVAtlasComputeIMTFromSignal
29-
- UVAtlasComputeIMTFromTexture
30-
- UVAtlasComputeIMTFromPerTexelSignal
31-
- UVAtlasApplyRemap
23+
+ Public Header File (in the DirectX C++ namespace):
3224

33-
*``geodesics\``,``isochart\``
25+
* UVtlas.h
26+
- UVAtlasCreate
27+
- UVAtlasPartition
28+
- UVAtlasPack
29+
- UVAtlasComputeIMTFromPerVertexSignal
30+
- UVAtlasComputeIMTFromSignal
31+
- UVAtlasComputeIMTFromTexture
32+
- UVAtlasComputeIMTFromPerTexelSignal
33+
- UVAtlasApplyRemap
3434

35-
+ Library source files
35+
*``geodesics\``,``isochart\``
3636

37-
*``UVAtasTool\``
37+
+ Library source files
38+
39+
*``UVAtlasTool\``
3840

3941
+ Command line tool and sample for UVAtlas library
4042

@@ -78,6 +80,19 @@ For a full change history, see [CHANGELOG.md](https://github.com/microsoft/UVAtl
7880

7981
* When using clang/LLVM for the ARM64/AArch64 platform, the Windows 11 SDK ([22000](https://walbourn.github.io/windows-sdk-for-windows-11/)) or later is required.
8082

83+
* As of the October 2024 release, the command-line tool also supports GNU-style long options using``--``. All existing switches continue to function, but some of the`-` options are now deprecated per this table:
84+
85+
|Old switch|New switch|
86+
|---|---|
87+
|-sdkmesh|-ft sdkmesh<br />--file-type sdkmesh|
88+
|-sdkmesh2|-ft sdkmesh2<br />--file-type sdkmesh2|
89+
|-cmo|-ft cmo<br />--file-type cmo|
90+
|-vbo|-ft vbo<br />--file-type vbo|
91+
|-wf|-ft obj<br />--file-type obj|
92+
|-flipu|--flip-u|
93+
|-flipv|--flip-v|
94+
|-flipz|--flip-z|
95+
8196
##Contributing
8297

8398
This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visithttps://cla.opensource.microsoft.com.

‎UVAtlas/inc/UVAtlas.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
#include<DirectXMath.h>
4444

45-
#defineUVATLAS_VERSION188
45+
#defineUVATLAS_VERSION189
4646

4747

4848
namespaceDirectX

‎UVAtlasTool/MeshOBJ.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ HRESULT LoadFromOBJ(
6565
bool ccw,
6666
bool dds)
6767
{
68-
WaveFrontReader<uint32_t> wfReader;
68+
using Vertex = DX::WaveFrontReader<uint32_t>::Vertex;
69+
70+
DX::WaveFrontReader<uint32_t> wfReader;
6971
HRESULT hr = wfReader.Load(szFilename, ccw);
7072
if (FAILED(hr))
7173
return hr;
@@ -117,7 +119,7 @@ HRESULT LoadFromOBJ(
117119
if (FAILED(hr))
118120
return hr;
119121

120-
hr = vbr.AddStream(wfReader.vertices.data(), wfReader.vertices.size(),0,sizeof(WaveFrontReader<uint32_t>::Vertex));
122+
hr = vbr.AddStream(wfReader.vertices.data(), wfReader.vertices.size(),0,sizeof(Vertex));
121123
if (FAILED(hr))
122124
return hr;
123125

‎UVAtlasTool/UVAtlasTool_2019.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,14 +315,14 @@
315315
</ItemGroup>
316316
<ImportProject="$(VCTargetsPath)\Microsoft.Cpp.targets" />
317317
<ImportGroupLabel="ExtensionTargets">
318-
<ImportProject="..\packages\directxmesh_desktop_2019.2024.9.5.1\build\native\directxmesh_desktop_2019.targets"Condition="Exists('..\packages\directxmesh_desktop_2019.2024.9.5.1\build\native\directxmesh_desktop_2019.targets')" />
319-
<ImportProject="..\packages\directxtex_desktop_2019.2024.9.5.1\build\native\directxtex_desktop_2019.targets"Condition="Exists('..\packages\directxtex_desktop_2019.2024.9.5.1\build\native\directxtex_desktop_2019.targets')" />
318+
<ImportProject="..\packages\directxmesh_desktop_2019.2024.10.29.1\build\native\directxmesh_desktop_2019.targets"Condition="Exists('..\packages\directxmesh_desktop_2019.2024.10.29.1\build\native\directxmesh_desktop_2019.targets')" />
319+
<ImportProject="..\packages\directxtex_desktop_2019.2024.10.29.1\build\native\directxtex_desktop_2019.targets"Condition="Exists('..\packages\directxtex_desktop_2019.2024.10.29.1\build\native\directxtex_desktop_2019.targets')" />
320320
</ImportGroup>
321321
<TargetName="EnsureNuGetPackageBuildImports"BeforeTargets="PrepareForBuild">
322322
<PropertyGroup>
323323
<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>
324324
</PropertyGroup>
325-
<ErrorCondition="!Exists('..\packages\directxmesh_desktop_2019.2024.9.5.1\build\native\directxmesh_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2024.9.5.1\build\native\directxmesh_desktop_2019.targets'))" />
326-
<ErrorCondition="!Exists('..\packages\directxtex_desktop_2019.2024.9.5.1\build\native\directxtex_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2024.9.5.1\build\native\directxtex_desktop_2019.targets'))" />
325+
<ErrorCondition="!Exists('..\packages\directxmesh_desktop_2019.2024.10.29.1\build\native\directxmesh_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2024.10.29.1\build\native\directxmesh_desktop_2019.targets'))" />
326+
<ErrorCondition="!Exists('..\packages\directxtex_desktop_2019.2024.10.29.1\build\native\directxtex_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2024.10.29.1\build\native\directxtex_desktop_2019.targets'))" />
327327
</Target>
328328
</Project>

‎UVAtlasTool/UVAtlasTool_2022.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,14 +315,14 @@
315315
</ItemGroup>
316316
<ImportProject="$(VCTargetsPath)\Microsoft.Cpp.targets" />
317317
<ImportGroupLabel="ExtensionTargets">
318-
<ImportProject="..\packages\directxmesh_desktop_2019.2024.9.5.1\build\native\directxmesh_desktop_2019.targets"Condition="Exists('..\packages\directxmesh_desktop_2019.2024.9.5.1\build\native\directxmesh_desktop_2019.targets')" />
319-
<ImportProject="..\packages\directxtex_desktop_2019.2024.9.5.1\build\native\directxtex_desktop_2019.targets"Condition="Exists('..\packages\directxtex_desktop_2019.2024.9.5.1\build\native\directxtex_desktop_2019.targets')" />
318+
<ImportProject="..\packages\directxmesh_desktop_2019.2024.10.29.1\build\native\directxmesh_desktop_2019.targets"Condition="Exists('..\packages\directxmesh_desktop_2019.2024.10.29.1\build\native\directxmesh_desktop_2019.targets')" />
319+
<ImportProject="..\packages\directxtex_desktop_2019.2024.10.29.1\build\native\directxtex_desktop_2019.targets"Condition="Exists('..\packages\directxtex_desktop_2019.2024.10.29.1\build\native\directxtex_desktop_2019.targets')" />
320320
</ImportGroup>
321321
<TargetName="EnsureNuGetPackageBuildImports"BeforeTargets="PrepareForBuild">
322322
<PropertyGroup>
323323
<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>
324324
</PropertyGroup>
325-
<ErrorCondition="!Exists('..\packages\directxmesh_desktop_2019.2024.9.5.1\build\native\directxmesh_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2024.9.5.1\build\native\directxmesh_desktop_2019.targets'))" />
326-
<ErrorCondition="!Exists('..\packages\directxtex_desktop_2019.2024.9.5.1\build\native\directxtex_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2024.9.5.1\build\native\directxtex_desktop_2019.targets'))" />
325+
<ErrorCondition="!Exists('..\packages\directxmesh_desktop_2019.2024.10.29.1\build\native\directxmesh_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2024.10.29.1\build\native\directxmesh_desktop_2019.targets'))" />
326+
<ErrorCondition="!Exists('..\packages\directxtex_desktop_2019.2024.10.29.1\build\native\directxtex_desktop_2019.targets')"Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2024.10.29.1\build\native\directxtex_desktop_2019.targets'))" />
327327
</Target>
328328
</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="2024.9.5.1"targetFramework="native" />
4-
<packageid="directxtex_desktop_2019"version="2024.9.5.1"targetFramework="native" />
3+
<packageid="directxmesh_desktop_2019"version="2024.10.29.1"targetFramework="native" />
4+
<packageid="directxtex_desktop_2019"version="2024.10.29.1"targetFramework="native" />
55
</packages>

0 commit comments

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