Skip to content

Commit

Permalink
Fixed trackbars position on 4:3 ratio for settings
Browse files Browse the repository at this point in the history 
Dynamic wet surfaces near / far / shadow map resolution were wrongly
positioned
  • Loading branch information
@Xottab-DUTY
Xottab-DUTY committed Aug 10, 2018
1 parent bfafcf4 commit 52ebafd
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 57 deletions.
6 changes: 3 additions & 3 deletions res/gamedata/configs/ui/ui_mm_opt.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,23 +297,23 @@
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r3_dynamic_wet_surfaces_near</text>
</cap_r3_dynamic_wet_surfaces_near>

<track_r3_dynamic_wet_surfaces_near x="175" y="97" width="235" height="16">
<track_r3_dynamic_wet_surfaces_near x="180" y="6" width="235" height="16">
<options_item entry="r3_dynamic_wet_surfaces_near" group="mm_opt_video" depend="runtime"/>
</track_r3_dynamic_wet_surfaces_near>

<cap_r3_dynamic_wet_surfaces_far x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r3_dynamic_wet_surfaces_far</text>
</cap_r3_dynamic_wet_surfaces_far>

<track_r3_dynamic_wet_surfaces_far x="175" y="97" width="235" height="16">
<track_r3_dynamic_wet_surfaces_far x="180" y="6" width="235" height="16">
<options_item entry="r3_dynamic_wet_surfaces_far" group="mm_opt_video" depend="runtime"/>
</track_r3_dynamic_wet_surfaces_far>

<cap_r3_dynamic_wet_surfaces_sm_res x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r3_dynamic_wet_surfaces_sm_res</text>
</cap_r3_dynamic_wet_surfaces_sm_res>

<track_r3_dynamic_wet_surfaces_sm_res x="175" y="97" width="235" height="16" step="16" is_integer="1">
<track_r3_dynamic_wet_surfaces_sm_res x="180" y="6" width="235" height="16" step="16" is_integer="1">
<options_item entry="r3_dynamic_wet_surfaces_sm_res" group="mm_opt_video" depend="runtime"/>
</track_r3_dynamic_wet_surfaces_sm_res>

