microsoft
/
UVAtlas
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

December 31, 2023 (#135)

This commit is contained in:
Chuck Walbourn 2024-01-01 01:23:22 -08:00 коммит произвёл GitHub
Родитель 3ebd255b4d
Коммит dd04746518
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 19 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
.nuget/uvatlas_desktop_2019.nuspec
Просмотреть файл

@ -10,7 +10,7 @@
<description>This version is for Windows desktop applications using Visual Studio 2019 (16.11) or Visual Studio 2022. <description>This version is for Windows desktop applications using Visual Studio 2019 (16.11) or Visual Studio 2022.
UVAtlas, a shared source library for creating and packing an isochart texture atlas.</description> UVAtlas, a shared source library for creating and packing an isochart texture atlas.</description>
<releaseNotes>Matches the October 31, 2023 release on GitHub.</releaseNotes> <releaseNotes>Matches the December 31, 2023 release on GitHub.</releaseNotes>
<projectUrl>http://go.microsoft.com/fwlink/?LinkID=512686</projectUrl> <projectUrl>http://go.microsoft.com/fwlink/?LinkID=512686</projectUrl>
<repository type="git" url="https://github.com/microsoft/UVAtlas.git" /> <repository type="git" url="https://github.com/microsoft/UVAtlas.git" />
<icon>images\icon.jpg</icon> <icon>images\icon.jpg</icon>

2
CMakeLists.txt
Просмотреть файл

@ -3,7 +3,7 @@
cmake_minimum_required (VERSION 3.20) cmake_minimum_required (VERSION 3.20)
set(UVATLAS_VERSION 1.8.5) set(UVATLAS_VERSION 1.8.6)
if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET)) if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY") set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")

5
HISTORY.md
Просмотреть файл

@ -6,6 +6,11 @@ Release available for download on [GitHub](https://github.com/microsoft/UVAtlas/
## Release History ## Release History
### December 31, 2023
* CMake project updates including pkg-config file generation
* Code review
* uvatlastool: Updated for December 2023 DirectXTex & DirectXMesh releases
### October 31, 2023 ### October 31, 2023
* Retired ARM (32-bit) support for the UWP platform * Retired ARM (32-bit) support for the UWP platform
* CMake project updates * CMake project updates

2
README.md
Просмотреть файл

@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkID=512686
Copyright (c) Microsoft Corporation. Copyright (c) Microsoft Corporation.
**October 31, 2023** **December 31, 2023**
This package contains UVAtlas, a shared source library for creating and packing an isochart texture atlas. This package contains UVAtlas, a shared source library for creating and packing an isochart texture atlas.

2
UVAtlas/inc/UVAtlas.h
Просмотреть файл

@ -42,7 +42,7 @@
#include <DirectXMath.h> #include <DirectXMath.h>
#define UVATLAS_VERSION 185 #define UVATLAS_VERSION 186
namespace DirectX namespace DirectX

8
UVAtlasTool/UVAtlasTool_2019.vcxproj
Просмотреть файл

@ -308,14 +308,14 @@
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets" Condition="Exists('..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets')" /> <Import Project="..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets" Condition="Exists('..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets')" />
<Import Project="..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.targets" Condition="Exists('..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.targets')" /> <Import Project="..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets" Condition="Exists('..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets')" />
</ImportGroup> </ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<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> <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>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets'))" /> <Error Condition="!Exists('..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.targets'))" /> <Error Condition="!Exists('..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets'))" />
</Target> </Target>
</Project> </Project>

8
UVAtlasTool/UVAtlasTool_2022.vcxproj
Просмотреть файл

@ -314,14 +314,14 @@
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets" Condition="Exists('..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets')" /> <Import Project="..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets" Condition="Exists('..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets')" />
<Import Project="..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.targets" Condition="Exists('..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.targets')" /> <Import Project="..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets" Condition="Exists('..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets')" />
</ImportGroup> </ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<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> <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>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets'))" /> <Error Condition="!Exists('..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.targets'))" /> <Error Condition="!Exists('..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets'))" />
</Target> </Target>
</Project> </Project>

4
UVAtlasTool/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="directxmesh_desktop_2019" version="2023.10.31.2" targetFramework="native" /> <package id="directxmesh_desktop_2019" version="2024.1.1.1" targetFramework="native" />
<package id="directxtex_desktop_2019" version="2023.10.31.1" targetFramework="native" /> <package id="directxtex_desktop_2019" version="2024.1.1.1" targetFramework="native" />
</packages> </packages>