Skip to content

Commit 52ebafd

Browse files
Xottab-DUTYXottab-DUTY
committed
Fixed trackbars position on 4:3 ratio for settings
Dynamic wet surfaces near / far / shadow map resolution were wrongly positioned
1 parent bfafcf4 commit 52ebafd

File tree

2 files changed

+51
-57
lines changed

2 files changed

+51
-57
lines changed

‎res/gamedata/configs/ui/ui_mm_opt.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,23 +297,23 @@
297297
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r3_dynamic_wet_surfaces_near</text>
298298
</cap_r3_dynamic_wet_surfaces_near>
299299

300-
<track_r3_dynamic_wet_surfaces_near x="175" y="97" width="235" height="16">
300+
<track_r3_dynamic_wet_surfaces_near x="180" y="6" width="235" height="16">
301301
<options_item entry="r3_dynamic_wet_surfaces_near" group="mm_opt_video" depend="runtime"/>
302302
</track_r3_dynamic_wet_surfaces_near>
303303

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

308-
<track_r3_dynamic_wet_surfaces_far x="175" y="97" width="235" height="16">
308+
<track_r3_dynamic_wet_surfaces_far x="180" y="6" width="235" height="16">
309309
<options_item entry="r3_dynamic_wet_surfaces_far" group="mm_opt_video" depend="runtime"/>
310310
</track_r3_dynamic_wet_surfaces_far>
311311

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

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

‎src/xrEngine/xrEngine.vcxproj.filters‎

