From a83c6ad6e07b5cd38883ee8e65007cfe41a3f482 Mon Sep 17 00:00:00 2001
From: quou <quou@disroot.org>
Date: Wed, 1 Jan 2025 19:09:51 +1100
Subject: update msbuild

---
 msbuild/c2.sln                                    |  20 +++
 msbuild/c2.vcxproj                                |   1 +
 msbuild/c2.vcxproj.filters                        |   3 +
 msbuild/convmaterial/convmaterial.vcxproj         | 171 ++++++++++++++++++++++
 msbuild/convmaterial/convmaterial.vcxproj.filters |  22 +++
 msbuild/pack/pack.vcxproj                         |  27 ++--
 msbuild/textures/textures.vcxproj                 |  26 ++++
 msbuild/textures/textures.vcxproj.filters         |  12 ++
 8 files changed, 270 insertions(+), 12 deletions(-)
 create mode 100644 msbuild/convmaterial/convmaterial.vcxproj
 create mode 100644 msbuild/convmaterial/convmaterial.vcxproj.filters

(limited to 'msbuild')

diff --git a/msbuild/c2.sln b/msbuild/c2.sln
index d015c78..849beb7 100644
--- a/msbuild/c2.sln
+++ b/msbuild/c2.sln
@@ -28,6 +28,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convmodel", "convmodel\conv
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models", "models\models.vcxproj", "{B68E4313-0930-4E49-9D71-312727DAEF51}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convmaterial", "convmaterial\convmaterial.vcxproj", "{02DDF589-A120-44F4-A4D8-99D8B98D8F36}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "materials", "..\materials\materials.vcxproj", "{1F7F3308-386E-459E-A103-0714BD3156E1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -124,6 +128,22 @@ Global
 		{B68E4313-0930-4E49-9D71-312727DAEF51}.Release|x64.Build.0 = Release|x64
 		{B68E4313-0930-4E49-9D71-312727DAEF51}.Release|x86.ActiveCfg = Release|Win32
 		{B68E4313-0930-4E49-9D71-312727DAEF51}.Release|x86.Build.0 = Release|Win32
+		{02DDF589-A120-44F4-A4D8-99D8B98D8F36}.Debug|x64.ActiveCfg = Debug|x64
+		{02DDF589-A120-44F4-A4D8-99D8B98D8F36}.Debug|x64.Build.0 = Debug|x64
+		{02DDF589-A120-44F4-A4D8-99D8B98D8F36}.Debug|x86.ActiveCfg = Debug|Win32
+		{02DDF589-A120-44F4-A4D8-99D8B98D8F36}.Debug|x86.Build.0 = Debug|Win32
+		{02DDF589-A120-44F4-A4D8-99D8B98D8F36}.Release|x64.ActiveCfg = Release|x64
+		{02DDF589-A120-44F4-A4D8-99D8B98D8F36}.Release|x64.Build.0 = Release|x64
+		{02DDF589-A120-44F4-A4D8-99D8B98D8F36}.Release|x86.ActiveCfg = Release|Win32
+		{02DDF589-A120-44F4-A4D8-99D8B98D8F36}.Release|x86.Build.0 = Release|Win32
+		{1F7F3308-386E-459E-A103-0714BD3156E1}.Debug|x64.ActiveCfg = Debug|x64
+		{1F7F3308-386E-459E-A103-0714BD3156E1}.Debug|x64.Build.0 = Debug|x64
+		{1F7F3308-386E-459E-A103-0714BD3156E1}.Debug|x86.ActiveCfg = Debug|Win32
+		{1F7F3308-386E-459E-A103-0714BD3156E1}.Debug|x86.Build.0 = Debug|Win32
+		{1F7F3308-386E-459E-A103-0714BD3156E1}.Release|x64.ActiveCfg = Release|x64
+		{1F7F3308-386E-459E-A103-0714BD3156E1}.Release|x64.Build.0 = Release|x64
+		{1F7F3308-386E-459E-A103-0714BD3156E1}.Release|x86.ActiveCfg = Release|Win32
+		{1F7F3308-386E-459E-A103-0714BD3156E1}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/msbuild/c2.vcxproj b/msbuild/c2.vcxproj
index c6bc44d..f99fa09 100644
--- a/msbuild/c2.vcxproj
+++ b/msbuild/c2.vcxproj
@@ -174,6 +174,7 @@
     <ClInclude Include="..\app.hpp" />
     <ClInclude Include="..\asset.hpp" />
     <ClInclude Include="..\glad_vk.h" />
