Skip to content

Commit

Permalink
October 9, 2024 (#25)
Browse files Browse the repository at this point in the history
  • Loading branch information
walbourn authored Oct 10, 2024
1 parent d9fe02f commit a46cc99
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 21 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ Release available for download on [GitHub](https://github.com/walbourn/contentex

## Release History

### October 9, 2024
* Updated for DirectXTex, DirectXMesh, and UVAtlas September 2024 releases

### June 5, 2024
* Updated for FBX SDK 2020.3.7
* Updated for DirectXTex, DirectXMesh, and UVAtlas Jun 2024 releases
Expand Down Expand Up @@ -140,7 +143,7 @@ Release available for download on [GitHub](https://github.com/walbourn/contentex
* Added new command-line option:
* ``-flipz`` (default+) to control negation of z component for LH vs. RH view coordinates
* Fixed ``-applyglobaltrans`` to transform exported normals
* Updated DirectXTex, UVAtlas, DirectXMesh libraries
* Updated DirectXTex, UVAtlas, DirectXMesh libraries
* Minor code cleanup

### July 29, 2015
Expand All @@ -152,7 +155,7 @@ Release available for download on [GitHub](https://github.com/walbourn/contentex
* ``-lightmaps`` macro to set up for exporting meshes using lightmap textures
* Fixed problems with export of multiple uv sets and per-vertex colors
* Added some more warnings related to uv sets
* Updated DirectXTex, UVAtlas, DirectXMesh libraries
* Updated DirectXTex, UVAtlas, DirectXMesh libraries

### June 25, 2015
* Added new command-line options:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ https://aka.ms/dxsdkcontentexporter

Copyright (c) Microsoft Corporation.

**June 5, 2024**
**October 9, 2024**

The **Samples Content Exporter** was shipped as a sample in the legacy DirectX SDK. It makes use of the [Autodesk FBX SDK](http://autodesk.com/fbx) to import an FBX file and then export the data as an ``.SDKMESH``. The ``.SDKMESH`` format is a runtime geometry format supported by the _DirectX Tool Kit_ for [DX11](http://go.microsoft.com/fwlink/?LinkId=248929) / [DX12](http://go.microsoft.com/fwlink/?LinkID=615561) and [DXUT](http://go.microsoft.com/fwlink/?LinkId=320437), and is used in the Windows sample [Marble Maze](https://docs.microsoft.com/samples/microsoft/windows-appsample-marble-maze/directx-marble-maze-game-sample/).

Expand Down
12 changes: 6 additions & 6 deletions exportobjects/ExportObjects2019.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -155,16 +155,16 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\directxmesh_desktop_2019.2024.6.5.1\build\native\directxmesh_desktop_2019.targets" Condition="Exists('..\packages\directxmesh_desktop_2019.2024.6.5.1\build\native\directxmesh_desktop_2019.targets')" />
<Import Project="..\packages\directxtex_desktop_2019.2024.6.5.1\build\native\directxtex_desktop_2019.targets" Condition="Exists('..\packages\directxtex_desktop_2019.2024.6.5.1\build\native\directxtex_desktop_2019.targets')" />
<Import Project="..\packages\uvatlas_desktop_2019.2024.6.5.1\build\native\uvatlas_desktop_2019.targets" Condition="Exists('..\packages\uvatlas_desktop_2019.2024.6.5.1\build\native\uvatlas_desktop_2019.targets')" />
<Import Project="..\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')" />
<Import Project="..\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')" />
<Import Project="..\packages\uvatlas_desktop_2019.2024.9.5.2\build\native\uvatlas_desktop_2019.targets" Condition="Exists('..\packages\uvatlas_desktop_2019.2024.9.5.2\build\native\uvatlas_desktop_2019.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\directxmesh_desktop_2019.2024.6.5.1\build\native\directxmesh_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2024.6.5.1\build\native\directxmesh_desktop_2019.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_desktop_2019.2024.6.5.1\build\native\directxtex_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2024.6.5.1\build\native\directxtex_desktop_2019.targets'))" />
<Error Condition="!Exists('..\packages\uvatlas_desktop_2019.2024.6.5.1\build\native\uvatlas_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\uvatlas_desktop_2019.2024.6.5.1\build\native\uvatlas_desktop_2019.targets'))" />
<Error Condition="!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'))" />
<Error Condition="!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'))" />
<Error Condition="!Exists('..\packages\uvatlas_desktop_2019.2024.9.5.2\build\native\uvatlas_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\uvatlas_desktop_2019.2024.9.5.2\build\native\uvatlas_desktop_2019.targets'))" />
</Target>
</Project>
6 changes: 3 additions & 3 deletions exportobjects/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="directxmesh_desktop_2019" version="2024.6.5.1" targetFramework="native" />
<package id="directxtex_desktop_2019" version="2024.6.5.1" targetFramework="native" />
<package id="uvatlas_desktop_2019" version="2024.6.5.1" targetFramework="native" />
<package id="directxmesh_desktop_2019" version="2024.9.5.1" targetFramework="native" />
<package id="directxtex_desktop_2019" version="2024.9.5.1" targetFramework="native" />
<package id="uvatlas_desktop_2019" version="2024.9.5.2" targetFramework="native" />
</packages>
12 changes: 6 additions & 6 deletions importfbx/ImportFBX2019.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -177,18 +177,18 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\openexr-msvc-x64.2.3.0.8788\build\native\OpenEXR-msvc-x64.targets" Condition="Exists('..\packages\openexr-msvc-x64.2.3.0.8788\build\native\OpenEXR-msvc-x64.targets')" />
<Import Project="..\packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets" Condition="Exists('..\packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets')" />
<Import Project="..\packages\directxmesh_desktop_2019.2024.6.5.1\build\native\directxmesh_desktop_2019.targets" Condition="Exists('..\packages\directxmesh_desktop_2019.2024.6.5.1\build\native\directxmesh_desktop_2019.targets')" />
<Import Project="..\packages\directxtex_desktop_2019.2024.6.5.1\build\native\directxtex_desktop_2019.targets" Condition="Exists('..\packages\directxtex_desktop_2019.2024.6.5.1\build\native\directxtex_desktop_2019.targets')" />
<Import Project="..\packages\uvatlas_desktop_2019.2024.6.5.1\build\native\uvatlas_desktop_2019.targets" Condition="Exists('..\packages\uvatlas_desktop_2019.2024.6.5.1\build\native\uvatlas_desktop_2019.targets')" />
<Import Project="..\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')" />
<Import Project="..\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')" />
<Import Project="..\packages\uvatlas_desktop_2019.2024.9.5.2\build\native\uvatlas_desktop_2019.targets" Condition="Exists('..\packages\uvatlas_desktop_2019.2024.9.5.2\build\native\uvatlas_desktop_2019.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<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>
</PropertyGroup>
<Error Condition="!Exists('..\packages\openexr-msvc-x64.2.3.0.8788\build\native\OpenEXR-msvc-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\openexr-msvc-x64.2.3.0.8788\build\native\OpenEXR-msvc-x64.targets'))" />
<Error Condition="!Exists('..\packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets'))" />
<Error Condition="!Exists('..\packages\directxmesh_desktop_2019.2024.6.5.1\build\native\directxmesh_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2024.6.5.1\build\native\directxmesh_desktop_2019.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_desktop_2019.2024.6.5.1\build\native\directxtex_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2024.6.5.1\build\native\directxtex_desktop_2019.targets'))" />
<Error Condition="!Exists('..\packages\uvatlas_desktop_2019.2024.6.5.1\build\native\uvatlas_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\uvatlas_desktop_2019.2024.6.5.1\build\native\uvatlas_desktop_2019.targets'))" />
<Error Condition="!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'))" />
<Error Condition="!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'))" />
<Error Condition="!Exists('..\packages\uvatlas_desktop_2019.2024.9.5.2\build\native\uvatlas_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\uvatlas_desktop_2019.2024.9.5.2\build\native\uvatlas_desktop_2019.targets'))" />
</Target>
</Project>
6 changes: 3 additions & 3 deletions importfbx/packages.config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="directxmesh_desktop_2019" version="2024.6.5.1" targetFramework="native" />
<package id="directxtex_desktop_2019" version="2024.6.5.1" targetFramework="native" />
<package id="directxmesh_desktop_2019" version="2024.9.5.1" targetFramework="native" />
<package id="directxtex_desktop_2019" version="2024.9.5.1" targetFramework="native" />
<package id="openexr-msvc-x64" version="2.3.0.8788" targetFramework="native" />
<package id="uvatlas_desktop_2019" version="2024.6.5.1" targetFramework="native" />
<package id="uvatlas_desktop_2019" version="2024.9.5.2" targetFramework="native" />
<package id="zlib-msvc-x64" version="1.2.11.8900" targetFramework="native" />
</packages>

0 comments on commit a46cc99

Please sign in to comment.