Lines changed: 48 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,6 @@
121121
<Filter Include="Engine\text_editor\edit_actions">
122122
<UniqueIdentifier>{e23b35a1-652e-47bb-8941-1653504cd776}</UniqueIdentifier>
123123
</Filter>
124-
<Filter Include="RenderRef">
125-
<UniqueIdentifier>{e4d34774-3a5b-468f-9400-12c702636fa1}</UniqueIdentifier>
126-
</Filter>
127-
<Filter Include="RenderRef\Execution &amp; 3D">
128-
<UniqueIdentifier>{32271206-64dd-4f87-a215-4b1106afd35f}</UniqueIdentifier>
129-
</Filter>
130-
<Filter Include="RenderRef\Execution &amp; 3D\Device">
131-
<UniqueIdentifier>{43966447-6d34-46c3-956d-adaa49b48525}</UniqueIdentifier>
132-
</Filter>
133124
<Filter Include="editor">
134125
<UniqueIdentifier>{94169f02-9d9d-46d0-9fdf-58f636a57c46}</UniqueIdentifier>
135126
</Filter>
@@ -238,6 +229,9 @@
238229
<Filter Include="Interfaces\ILoadingScreen">
239230
<UniqueIdentifier>{84e3429f-eb46-4db1-bd1c-9af2413b1de0}</UniqueIdentifier>
240231
</Filter>
232+
<Filter Include="Rendering Device">
233+
<UniqueIdentifier>{e4d34774-3a5b-468f-9400-12c702636fa1}</UniqueIdentifier>
234+
</Filter>
241235
</ItemGroup>
242236
<ItemGroup>
243237
<ClInclude Include="defines.h">
@@ -429,15 +423,6 @@
429423
<ClInclude Include="edit_actions.h">
430424
<Filter>Engine\text_editor\edit_actions</Filter>
431425
</ClInclude>
432-
<ClInclude Include="device.h">
433-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
434-
</ClInclude>
435-
<ClInclude Include="StatGraph.h">
436-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
437-
</ClInclude>
438-
<ClInclude Include="Stats.h">
439-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
440-
</ClInclude>
441426
<ClInclude Include="engine_impl.hpp">
442427
<Filter>editor\engine_impl</Filter>
443428
</ClInclude>
@@ -537,12 +522,6 @@
537522
<ClInclude Include="GameMtlLib.h">
538523
<Filter>Game API\MaterialSystem</Filter>
539524
</ClInclude>
540-
<ClInclude Include="PerformanceAlert.hpp">
541-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
542-
</ClInclude>
543-
<ClInclude Include="IPerformanceAlert.hpp">
544-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
545-
</ClInclude>
546525
<ClInclude Include="IGameFont.hpp">
547526
<Filter>Render\Font output</Filter>
548527
</ClInclude>
@@ -570,6 +549,21 @@
570549
<ClInclude Include="ILoadingScreen.h">
571550
<Filter>Interfaces\ILoadingScreen</Filter>
572551
</ClInclude>
552+
<ClInclude Include="device.h">
553+
<Filter>Rendering Device</Filter>
554+
</ClInclude>
555+
<ClInclude Include="IPerformanceAlert.hpp">
556+
<Filter>Rendering Device</Filter>
557+
</ClInclude>
558+
<ClInclude Include="PerformanceAlert.hpp">
559+
<Filter>Rendering Device</Filter>
560+
</ClInclude>
561+
<ClInclude Include="StatGraph.h">
562+
<Filter>Rendering Device</Filter>
563+
</ClInclude>
564+
<ClInclude Include="Stats.h">
565+
<Filter>Rendering Device</Filter>
566+
</ClInclude>
573567
</ItemGroup>
574568
<ItemGroup>
575569
<ClCompile Include="defines.cpp">
@@ -749,33 +743,6 @@
749743
<ClCompile Include="edit_actions.cpp">
750744
<Filter>Engine\text_editor\edit_actions</Filter>
751745
</ClCompile>
752-
<ClCompile Include="device.cpp">
753-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
754-
</ClCompile>
755-
<ClCompile Include="Device_create.cpp">
756-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
757-
</ClCompile>
758-
<ClCompile Include="Device_destroy.cpp">
759-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
760-
</ClCompile>
761-
<ClCompile Include="Device_Initialize.cpp">
762-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
763-
</ClCompile>
764-
<ClCompile Include="Device_Misc.cpp">
765-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
766-
</ClCompile>
767-
<ClCompile Include="Device_overdraw.cpp">
768-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
769-
</ClCompile>
770-
<ClCompile Include="Device_wndproc.cpp">
771-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
772-
</ClCompile>
773-
<ClCompile Include="StatGraph.cpp">
774-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
775-
</ClCompile>
776-
<ClCompile Include="Stats.cpp">
777-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
778-
</ClCompile>
779746
<ClCompile Include="engine_impl.cpp">
780747
<Filter>editor\engine_impl</Filter>
781748
</ClCompile>
@@ -869,9 +836,6 @@
869836
<ClCompile Include="GameMtlLib_Engine.cpp">
870837
<Filter>Game API\MaterialSystem</Filter>
871838
</ClCompile>
872-
<ClCompile Include="PerformanceAlert.cpp">
873-
<Filter>RenderRef\Execution &amp; 3D\Device</Filter>
874-
</ClCompile>
875839
<ClCompile Include="IGame_Level.cpp">
876840
<Filter>Game API\Level</Filter>
877841
</ClCompile>
@@ -887,6 +851,36 @@
887851
<ClCompile Include="splash.cpp">
888852
<Filter>General</Filter>
889853
</ClCompile>
854+
<ClCompile Include="device.cpp">
855+
<Filter>Rendering Device</Filter>
856+
</ClCompile>
857+
<ClCompile Include="Device_create.cpp">
858+
<Filter>Rendering Device</Filter>
859+
</ClCompile>
860+
<ClCompile Include="Device_destroy.cpp">
861+
<Filter>Rendering Device</Filter>
862+
</ClCompile>
863+
<ClCompile Include="Device_Initialize.cpp">
864+
<Filter>Rendering Device</Filter>
865+
</ClCompile>
866+
<ClCompile Include="Device_Misc.cpp">
867+
<Filter>Rendering Device</Filter>
868+
</ClCompile>
869+
<ClCompile Include="Device_overdraw.cpp">
870+
<Filter>Rendering Device</Filter>
871+
</ClCompile>
872+
<ClCompile Include="Device_wndproc.cpp">
873+
<Filter>Rendering Device</Filter>
874+
</ClCompile>
875+
<ClCompile Include="PerformanceAlert.cpp">
876+
<Filter>Rendering Device</Filter>
877+
</ClCompile>
878+
<ClCompile Include="StatGraph.cpp">
879+
<Filter>Rendering Device</Filter>
880+
</ClCompile>
881+
<ClCompile Include="Stats.cpp">
882+
<Filter>Rendering Device</Filter>
883+
</ClCompile>
890884
</ItemGroup>
891885
<ItemGroup>
892886
<Text Include="ClientServer.txt" />

0 commit comments

Comments
 (0)