summaryrefslogtreecommitdiff
path: root/msbuild
diff options
context:
space:
mode:
Diffstat (limited to 'msbuild')
-rw-r--r--msbuild/pack/pack.vcxproj24
-rw-r--r--msbuild/shaders/shaders.vcxproj10
-rw-r--r--msbuild/shaders/shaders.vcxproj.filters6
-rw-r--r--msbuild/textures/textures.vcxproj9
-rw-r--r--msbuild/textures/textures.vcxproj.filters3
5 files changed, 40 insertions, 12 deletions
diff --git a/msbuild/pack/pack.vcxproj b/msbuild/pack/pack.vcxproj
index 5efecfd..c2279b9 100644
--- a/msbuild/pack/pack.vcxproj
+++ b/msbuild/pack/pack.vcxproj
@@ -144,21 +144,21 @@
</ItemDefinitionGroup>
<ItemGroup>
<CustomBuild Include="thing.txt">
- <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>
+ <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;$(SolutionDir)..\data\surface_depthonly.csh;$(SolutionDir)..\data\sky.tex;$(SolutionDir)..\data\sky.csh</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;$(SolutionDir)..\data\surface_depthonly.csh;$(SolutionDir)..\data\sky.tex;$(SolutionDir)..\data\sky.csh</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;$(SolutionDir)..\data\surface_depthonly.csh;$(SolutionDir)..\data\sky.tex;$(SolutionDir)..\data\sky.csh</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;$(SolutionDir)..\data\surface_depthonly.csh;$(SolutionDir)..\data\sky.tex;$(SolutionDir)..\data\sky.csh</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 sky.tex surface_depthonly.csh sky.csh</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 sky.tex surface_depthonly.csh</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 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>
+ <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 sky.tex surface_depthonly.csh sky.csh</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 sky.tex surface_depthonly.csh</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 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>
+ <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 sky.tex surface_depthonly.csh sky.csh</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 sky.tex surface_depthonly.csh</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 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>
+ <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 sky.tex surface_depthonly.csh sky.csh</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 sky.tex surface_depthonly.csh</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\pack</Outputs>
</CustomBuild>
</ItemGroup>
diff --git a/msbuild/shaders/shaders.vcxproj b/msbuild/shaders/shaders.vcxproj
index f5ed96b..06754e9 100644
--- a/msbuild/shaders/shaders.vcxproj
+++ b/msbuild/shaders/shaders.vcxproj
@@ -204,6 +204,16 @@
<FileType>Document</FileType>
</CustomBuild>
</ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\..\intermediate\surface_depthonly.glsl">
+ <FileType>Document</FileType>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\..\intermediate\sky.glsl">
+ <FileType>Document</FileType>
+ </CustomBuild>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/msbuild/shaders/shaders.vcxproj.filters b/msbuild/shaders/shaders.vcxproj.filters
index 3e82e32..589a4bf 100644
--- a/msbuild/shaders/shaders.vcxproj.filters
+++ b/msbuild/shaders/shaders.vcxproj.filters
@@ -24,5 +24,11 @@
<CustomBuild Include="..\..\intermediate\surface.glsl">
<Filter>Source Files</Filter>
</CustomBuild>
+ <CustomBuild Include="..\..\intermediate\surface_depthonly.glsl">
+ <Filter>Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\..\intermediate\sky.glsl">
+ <Filter>Source Files</Filter>
+ </CustomBuild>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/msbuild/textures/textures.vcxproj b/msbuild/textures/textures.vcxproj
index 2ee9f8c..b418c7f 100644
--- a/msbuild/textures/textures.vcxproj
+++ b/msbuild/textures/textures.vcxproj
@@ -207,6 +207,15 @@
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex bc5</Command>
</CustomBuild>
</ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\..\intermediate\sky.hdr">
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex rgba16f</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex rgba16f</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex rgba16f</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\convtexture\$(Configuration)\$(Platform)\convtexture.exe %(FullPath) $(SolutionDir)..\data\%(Filename).tex rgba16f</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 1fe2391..c0aa978 100644
--- a/msbuild/textures/textures.vcxproj.filters
+++ b/msbuild/textures/textures.vcxproj.filters
@@ -33,5 +33,8 @@
<CustomBuild Include="..\..\intermediate\brick_normal.bmp">
<Filter>Source Files</Filter>
</CustomBuild>
+ <CustomBuild Include="..\..\intermediate\sky.hdr">
+ <Filter>Source Files</Filter>
+ </CustomBuild>
</ItemGroup>
</Project> \ No newline at end of file