[Tool] Rewrite bsp -> model conversion code.

More feature complete and way more maintainable now than directly reading tags as binary data from disk was.
Project-Cartographer · Dec 8, 2019 · 67375bc · 67375bc
1 parent 3424de0
commit 67375bc
Show file tree

Hide file tree

Showing 7 changed files with 187 additions and 612 deletions.
diff --git a/H2Codez/H2Codez.vcxproj b/H2Codez/H2Codez.vcxproj
@@ -186,7 +186,6 @@
     <ClInclude Include="H2Sapien\H2Sapien.h" />
     <ClInclude Include="Common\H2EKCommon.h" />
     <ClInclude Include="H2Tool\H2Tool.h" />
-    <ClInclude Include="H2Tool\H2Tool_Render_Model.h" />
     <ClInclude Include="HaloScript\hs_interface.h" />
     <ClInclude Include="HaloScript\hs_command.h" />
     <ClInclude Include="HaloScript\hs_global_ids.h" />
@@ -250,7 +249,6 @@
     <ClCompile Include="H2Guerilla\H2Guerilla.cpp" />
     <ClCompile Include="H2Sapien\H2Sapien.cpp" />
     <ClCompile Include="Common\H2EKCommon.cpp" />
-    <ClCompile Include="H2Tool\H2Tool_Render_Model.cpp" />
     <ClCompile Include="H2Tool\H2Tool.cpp" />
     <ClCompile Include="HaloScript\hs_interface.cpp" />
     <ClCompile Include="util\FileWatcher.cpp" />

diff --git a/H2Codez/H2Codez.vcxproj.filters b/H2Codez/H2Codez.vcxproj.filters
@@ -92,9 +92,6 @@
     <ClInclude Include="Version.h">
       <Filter>Source Files\Common Interfaces</Filter>
     </ClInclude>
-    <ClInclude Include="H2Tool\H2Tool_Render_Model.h">
-      <Filter>Source Files\Patches\H2Tool</Filter>
-    </ClInclude>
     <ClInclude Include="Resources\resource.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
@@ -328,9 +325,6 @@
     <ClCompile Include="h2codez.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="H2Tool\H2Tool_Render_Model.cpp">
-      <Filter>Source Files\Patches\H2Tool</Filter>
-    </ClCompile>
     <ClCompile Include="stdafx.cpp">
       <Filter>Header Files</Filter>
     </ClCompile>

diff --git a/H2Codez/H2Tool/Animations.inl b/H2Codez/H2Tool/Animations.inl
@@ -275,7 +275,7 @@ static void _cdecl import_extra_model_animations_proc(wcstring* arguments)
 	if (tool_build_paths(arguments[0], "animations", reference, out_path, NULL))
 	{
 		std::cout << "=== importing! ===" << std::endl;
-		static const void* animation_import_definitions = CAST_PTR(void*, 0x97DEC8);
+		static const auto *animation_import_definitions = CAST_PTR(s_tool_import_definations*, 0x97DEC8);
 		if (use_import_definitions(animation_import_definitions, 8, reference, &animation_compiler, NULL))
 		{
 			std::cout << "=== saving tag! ===" << std::endl;

diff --git a/H2Codez/H2Tool/H2Tool.h b/H2Codez/H2Tool/H2Tool.h
@@ -39,7 +39,7 @@ struct s_tool_command {
 
 typedef bool __cdecl import_def_translate_path(file_reference *data_file, file_reference *tag);
 
-struct s_tool_import_definations_
+struct s_tool_import_definations
 {
 	cstring							file_extension;
 	_tool_import__defination_proc   import_proc;