+    <ClInclude Include="..\material.h" />
     <ClInclude Include="..\maths.hpp" />
     <ClInclude Include="..\model.hpp" />
     <ClInclude Include="..\ui.hpp" />
diff --git a/msbuild/c2.vcxproj.filters b/msbuild/c2.vcxproj.filters
index f6038e5..dd5aa10 100644
--- a/msbuild/c2.vcxproj.filters
+++ b/msbuild/c2.vcxproj.filters
@@ -62,5 +62,8 @@
     <ClInclude Include="..\model.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\material.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/msbuild/convmaterial/convmaterial.vcxproj b/msbuild/convmaterial/convmaterial.vcxproj
new file mode 100644
index 0000000..20232a8
--- /dev/null
+++ b/msbuild/convmaterial/convmaterial.vcxproj
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{02ddf589-a120-44f4-a4d8-99d8b98d8f36}</ProjectGuid>
+    <RootNamespace>convmaterial</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)bin\$(ProjectName)\$(Configuration)\$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\$(Platform)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)bin\$(ProjectName)\$(Configuration)\$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\$(Platform)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)bin\$(ProjectName)\$(Configuration)\$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\$(Platform)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)bin\$(ProjectName)\$(Configuration)\$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\$(Platform)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>plat_win;plat_x86;allocation_default_alignment=8;_CRT_SECURE_NO_WARNINGS;DEBUG;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\qstd;$(SolutionDir)..\</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>qstd.lib;cfg.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)bin\qstd\$(Configuration)\$(Platform)\;$(SolutionDir)bin\cfg\$(Configuration)\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>plat_win;plat_x86;allocation_default_alignment=8;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\qstd;$(SolutionDir)..\</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>qstd.lib;cfg.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)bin\qstd\$(Configuration)\$(Platform)\;$(SolutionDir)bin\cfg\$(Configuration)\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>plat_win;plat_x86;allocation_default_alignment=8;_CRT_SECURE_NO_WARNINGS;DEBUG;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\qstd;$(SolutionDir)..\</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>qstd.lib;cfg.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)bin\qstd\$(Configuration)\$(Platform)\;$(SolutionDir)bin\cfg\$(Configuration)\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>plat_win;plat_x86;allocation_default_alignment=8;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\qstd;$(SolutionDir)..\</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>qstd.lib;cfg.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)bin\qstd\$(Configuration)\$(Platform)\;$(SolutionDir)bin\cfg\$(Configuration)\$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\convmaterial.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\cfg\cfg.vcxproj">
+      <Project>{5b5d6195-0efc-4dad-80f5-db69530f9e33}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\qstd\qstd.vcxproj">
+      <Project>{1bb0efa0-f482-4d8c-adcc-946343d3fe02}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/msbuild/convmaterial/convmaterial.vcxproj.filters b/msbuild/convmaterial/convmaterial.vcxproj.filters
new file mode 100644
index 0000000..fc28d73
--- /dev/null
+++ b/msbuild/convmaterial/convmaterial.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\convmaterial.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/msbuild/pack/pack.vcxproj b/msbuild/pack/pack.vcxproj
index 8d48efd..5efecfd 100644
--- a/msbuild/pack/pack.vcxproj
+++ b/msbuild/pack/pack.vcxproj
@@ -144,25 +144,28 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <CustomBuild Include="thing.txt">
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;$(SolutionDir)..\data\surface.csh;$(SolutionDir)..\data\monkey.mdl;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;$(SolutionDir)..\data\surface.csh;$(SolutionDir)..\data\monkey.mdl;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;$(SolutionDir)..\data\surface.csh;$(SolutionDir)..\data\monkey.mdl;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;$(SolutionDir)..\data\surface.csh;$(SolutionDir)..\data\monkey.mdl;%(AdditionalInputs)</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Message>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\brick_albedo.tex;$(SolutionDir)..\data\brick_ao.tex;$(SolutionDir)..\data\brick_metal.tex;$(SolutionDir)..\data\brick_normal.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;$(SolutionDir)..\data\surface.csh;$(SolutionDir)..\data\monkey.mdl;$(SolutionDir)..\data\bricks.mat;$(SolutionDir)..\data\plastic.mat</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\brick_albedo.tex;$(SolutionDir)..\data\brick_ao.tex;$(SolutionDir)..\data\brick_metal.tex;$(SolutionDir)..\data\brick_normal.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;$(SolutionDir)..\data\surface.csh;$(SolutionDir)..\data\monkey.mdl;$(SolutionDir)..\data\bricks.mat;$(SolutionDir)..\data\plastic.mat</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\brick_albedo.tex;$(SolutionDir)..\data\brick_ao.tex;$(SolutionDir)..\data\brick_metal.tex;$(SolutionDir)..\data\brick_normal.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;$(SolutionDir)..\data\surface.csh;$(SolutionDir)..\data\monkey.mdl;$(SolutionDir)..\data\bricks.mat;$(SolutionDir)..\data\plastic.mat</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\brick_albedo.tex;$(SolutionDir)..\data\brick_ao.tex;$(SolutionDir)..\data\brick_metal.tex;$(SolutionDir)..\data\brick_normal.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;$(SolutionDir)..\data\surface.csh;$(SolutionDir)..\data\monkey.mdl;$(SolutionDir)..\data\bricks.mat;$(SolutionDir)..\data\plastic.mat</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex brick_albedo.tex brick_ao.tex brick_metal.tex brick_normal.tex triangle.csh ui.csh surface.csh monkey.mdl bricks.mat plastic.mat</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex brick_albedo.tex brick_ao.tex brick_metal.tex brick_normal.tex triangle.csh ui.csh surface.csh monkey.mdl bricks.mat plastic.mat</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\pack</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex brick_albedo.tex brick_ao.tex brick_metal.tex brick_normal.tex triangle.csh ui.csh surface.csh monkey.mdl bricks.mat plastic.mat</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex brick_albedo.tex brick_ao.tex brick_metal.tex brick_normal.tex triangle.csh ui.csh surface.csh monkey.mdl bricks.mat plastic.mat</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\pack</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex brick_albedo.tex brick_ao.tex brick_metal.tex brick_normal.tex triangle.csh ui.csh surface.csh monkey.mdl bricks.mat plastic.mat</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex brick_albedo.tex brick_ao.tex brick_metal.tex brick_normal.tex triangle.csh ui.csh surface.csh monkey.mdl bricks.mat plastic.mat</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\pack</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex brick_albedo.tex brick_ao.tex brick_metal.tex brick_normal.tex triangle.csh ui.csh surface.csh monkey.mdl bricks.mat plastic.mat</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex brick_albedo.tex brick_ao.tex brick_metal.tex brick_normal.tex triangle.csh ui.csh surface.csh monkey.mdl bricks.mat plastic.mat</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\pack</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\materials\materials.vcxproj">
+      <Project>{1f7f3308-386e-459e-a103-0714bd3156e1}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\models\models.vcxproj">
       <Project>{b68e4313-0930-4e49-9d71-312727daef51}</Project>
     </ProjectReference>
