Skip to content

Commit d1d87ed

Browse files
stanardstanard
committed
Updated ModelConverter NuGet packages and updated to v143
1 parent b3ad3a8 commit d1d87ed

File tree

8 files changed

+60
-46
lines changed

8 files changed

+60
-46
lines changed

‎MiniEngine/ModelConverter/IndexOptimizePostTransform.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ void OptimizeFaces(const IndexType* indexList, uint32_t indexCount, IndexType* n
252252
|| sortFunc(indexSorted[i - 1], indexSorted[i]))
253253
{
254254
// it's not a duplicate
255-
vertexRemap[indexSorted[i]] = uniqueVertexCount;
255+
vertexRemap[indexSorted[i]] = (IndexType)uniqueVertexCount;
256256
uniqueVertexCount++;
257257
}
258258
else
@@ -319,7 +319,7 @@ void OptimizeFaces(const IndexType* indexList, uint32_t indexCount, IndexType* n
319319
uint32_t bestFace = 0;
320320
float bestScore = -1.f;
321321

322-
const float maxValenceScore = FindVertexScore(1, kEvictedCacheIndex, lruCacheSize) * 3.f;
322+
//const float maxValenceScore = FindVertexScore(1, kEvictedCacheIndex, lruCacheSize) * 3.f;
323323

324324
unsigned int nextBestFace = 0;
325325
for (uint32_t i = 0; i < indexCount; i += 3)

‎MiniEngine/ModelConverter/ModelAssimp.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#include <assimp/scene.h>
2020
#include <assimp/postprocess.h>
2121

22+
#pragma warning(disable:4244) // conversion from 'uint32_t' to 'uint16_t', possible loss of data
23+
2224
using namespace std;
2325

2426
const char* AssimpModel::s_FormatString[] =
@@ -182,7 +184,7 @@ bool AssimpModel::LoadAssimp(const string& filename)
182184
dstMat->shininess = shininess;
183185
dstMat->specularStrength = specularStrength;
184186

185-
char *pRem = nullptr;
187+
//char *pRem = nullptr;
186188

187189
strncpy_s(dstMat->texDiffusePath, texDiffusePath.C_Str(), Material::maxTexPath - 1);
188190
strncpy_s(dstMat->texSpecularPath, texSpecularPath.C_Str(), Material::maxTexPath - 1);

‎MiniEngine/ModelConverter/ModelConverter.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26430.16
3+
# Visual Studio 16
4+
VisualStudioVersion = 16
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModelConverter", "ModelConverter_VS15.vcxproj", "{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}"
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModelConverter", "ModelConverter.vcxproj", "{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}"
77
EndProject
8-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "..\Core\Core_VS15.vcxproj", "{86A58508-0D6A-4786-A32F-01A301FDC6F3}"
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "..\Core\Core.vcxproj", "{86A58508-0D6A-4786-A32F-01A301FDC6F3}"
99
EndProject
10-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Model", "..\Model\Model_VS15.vcxproj", "{5D3AEEFB-8789-48E5-9BD9-09C667052D09}"
10+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Model", "..\Model\Model.vcxproj", "{5D3AEEFB-8789-48E5-9BD9-09C667052D09}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎MiniEngine/ModelConverter/ModelConverter.vcxproj‎

Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,59 +11,59 @@
1111
</ProjectConfiguration>
1212
</ItemGroup>
1313
<PropertyGroup Label="Globals">
14+
<RootNamespace>ModelConverter</RootNamespace>
1415
<ProjectGuid>{1813BD6E-E2AF-4A3C-8C54-4E72119DA993}</ProjectGuid>
15-
<ApplicationEnvironment>title</ApplicationEnvironment>
1616
<DefaultLanguage>en-US</DefaultLanguage>
1717
<Keyword>Win32Proj</Keyword>
18-
<ProjectName>ModelConverter</ProjectName>
19-
<RootNamespace>ModelConverter</RootNamespace>
20-
<PlatformToolset>v141</PlatformToolset>
21-
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
18+
<PlatformToolset>v143</PlatformToolset>
19+
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
2220
<TargetRuntime>Native</TargetRuntime>
23-
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
21+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2422
</PropertyGroup>
2523
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2624
<PropertyGroup Label="Configuration">
2725
<ConfigurationType>Application</ConfigurationType>
28-
<PlatformToolset>v141</PlatformToolset>
26+
<PlatformToolset>v143</PlatformToolset>
2927
<CharacterSet>Unicode</CharacterSet>
28+
<EmbedManifest>false</EmbedManifest>
3029
</PropertyGroup>
3130
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3231
<ImportGroup Label="ExtensionSettings" />
33-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
32+
<ImportGroup Label="PropertySheets">
3433
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
35-
<Import Project="..\PropertySheets\VS15.props" />
36-
<Import Project="..\PropertySheets\Debug.props" />
37-
<Import Project="..\PropertySheets\Win32.props" />
34+
<Import Project="..\PropertySheets\Build.props" />
3835
</ImportGroup>
39-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
40-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
41-
<Import Project="..\PropertySheets\VS15.props" />
42-
<Import Project="..\PropertySheets\Release.props" />
43-
<Import Project="..\PropertySheets\Win32.props" />
36+
<ImportGroup Condition="'$(Platform)'=='x64'" Label="PropertySheets">
37+
<Import Project="..\PropertySheets\Desktop.props" />
4438
</ImportGroup>
4539
<PropertyGroup Label="UserMacros" />
4640
<ItemDefinitionGroup>
4741
<ClCompile>
4842
<AdditionalIncludeDirectories>..\Model;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
4943
</ClCompile>
50-
<Link Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
44+
<Link Condition="'$(Configuration)'=='Debug'">
5145
<AdditionalOptions>/nodefaultlib:MSVCRT %(AdditionalOptions)</AdditionalOptions>
5246
</Link>
5347
</ItemDefinitionGroup>
48+
<ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
49+
<Link>
50+
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
51+
</AdditionalDependencies>
52+
</Link>
53+
</ItemDefinitionGroup>
5454
<ItemGroup>
55-
<ProjectReference Include="..\Core\Core_VS15.vcxproj">
55+
<ProjectReference Include="..\Core\Core.vcxproj">
5656
<Project>{86A58508-0D6A-4786-A32F-01A301FDC6F3}</Project>
5757
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
5858
</ProjectReference>
59-
<ProjectReference Include="..\Model\Model_VS15.vcxproj">
59+
<ProjectReference Include="..\Model\Model.vcxproj">
6060
<Project>{5d3aeefb-8789-48e5-9bd9-09c667052d09}</Project>
6161
</ProjectReference>
6262
</ItemGroup>
6363
<ItemGroup>
6464
<ClCompile Include="IndexOptimizePostTransform.cpp" />
65+
<ClCompile Include="Main.cpp" />
6566
<ClCompile Include="ModelAssimp.cpp" />
66-
<ClCompile Include="ModelConvert.cpp" />
6767
<ClCompile Include="ModelOptimize.cpp" />
6868
</ItemGroup>
6969
<ItemGroup>
@@ -76,23 +76,33 @@
7676
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
7777
<ItemDefinitionGroup>
7878
<Link>
79-
<AdditionalLibraryDirectories>..\Packages\zlib-vc140-static-64.1.2.11\lib\native\libs\x64\static\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
79+
<AdditionalLibraryDirectories>..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\lib_release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
8080
<AdditionalDependencies>zlibstatic.lib;%(AdditionalDependencies)</AdditionalDependencies>
8181
<AdditionalOptions>/nodefaultlib:LIBCMT %(AdditionalOptions)</AdditionalOptions>
82+
<SubSystem>Console</SubSystem>
8283
</Link>
84+
<ClCompile>
85+
<RuntimeLibrary Condition="'$(Configuration)'=='Release'">MultiThreadedDLL</RuntimeLibrary>
86+
</ClCompile>
87+
<ClCompile>
88+
<RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
89+
</ClCompile>
8390
</ItemDefinitionGroup>
8491
<ImportGroup Label="ExtensionTargets">
85-
<Import Project="..\Packages\assimp_native.redist.4.0.1\build\native\assimp_native.redist.targets" Condition="Exists('..\Packages\assimp_native.redist.4.0.1\build\native\assimp_native.redist.targets')" />
86-
<Import Project="..\Packages\assimp_native.4.0.1\build\native\assimp_native.targets" Condition="Exists('..\Packages\assimp_native.4.0.1\build\native\assimp_native.targets')" />
87-
<Import Project="..\Packages\WinPixEventRuntime.1.0.170918004\build\WinPixEventRuntime.targets" Condition="Exists('..\Packages\WinPixEventRuntime.1.0.170918004\build\WinPixEventRuntime.targets')" />
92+
<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')" />
93+
<Import Project="..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" />
94+
<Import Project="..\..\Packages\assimp-v143.5.4.3\build\native\assimp-v143.targets" Condition="Exists('..\..\Packages\assimp-v143.5.4.3\build\native\assimp-v143.targets')" />
95+
<Import Project="..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets" Condition="Exists('..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets')" />
96+
<Import Project="..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets" Condition="Exists('..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets')" />
8897
</ImportGroup>
8998
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
9099
<PropertyGroup>
91100
<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>
92101
</PropertyGroup>
93-
<Error Condition="!Exists('..\Packages\zlib-vc140-static-64.1.2.11\build\native\zlib-vc140-static-64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Packages\zlib-vc140-static-64.1.2.11\build\native\zlib-vc140-static-64.targets'))" />
94-
<Error Condition="!Exists('..\Packages\assimp_native.redist.4.0.1\build\native\assimp_native.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Packages\assimp_native.redist.4.0.1\build\native\assimp_native.redist.targets'))" />
95-
<Error Condition="!Exists('..\Packages\assimp_native.4.0.1\build\native\assimp_native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Packages\assimp_native.4.0.1\build\native\assimp_native.targets'))" />
96-
<Error Condition="!Exists('..\Packages\WinPixEventRuntime.1.0.170918004\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\Packages\WinPixEventRuntime.1.0.170918004\build\WinPixEventRuntime.targets'))" />
102+
<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'))" />
103+
<Error Condition="!Exists('..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets'))" />
104+
<Error Condition="!Exists('..\..\Packages\assimp-v143.5.4.3\build\native\assimp-v143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\assimp-v143.5.4.3\build\native\assimp-v143.targets'))" />
105+
<Error Condition="!Exists('..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\directxtex_desktop_win10.2024.10.29.1\build\native\directxtex_desktop_win10.targets'))" />
106+
<Error Condition="!Exists('..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\build\native\directxmesh_desktop_win10.targets'))" />
97107
</Target>
98108
</Project>

‎MiniEngine/ModelConverter/ModelConverter.vcxproj.filters‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<Filter Include="Source Files">
55
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
66
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
77
</Filter>
88
</ItemGroup>
99
<ItemGroup>
10-
<ClCompile Include="ModelConvert.cpp">
11-
<Filter>Source Files</Filter>
12-
</ClCompile>
1310
<ClCompile Include="IndexOptimizePostTransform.cpp">
1411
<Filter>Source Files</Filter>
1512
</ClCompile>
@@ -19,6 +16,9 @@
1916
<ClCompile Include="ModelOptimize.cpp">
2017
<Filter>Source Files</Filter>
2118
</ClCompile>
19+
<ClCompile Include="Main.cpp">
20+
<Filter>Source Files</Filter>
21+
</ClCompile>
2222
</ItemGroup>
2323
<ItemGroup>
2424
<None Include="packages.config" />

‎MiniEngine/ModelConverter/ModelOptimize.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
#include <string.h>
1818

19+
#pragma warning(disable:4244) // conversion from 'uint32_t' to 'uint16_t', possible loss of data
20+
21+
1922
void AssimpModel::OptimizeRemoveDuplicateVertices(bool depth)
2023
{
2124
unsigned char *deduplicatedVertexData = new unsigned char [depth ? m_Header.vertexDataByteSizeDepth : m_Header.vertexDataByteSize];

‎MiniEngine/ModelConverter/packages.config‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="assimp_native" version="4.0.1" targetFramework="native" />
4-
<package id="assimp_native.redist" version="4.0.1" targetFramework="native" />
5-
<package id="directxmesh_desktop_win10" version="2019.2.7.1" targetFramework="native" />
6-
<package id="directxtex_desktop_win10" version="2019.2.7.1" targetFramework="native" />
7-
<package id="WinPixEventRuntime" version="1.0.181206001" targetFramework="native" />
3+
<package id="assimp-v143" version="5.4.3" targetFramework="native" />
4+
<package id="directxmesh_desktop_win10" version="2024.10.29.1" targetFramework="native" />
5+
<package id="directxtex_desktop_win10" version="2024.10.29.1" targetFramework="native" />
6+
<package id="WinPixEventRuntime" version="1.0.240308001" targetFramework="native" />
87
<package id="zlib-vc140-static-64" version="1.2.11" targetFramework="native" />
98
</packages>

‎MiniEngine/ModelViewer/ModelViewer.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@
355355
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
356356
<ItemDefinitionGroup>
357357
<Link>
358-
<AdditionalLibraryDirectories>..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\lib_release;..\..\Packages\directxtex_desktop_win10.2019.2.7.1\lib\x64\Release;..\..\Packages\directxmesh_desktop_win10.2019.2.7.1\lib\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
358+
<AdditionalLibraryDirectories>..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\lib_release;..\..\Packages\directxtex_desktop_win10.2024.10.29.1\lib\x64\Release;..\..\Packages\directxmesh_desktop_win10.2024.10.29.1\lib\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
359359
<AdditionalDependencies>zlibstatic.lib;DirectXMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
360360
<AdditionalDependencies Condition="'$(Platform)'=='x64'">DirectXTex.lib;%(AdditionalDependencies)</AdditionalDependencies>
361361
</Link>

0 commit comments

Comments
 (0)