Use slider for material manager config option
ClosedPublic
Actions

Authored by elexis on Apr 30 2017, 7:59 PM.

Details

Reviewers

vladislavbelov

Commits

rP19482: Use the slider for the number of shader graphics setting.

Summary

... which also removes the hardcoded option check in options.js and allows more values.
Fix the according comment from the default.cfg, since some effects are enabled with lower values too:

(19:55:47) Vladislav: elexis: each material has own minimum quality: i.e. <alternative material="player_trans_ao.xml" quality="8"/>

Test Plan

See rP17657 or default.cfg that 10 is the max.
See ctor of CMaterialManager to confirm that it's a float.

Diff Detail

Repository

rP 0 A.D. Public Repository

Branch

/ps/trunk

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 1364
Build 2149: Vulcan Build	Jenkins
Build 2148: arc lint + arc unit

Event Timeline

elexis created this revision.Apr 30 2017, 7:59 PM

Also rename gain to Volume as proposed by echotangoecho in #4039

While you're at it, IMO, the "Gain" part of the sound settings names should be renamed "volume".

Indeed we don't have anything using 10 currently:

basic_glow_wind.xml:	<alternative material="basic_trans.xml" quality="2"/>
basic_glow.xml:	<alternative material="basic_trans.xml" quality="2"/>
basic_trans_ao_parallax_spec.xml:    <alternative material="basic_trans_ao_spec.xml" quality="8"/>
basic_trans_ao_spec.xml:    <alternative material="basic_trans_ao.xml" quality="3"/>
basic_trans_ao.xml:    <alternative material="basic_trans.xml" quality="2"/>
basic_trans_parallax_spec.xml:    <alternative material="basic_trans_spec.xml" quality="8"/>
basic_trans_spec.xml:    <alternative material="basic_trans.xml" quality="2"/>
basic_trans_wind_grain.xml:    <alternative material="basic_trans.xml" quality="1"/>
basic_trans_wind.xml:    <alternative material="basic_trans.xml" quality="1"/>
no_trans_ao.xml:    <alternative material="default.xml" quality="2"/>
no_trans_parallax_ao.xml:    <alternative material="no_trans_ao.xml" quality="8"/>
player_trans_ao_parallax_spec.xml:    <alternative material="player_trans_ao_spec.xml" quality="8"/>
player_trans_ao_parallax.xml:    <alternative material="player_trans_ao.xml" quality="8"/>
player_trans_ao_spec.xml:    <alternative material="player_trans_ao.xml" quality="3"/>
player_trans_ao.xml:    <alternative material="player_trans.xml" quality="2"/>
player_trans_parallax_spec_helmet.xml:    <alternative material="player_trans.xml" quality="1"/>
player_trans_parallax_spec.xml:    <alternative material="player_trans_spec.xml" quality="8"/>
player_trans_parallax.xml:    <alternative material="player_trans.xml" quality="8"/>
player_trans_spec_helmet.xml:    <alternative material="player_trans.xml" quality="1"/>
player_trans_spec.xml:    <alternative material="player_trans.xml" quality="1"/>
rock_bump_spec_ao_test.xml:    <alternative material="player_trans_ao_spec.xml" quality="8"/>
rock_bump_spec_test.xml:    <alternative material="player_trans_ao_spec.xml" quality="8"/>
terrain_norm_spec.xml:    <alternative material="terrain_norm.xml" quality="4"/>
terrain_norm.xml:    <alternative material="terrain_base.xml" quality="2"/>
terrain_triplanar_norm_spec.xml:    <alternative material="terrain_triplanar_norm.xml" quality="2"/>
terrain_triplanar_norm.xml:    <alternative material="terrain_triplanar.xml" quality="2"/>
terrain_triplanar.xml:    <alternative material="terrain_base.xml" quality="1"/>

Mostly I want to make options.js agnostic of options.json.
Some day we should have steps for the slider (which was requested in #4039 already).
Even better as proposed by Vladislav would be nuking the float altogether and making those a set of booleans.

I've tested it, it works. I agree with @elexis to make options.js independent of options.json.

This revision is now accepted and ready to land.Apr 30 2017, 9:04 PM

Closed by commit rP19482: Use the slider for the number of shader graphics setting. (authored by elexis). · Explain WhyApr 30 2017, 11:51 PM

This revision was automatically updated to reflect the committed changes.

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!

http://jw:8080/job/phabricator/945/ for more details.

Harbormaster completed remote builds in B1364: Diff 1563.May 1 2017, 1:10 AM

Harbormaster completed remote builds in B1365: Diff 1564.May 1 2017, 2:44 AM

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!

http://jw:8080/job/phabricator/946/ for more details.