Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/xd_dev' into xd_dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@q4a
q4a committed May 28, 2018
2 parents 6da29d8 + e061f14 commit 91cec0b
Show file tree
Hide file tree
Showing 22 changed files with 29,696 additions and 203 deletions.
4 changes: 0 additions & 4 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@
[submodule "Externals/pugixml"]
path = Externals/pugixml
url = https://github.com/zeux/pugixml.git
[submodule "Externals/glew"]
path = Externals/glew
url = https://github.com/Armada651/glew.git
branch = build
[submodule "Externals/gli"]
path = Externals/gli
url = https://github.com/g-truc/gli.git
Expand Down
16 changes: 6 additions & 10 deletions Externals/SPIRV.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,17 @@
<ClInclude Include="glslang\SPIRV\SPVRemapper.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="glslang.vcxproj">
<Project>{8559bc92-bc07-32ef-beed-0c50fe6ca3c3}</Project>
</ProjectReference>
<ProjectReference Include="HLSL.vcxproj">
<Project>63CEEE7D-2A82-3FDB-AF79-23F77BB29AC1</Project>
<Name>HLSL</Name>
<Project>{63ceee7d-2a82-3fdb-af79-23f77bb29ac1}</Project>
</ProjectReference>
<ProjectReference Include="OGLCompiler.vcxproj">
<Project>D4C49E20-DE3E-36FE-8BFA-0517A87FDB47</Project>
<Name>OGLCompiler</Name>
<Project>{d4c49e20-de3e-36fe-8bfa-0517a87fdb47}</Project>
</ProjectReference>
<ProjectReference Include="OSDependent.vcxproj">
<Project>0165B392-9E93-3AA3-89F3-20ACB545095D</Project>
<Name>OSDependent</Name>
</ProjectReference>
<ProjectReference Include="glslang.vcxproj">
<Project>8559BC92-BC07-32EF-BEED-0C50FE6CA3C3</Project>
<Name>glslang</Name>
<Project>{0165b392-9e93-3aa3-89f3-20acb545095d}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
1 change: 0 additions & 1 deletion Externals/glew
Submodule glew deleted from d2df29
2 changes: 1 addition & 1 deletion Externals/glslang
Submodule glslang updated 772 files
17 changes: 8 additions & 9 deletions Externals/glslang.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="glslang\glslang\MachineIndependent\attribute.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\Constant.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\glslang_tab.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\InfoSink.cpp" />
Expand All @@ -98,6 +99,7 @@
<ClCompile Include="glslang\glslang\MachineIndependent\ShaderLang.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\SymbolTable.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\Versions.cpp" />
<ClInclude Include="glslang\glslang\MachineIndependent\attribute.h" />
<ClInclude Include="glslang\glslang\MachineIndependent\glslang_tab.cpp.h" />
<ClInclude Include="glslang\glslang\MachineIndependent\gl_types.h" />
<ClInclude Include="glslang\glslang\MachineIndependent\Initialize.h" />
Expand Down Expand Up @@ -131,23 +133,20 @@
<ClCompile Include="glslang\glslang\GenericCodeGen\CodeGen.cpp" />
<ClCompile Include="glslang\glslang\GenericCodeGen\Link.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="glslang\glslang\MachineIndependent\glslang.y" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="HLSL.vcxproj">
<Project>63CEEE7D-2A82-3FDB-AF79-23F77BB29AC1</Project>
<Name>HLSL</Name>
<Project>{63ceee7d-2a82-3fdb-af79-23f77bb29ac1}</Project>
</ProjectReference>
<ProjectReference Include="OGLCompiler.vcxproj">
<Project>D4C49E20-DE3E-36FE-8BFA-0517A87FDB47</Project>
<Name>OGLCompiler</Name>
<Project>{d4c49e20-de3e-36fe-8bfa-0517a87fdb47}</Project>
</ProjectReference>
<ProjectReference Include="OSDependent.vcxproj">
<Project>0165B392-9E93-3AA3-89F3-20ACB545095D</Project>
<Name>OSDependent</Name>
<Project>{0165b392-9e93-3aa3-89f3-20acb545095d}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="glslang\glslang\MachineIndependent\glslang.y" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
6 changes: 6 additions & 0 deletions Externals/glslang.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@
<ClCompile Include="glslang\glslang\MachineIndependent\Versions.cpp">
<Filter>MachineIndependent</Filter>
</ClCompile>
<ClCompile Include="glslang\glslang\MachineIndependent\attribute.cpp">
<Filter>MachineIndependent</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="glslang\glslang\Public\ShaderLang.h">
Expand Down Expand Up @@ -177,6 +180,9 @@
<ClInclude Include="glslang\glslang\MachineIndependent\Versions.h">
<Filter>MachineIndependent</Filter>
</ClInclude>
<ClInclude Include="glslang\glslang\MachineIndependent\attribute.h">
<Filter>MachineIndependent</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Public">
Expand Down
30 changes: 9 additions & 21 deletions res/gamedata/shaders/gl/common_defines.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,23 @@
#define common_defines_h_included

//////////////////////////////////////////////////////////////////////////////////////////
// Defines
// Defines //
#define def_gloss float(2.f /255.f)
#define def_aref float(200.f/255.f)
#define def_dbumph float(0.333f)
#define def_virtualh float(0.05f) // 5cm
#define def_distort float(0.05f) // we get -0.5 .. 0.5 range, this is -512 .. 512 for 1024, so scale it
#define def_hdr float(9.f) // hight luminance range float(3.h)
#define def_hdr_clip float(0.75f) //
#define def_distort float(0.05f) // we get -0.5 .. 0.5 range, this is -512 .. 512 for 1024, so scale it
#define def_hdr float(9.f) // hight luminance range float(3.h)
#define def_hdr_clip float(0.75f) //

#define LUMINANCE_VECTOR float3(0.3f, 0.38f, 0.22f)

//////////////////////////////////////////////////////////////////////////////////////////
// skyloader: if you want to resize smaps in renderer, then do not forget to change this file too
#ifndef SMAP_QUALITY
const float SMAP_size = 2048.f;
#elif SMAP_QUALITY == 1
const float SMAP_size = 1536.f;
#elif SMAP_QUALITY == 2
const float SMAP_size = 2048.f;
#elif SMAP_QUALITY == 3
const float SMAP_size = 2560.f;
#elif SMAP_QUALITY == 4
const float SMAP_size = 3072.f;
#elif SMAP_QUALITY == 5
const float SMAP_size = 4096.f;
#ifndef SMAP_size
#define SMAP_size 1024
#endif
//////////////////////////////////////////////////////////////////////////////////////////
#define PARALLAX_H float(0.02f)
#define parallax float2(PARALLAX_H, -PARALLAX_H/2)
#define PARALLAX_H 0.02
#define parallax float2(PARALLAX_H, -PARALLAX_H/2)
//////////////////////////////////////////////////////////////////////////////////////////

#endif // common_defines_h_included
#endif // common_defines_h_included
Loading

0 comments on commit 91cec0b

Please sign in to comment.