Page MenuHomeWildfire Games

[art/actors] remove frequency="0" variants from brit structure actors
ClosedPublic

Authored by Nescio on Feb 15 2020, 10:54 AM.

Details

Reviewers
Stan
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP23558: Remove deprecated variants from Brit structures actors.
Summary

This patch removes frequency="0" variants from Briton structure actor files, because those lines are unused, unnecessary, and potentially confusing. These tend to be deprecated versions that differed in only one line. Moreover, everything is preserved in the revision history logs.
Also retitled the variant names for consistency.

Test Plan

Agree this is an improvement.

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Nescio created this revision.Feb 15 2020, 10:54 AM
Owners added a subscriber: Restricted Owners Package.Feb 15 2020, 10:54 AM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1765/display/redirect

Nescio updated this revision to Diff 11360.Feb 15 2020, 11:13 AM

correct typo

Stan added a comment.EditedFeb 15 2020, 11:14 AM

I don't know if this is a good idea. Some of the removed models in this patch are good. Maybe they even deserve to get their own actors. Applying this patch will result in a lot more of unused art files.

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1767/display/redirect

I don't know if this is a good idea. Some of the removed models in this patch are good. Maybe they even deserve to get their own actors. Applying this patch will result in a lot more of unused art files.

How come?

If you look at e.g. the Briton structures, typically the only difference is the "0" variant uses

<texture file="structural/celt_struct.dds" name="baseTex"/>

and the "1" variant uses

<texture file="structural/brit_struct.png" name="baseTex"/>

Furthermore, if "0" variants are kept in these files, then why not in the hundreds of other structures?

Stan added a comment.Feb 15 2020, 11:24 AM

They reference dae files, those files will start to show up in checkrefs.pl.

<texture file="structural/celt_struct.dds" name="baseTex"/>

I agree with the texture changes. Not with all the patch :) There are multiple changes here

  • Better Variant Names : Good,
  • Removing variants with 0 frequency: Generally good with some exceptions.
  • Removing references to good models : Bad,
  • Removing placeholder textures : Good,
  • Probably some other stuff I haven't read the whole patch yet.

Removing references to good models : Bad,

Which files exactly?

Stan added a comment.Feb 15 2020, 11:31 AM

Walls, towers, while not completely historically accurate, the models aren't bad per se.

Nescio added inline comments.Feb 15 2020, 11:35 AM
binaries/data/mods/public/art/actors/structures/britons/wall_tower.xml
32 ↗(On Diff #11360)

You mean this one?

binaries/data/mods/public/art/actors/structures/ptolemies/temple.xml
13–25 ↗(On Diff #11360)

This variant is identical to kushites/shrine.xml.

Stan added inline comments.Feb 15 2020, 11:37 AM
binaries/data/mods/public/art/actors/structures/ptolemies/wall_short.xml
6 ↗(On Diff #11360)

This one.

binaries/data/mods/public/art/actors/structures/ptolemies/wall_tower.xml
5 ↗(On Diff #11360)

This one.

binaries/data/mods/public/art/actors/structures/ptolemies/wooden_tower.xml
6 ↗(On Diff #11360)

This one.

For comparison:


"0" variants on the left, "1" on the right.
If the former are considered worth preserving, wouldn't it be better to give them files of their own (cf. carthaginians/market_old.xml, ptolemies/house_old.xml), so they'll at least show up in the actor list, rather than hiding them in unused lines?

Nescio updated this revision to Diff 11561.Mar 26 2020, 4:43 PM
Nescio retitled this revision from remove frequency="0" variants from structure actors to remove frequency="0" variants from brit structure actors.
Nescio edited the summary of this revision. (Show Details)

only brit now

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1917/display/redirect

Nescio added inline comments.Mar 26 2020, 4:53 PM
binaries/data/mods/public/art/actors/structures/britons/stable.xml
5 ↗(On Diff #11561)

Forgot to capitalize the S.

Stan accepted this revision.Mar 27 2020, 9:00 PM

I'll fix the S when committing, thanks for the patch.

Changes are good, new texture should be used.the rest is mostly duplication that should be nuked

This revision is now accepted and ready to land.Mar 27 2020, 9:00 PM
This revision was landed with ongoing or failed builds.Mar 27 2020, 9:03 PM
This revision was automatically updated to reflect the committed changes.
Nescio retitled this revision from remove frequency="0" variants from brit structure actors to [art/actors] remove frequency="0" variants from brit structure actors.May 18 2020, 10:16 AM