diff --git a/msbuild/textures/textures.vcxproj b/msbuild/textures/textures.vcxproj
index 72b1e1b..2ee9f8c 100644
--- a/msbuild/textures/textures.vcxproj
+++ b/msbuild/textures/textures.vcxproj
@@ -181,6 +181,32 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc1</Command>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\intermediate\brick_albedo.bmp">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc1</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc1</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc1</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc1</Command>
+    </CustomBuild>
+    <CustomBuild Include="..\..\intermediate\brick_ao.bmp">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc4</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc4</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc4</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc4</Command>
+    </CustomBuild>
+    <CustomBuild Include="..\..\intermediate\brick_metal.bmp">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc4</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc4</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc4</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc4</Command>
+    </CustomBuild>
+    <CustomBuild Include="..\..\intermediate\brick_normal.bmp">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc5</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc5</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc5</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc5</Command>
+    </CustomBuild>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/msbuild/textures/textures.vcxproj.filters b/msbuild/textures/textures.vcxproj.filters
index 4d9d1c3..1fe2391 100644
--- a/msbuild/textures/textures.vcxproj.filters
+++ b/msbuild/textures/textures.vcxproj.filters
@@ -21,5 +21,17 @@
     <CustomBuild Include="..\..\intermediate\kita.bmp">
       <Filter>Source Files</Filter>
     </CustomBuild>
+    <CustomBuild Include="..\..\intermediate\brick_albedo.bmp">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\intermediate\brick_ao.bmp">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\intermediate\brick_metal.bmp">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\intermediate\brick_normal.bmp">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf