WIP of xrAI and xrSE_Factory. Use an external load mechanism for STex…

…tureParams.
OpenXRay · Jan 1, 2018 · bd3909e · bd3909e
1 parent 5aef55f
commit bd3909e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/utils/xrAI/compiler_load.cpp b/src/utils/xrAI/compiler_load.cpp
@@ -144,19 +144,8 @@ void xrLoad(LPCSTR name, bool draft_mode)
                         IReader* THM = FS.r_open("$game_textures$", N);
                         R_ASSERT2(THM, N);
 
-                        // version
-                        u32 version = 0;
-                        R_ASSERT(THM->r_chunk(THM_CHUNK_VERSION, &version));
                         // analyze thumbnail information
-                        R_ASSERT(THM->find_chunk(THM_CHUNK_TEXTUREPARAM));
-                        THM->r(&BT.THM.fmt, sizeof(STextureParams::ETFormat));
-                        BT.THM.flags.assign(THM->r_u32());
-                        BT.THM.border_color = THM->r_u32();
-                        BT.THM.fade_color = THM->r_u32();
-                        BT.THM.fade_amount = THM->r_u32();
-                        BT.THM.mip_filter = THM->r_u32();
-                        BT.THM.width = THM->r_u32();
-                        BT.THM.height = THM->r_u32();
+                        BT.THM.Load(*THM);
                         BOOL bLOD = FALSE;
                         if (N[0] == 'l' && N[1] == 'o' && N[2] == 'd' && N[3] == '\\')
                             bLOD = TRUE;

diff --git a/src/utils/xrAI/xrAI.vcxproj b/src/utils/xrAI/xrAI.vcxproj
@@ -154,6 +154,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\Layers\xrRender\ETextureParams.cpp" />
     <ClCompile Include="..\..\xrEngine\xrLoadSurface.cpp" />
     <ClCompile Include="..\..\xrServerEntities\alife_human_brain.cpp" />
     <ClCompile Include="..\..\xrServerEntities\alife_monster_brain.cpp" />
@@ -191,6 +192,7 @@
     <ClCompile Include="xr_graph_merge.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\Layers\xrRender\ETextureParams.h" />
     <ClInclude Include="..\..\xrServerEntities\alife_human_brain.h" />
     <ClInclude Include="..\..\xrServerEntities\alife_human_brain_inline.h" />
     <ClInclude Include="..\..\xrServerEntities\alife_monster_brain.h" />

diff --git a/src/utils/xrAI/xrAI.vcxproj.filters b/src/utils/xrAI/xrAI.vcxproj.filters
@@ -156,6 +156,9 @@
     <ClCompile Include="guid_generator.cpp">
       <Filter>ALife\guid_generator</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Layers\xrRender\ETextureParams.cpp">
+      <Filter>Compiler</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="AIMapExport.h">
@@ -332,6 +335,9 @@
     <ClInclude Include="resource.h">
       <Filter>Resources</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Layers\xrRender\ETextureParams.h">
+      <Filter>Compiler</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resource.rc">