Expand Down
102 changes: 48 additions & 54 deletions src/xrEngine/xrEngine.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,6 @@
<Filter Include="Engine\text_editor\edit_actions">
<UniqueIdentifier>{e23b35a1-652e-47bb-8941-1653504cd776}</UniqueIdentifier>
</Filter>
<Filter Include="RenderRef">
<UniqueIdentifier>{e4d34774-3a5b-468f-9400-12c702636fa1}</UniqueIdentifier>
</Filter>
<Filter Include="RenderRef\Execution &amp; 3D">
<UniqueIdentifier>{32271206-64dd-4f87-a215-4b1106afd35f}</UniqueIdentifier>
</Filter>
<Filter Include="RenderRef\Execution &amp; 3D\Device">
<UniqueIdentifier>{43966447-6d34-46c3-956d-adaa49b48525}</UniqueIdentifier>
</Filter>
<Filter Include="editor">
<UniqueIdentifier>{94169f02-9d9d-46d0-9fdf-58f636a57c46}</UniqueIdentifier>
</Filter>
Expand Down Expand Up @@ -238,6 +229,9 @@
<Filter Include="Interfaces\ILoadingScreen">
<UniqueIdentifier>{84e3429f-eb46-4db1-bd1c-9af2413b1de0}</UniqueIdentifier>
</Filter>
<Filter Include="Rendering Device">
<UniqueIdentifier>{e4d34774-3a5b-468f-9400-12c702636fa1}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="defines.h">
Expand Down Expand Up @@ -429,15 +423,6 @@
<ClInclude Include="edit_actions.h">
<Filter>Engine\text_editor\edit_actions</Filter>
</ClInclude>
<ClInclude Include="device.h">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClInclude>
<ClInclude Include="StatGraph.h">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClInclude>
<ClInclude Include="Stats.h">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClInclude>
<ClInclude Include="engine_impl.hpp">
<Filter>editor\engine_impl</Filter>
</ClInclude>
Expand Down Expand Up @@ -537,12 +522,6 @@
<ClInclude Include="GameMtlLib.h">
<Filter>Game API\MaterialSystem</Filter>
</ClInclude>
<ClInclude Include="PerformanceAlert.hpp">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClInclude>
<ClInclude Include="IPerformanceAlert.hpp">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClInclude>
<ClInclude Include="IGameFont.hpp">
<Filter>Render\Font output</Filter>
</ClInclude>
Expand Down Expand Up @@ -570,6 +549,21 @@
<ClInclude Include="ILoadingScreen.h">
<Filter>Interfaces\ILoadingScreen</Filter>
</ClInclude>
<ClInclude Include="device.h">
<Filter>Rendering Device</Filter>
</ClInclude>
<ClInclude Include="IPerformanceAlert.hpp">
<Filter>Rendering Device</Filter>
</ClInclude>
<ClInclude Include="PerformanceAlert.hpp">
<Filter>Rendering Device</Filter>
</ClInclude>
<ClInclude Include="StatGraph.h">
<Filter>Rendering Device</Filter>
</ClInclude>
<ClInclude Include="Stats.h">
<Filter>Rendering Device</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="defines.cpp">
Expand Down Expand Up @@ -749,33 +743,6 @@
<ClCompile Include="edit_actions.cpp">
<Filter>Engine\text_editor\edit_actions</Filter>
</ClCompile>
<ClCompile Include="device.cpp">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClCompile>
<ClCompile Include="Device_create.cpp">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClCompile>
<ClCompile Include="Device_destroy.cpp">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClCompile>
<ClCompile Include="Device_Initialize.cpp">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClCompile>
<ClCompile Include="Device_Misc.cpp">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClCompile>
<ClCompile Include="Device_overdraw.cpp">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClCompile>
<ClCompile Include="Device_wndproc.cpp">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClCompile>
<ClCompile Include="StatGraph.cpp">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClCompile>
<ClCompile Include="Stats.cpp">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClCompile>
<ClCompile Include="engine_impl.cpp">
<Filter>editor\engine_impl</Filter>
</ClCompile>
Expand Down Expand Up @@ -869,9 +836,6 @@
<ClCompile Include="GameMtlLib_Engine.cpp">
<Filter>Game API\MaterialSystem</Filter>
</ClCompile>
<ClCompile Include="PerformanceAlert.cpp">
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
</ClCompile>
<ClCompile Include="IGame_Level.cpp">
<Filter>Game API\Level</Filter>
</ClCompile>
Expand All @@ -887,6 +851,36 @@
<ClCompile Include="splash.cpp">
<Filter>General</Filter>
</ClCompile>
<ClCompile Include="device.cpp">
<Filter>Rendering Device</Filter>
</ClCompile>
<ClCompile Include="Device_create.cpp">
<Filter>Rendering Device</Filter>
</ClCompile>
<ClCompile Include="Device_destroy.cpp">
<Filter>Rendering Device</Filter>
</ClCompile>
<ClCompile Include="Device_Initialize.cpp">
<Filter>Rendering Device</Filter>
</ClCompile>
<ClCompile Include="Device_Misc.cpp">
<Filter>Rendering Device</Filter>
</ClCompile>
<ClCompile Include="Device_overdraw.cpp">
<Filter>Rendering Device</Filter>
</ClCompile>
<ClCompile Include="Device_wndproc.cpp">
<Filter>Rendering Device</Filter>
</ClCompile>
<ClCompile Include="PerformanceAlert.cpp">
<Filter>Rendering Device</Filter>
</ClCompile>
<ClCompile Include="StatGraph.cpp">
<Filter>Rendering Device</Filter>
</ClCompile>
<ClCompile Include="Stats.cpp">
<Filter>Rendering Device</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Text Include="ClientServer.txt" />
Expand Down

0 comments on commit 52ebafd

Please sign in to comment.