Opened 10 years ago

Closed 4 years ago

#2524 closed task (fixed)

Clean obsolete / broken art files

Reported by: historic_bruno Owned by: enrique
Priority: Nice to Have Milestone: Alpha 24
Component: Art & Animation Keywords:
Cc: Niek, enrique, Stan, Johnathan Good Patch:

Description

This is more of a long term task: basically the art folders are a mess. A lot of broken old files have been left behind and forgotten over time. Using the checkrefs.pl script, we can find many of them, but we have to be careful to interpret its results since it's not perfect. It's not something to be rushed and it can't really be automated either.

Attachments (9)

brokenactors.patch​ (3.6 KB ) - added by Stan 10 years ago.
2524.diff​ (4.7 KB ) - added by Stan 8 years ago.
Fix errors found by fatherbushido
wrld_med_plant.png​ (122.1 KB ) - added by Stan 8 years ago.
PNG texture taken from history.
4415 - Gaul AO.diff​ (729 bytes ) - added by fatherbushido 7 years ago.
patch upload by stanislas69
gaul_storehouse_ao_fix.diff​ (686 bytes ) - added by Stan 7 years ago.
Same issue as above fixed by the following patch.
Vercingetorix+GaulStorehouse.patch​ (1.5 KB ) - added by Stan 7 years ago.
Fix the warning of the missing head, and the one of the unused, missing AO for the gaul storehouse.
imp_cavalry_javelinist_1.png​ (130.1 KB ) - added by Stan 7 years ago.
Fix the warning for imp Javelinist, (missing texture from delenda est)
imp_infantry_swordsman_b_spec.png​ (98.0 KB ) - added by Stan 7 years ago.
Fix the warning for imp imp_scorpio_operator, (missing texture from delenda est)
CartMarket+WallFix.patch​ (2.4 KB ) - added by Stan 7 years ago.
Fix the cart market by removing a wrong prop in the death variant, the old market by updating the death variant to use market_old instead of market, and the gate main template, even though you can't build gates, to use the actor file instead of the template one.

Download all attachments as: .zip

Change History (63)

comment:1 by historic_bruno, 10 years ago

I don't want to commit this yet because it's so close to A16 release, but here is the first batch for deletion. These are mostly ugly old actors that have missing textures and have been replaced by nicer newer ones. None of these files are used in the game. 

binaries/data/mods/public/art/actors/props/structures/celts/outpost2_windows.xml
binaries/data/mods/public/art/actors/props/structures/celts/outpost_door.xml
binaries/data/mods/public/art/actors/props/structures/celts/outpost_shields.xml
binaries/data/mods/public/art/actors/props/structures/celts/outpost_windows.xml
binaries/data/mods/public/art/actors/props/structures/hellenes/dock_ship.xml
binaries/data/mods/public/art/actors/props/structures/hellenes/hele_bir1.xml
binaries/data/mods/public/art/actors/props/structures/hellenes/hele_bir2.xml
binaries/data/mods/public/art/actors/props/structures/hellenes/hele_bir3.xml
binaries/data/mods/public/art/actors/props/structures/hellenes/hele_mer1.xml
binaries/data/mods/public/art/actors/props/structures/hellenes/trireme_cor_mast.xml
binaries/data/mods/public/art/actors/props/structures/hellenes/trireme_cor_oars.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_01.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_01_props.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_01_props_hay.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_02.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_02_props.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_03.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_03_props.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_04.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_04_props.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_05.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_05_props.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_06.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_06_props.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_07.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_07_props.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_08.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_08_props.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_09.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_09_props.xml
binaries/data/mods/public/art/actors/props/structures/romans/alt_10.xml
binaries/data/mods/public/art/actors/props/structures/romans/civil_centre.xml
binaries/data/mods/public/art/actors/props/structures/romans/farmstead.xml
binaries/data/mods/public/art/actors/props/structures/romans/rome_arch_eyecandy.xml
binaries/data/mods/public/art/actors/props/structures/romans/storehouse.xml
binaries/data/mods/public/art/actors/props/structures/romans/temple.xml
binaries/data/mods/public/art/actors/structures/athenians/bireme.xml
binaries/data/mods/public/art/actors/structures/athenians/house_old.xml
binaries/data/mods/public/art/actors/structures/athenians/merchant.xml
binaries/data/mods/public/art/actors/structures/celts/barracks_new.xml
binaries/data/mods/public/art/actors/structures/celts/fortress_gallic.xml
binaries/data/mods/public/art/actors/structures/celts/scout_tower.xml
binaries/data/mods/public/art/actors/structures/hellenes/bireme.xml
binaries/data/mods/public/art/actors/structures/hellenes/merchant.xml
binaries/data/mods/public/art/actors/structures/hellenes/trireme_cor.xml
binaries/data/mods/public/art/actors/structures/romans/civil_centre.xml
binaries/data/mods/public/art/actors/structures/romans/temple_new.xml
binaries/data/mods/public/art/actors/temp/winter_celt_barracks.xml
binaries/data/mods/public/art/actors/temp/winter_celts_farmstead.xml
binaries/data/mods/public/art/meshes/props/hele_bir1.dae
binaries/data/mods/public/art/meshes/props/hele_bir2.dae
binaries/data/mods/public/art/meshes/props/hele_bir3.dae
binaries/data/mods/public/art/meshes/props/hele_tric_mast.dae
binaries/data/mods/public/art/meshes/props/hele_tric_oars.dae
binaries/data/mods/public/art/meshes/props/rome_alt_10.dae
binaries/data/mods/public/art/meshes/props/rome_alt_arch_lg.dae
binaries/data/mods/public/art/meshes/props/rome_alt_arch_short.dae
binaries/data/mods/public/art/meshes/props/rome_alt_arch_sm.dae
binaries/data/mods/public/art/meshes/props/rome_cc.dae
binaries/data/mods/public/art/meshes/structural/celt_barracks.dae
binaries/data/mods/public/art/meshes/structural/hele_bir.dae
binaries/data/mods/public/art/meshes/structural/hele_mer.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_01.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_01_a.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_01_b.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_02.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_02_a.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_03.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_03_a.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_04.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_04_a.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_05.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_05_a.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_06.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_06_a.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_07.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_07_a.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_08.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_08_a.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_09.dae
binaries/data/mods/public/art/meshes/structural/rome_alt_09_a.dae
binaries/data/mods/public/art/meshes/structural/rome_cc.dae
binaries/data/mods/public/art/textures/skins/structural/hele_merchant.dds

comment:2 by sanderd17, 10 years ago

I wonder if we should actually delete those old art files, or what the criteria should be to delete them.

Some might be unused in the main game, but still serve as actor in some maps.

Could we compose a list of clear criteria to mark files for deletion?

comment:3 by Stan, 10 years ago

There are some obj files also which is a format like dae which doesńt support animations I believe best Would be not to delete them but to move them in the art part of the source that was created not long ago.

in reply to:  2 comment:4 by historic_bruno, 10 years ago

Replying to sanderd17:

I wonder if we should actually delete those old art files, or what the criteria should be to delete them.

Some might be unused in the main game, but still serve as actor in some maps.

Could we compose a list of clear criteria to mark files for deletion?

My criteria for deletion are pretty simple :)

  • If the actor hasn't been altered in years and has been replaced with a better version (see: all Roman structures, Greek ships, etc.)
  • If the actor is broken (missing props, textures, or meshes) and has a working replacement

I think all the above list meet those criteria. Actually, the checkrefs script looks for missing actors in scenarios; I will update it for skirmish maps, too.

comment:5 by ben, 10 years ago

In 15164:

Deletes some obsolete and broken old art files, refs #2524

by Stan, 10 years ago

Attachment: brokenactors.patch​ added

comment:6 by Stan, 10 years ago

Keywords: review added

Missing Textures

temp/temple_test.xml

palm_e.xml

palm_d.xml

grass1.xml

rome_helmet_b.xml

cliff_face_desert.xml

selection_infantry.xml

romans/civic_house.xml

Missing meshes

crannog_rocks.xml

Missing props

iberian_buckler_adv_reverse_back.xml (missing prop point)

elephant_archer(Not used missing prop point)

I also add a patch to fix the fireraiser

comment:7 by Stan, 10 years ago

Also campaign_curtainwall_hele.obj

helmet_obj.obj should be moved to the art source, cause they are not used by the game.

comment:8 by Stan, 10 years ago

Those should be deleted.

comment:9 by Stan, 9 years ago

Keywords: patch added
Owner: set to Stan
Summary: Clean obsolete / broken art files → [PATCH] Clean obsolete / broken art files

Patch from 13 month ago is still accurate.

comment:10 by elexis, 9 years ago

Milestone: Backlog → Alpha 20

comment:11 by ben, 9 years ago

In 17129:

Fixes some incorrect texture references found by checkrefs.pl, refs #2524

comment:12 by Stan, 8 years ago

Status: new → assigned

comment:13 by Lionkanzen, 8 years ago

Can be nice save some in other repo for modding purposes.

comment:14 by Itms, 8 years ago

In 17867:

Delete some broken actor and art files, listed by stanislas69, refs #2524

comment:15 by Itms, 8 years ago

Keywords: review patch removed
Milestone: Alpha 20 → Backlog

I think that fireraiser patch is not really relevant. It is probably part of some more files to remove, but I think we'd need an automated way to perform the task and/or a big cleanup and reorganization of the art/ files.

comment:16 by Stan, 8 years ago

Well I just intended to fix it so it doesn't display errors :)

IIRC there are also *obj files in the art folder, which are not AFAIK recognized by the game and should be deleted.

comment:17 by Itms, 8 years ago

In 17873:

Delete unused .obj and .mtl files, refs #2524

comment:18 by Itms, 8 years ago

Summary: [PATCH] Clean obsolete / broken art files → Clean obsolete / broken art files

by Stan, 8 years ago

Attachment: 2524.diff​ added

Fix errors found by fatherbushido

by Stan, 8 years ago

Attachment: wrld_med_plant.png​ added

PNG texture taken from history.

comment:19 by Stan, 8 years ago

Cc: Niek added
Keywords: rfc patch added
Milestone: Backlog → Alpha 21
Summary: Clean obsolete / broken art files → [PATCH] Clean obsolete / broken art files

comment:20 by Niek, 8 years ago

Keywords: review added; rfc removed

Latest patch looks fine on my end :)

comment:21 by fatherbushido, 8 years ago

@stanislas69:

  • where should we add wrld_med_plant.png ?
  • there is still : Missing file 'art/meshes/temp/plac_helmet_e.dae' referenced by: 'public/art/actors/props/units/heads/rome_helmet_b.xml'

I hope it will fix ERROR: CCacheLoader failed to find archived or source file for: "" (see #3796)

Last edited 8 years ago by fatherbushido (previous) (diff)

comment:22 by Niek, 8 years ago

@fatherbushido: the location of the image is mentioned in the patch file

comment:23 by fatherbushido, 8 years ago

Well, it seems it doesn't break anything. Don't forget to delete public/art/actors/props/units/heads/rome_helmet_b.xml too.

comment:24 by elexis, 8 years ago

The entire unused wheat theme had been removed in r18633 (so the uploaded patch was incomplete and that part can be removed from the patch).

comment:25 by Itms, 8 years ago

In 18718:

Remove or fix some broken art files. Bring wrld_med_plant.png back from the dead.

Based on patch by stanislas69, refs #2524
Fixes #3796

comment:26 by Itms, 8 years ago

Keywords: patch review removed
Milestone: Alpha 21 → Backlog
Summary: [PATCH] Clean obsolete / broken art files → Clean obsolete / broken art files

Thanks for the new batch of fixes :)

comment:27 by Stan, 7 years ago

Owner: Stan removed
Status: assigned → new

comment:28 by fatherbushido, 7 years ago

I have also Missing file 'art/textures/skins/structural/ao/gaul_storehouse_ao.png' referenced by: 'public/art/actors/props/structures/gauls/storehouse_barrel_b.xml', 'public/art/actors/structures/gauls/storehouse.xml'

detected by the perl script in sources/tools

Last edited 7 years ago by fatherbushido (previous) (diff)

by fatherbushido, 7 years ago

Attachment: 4415 - Gaul AO.diff​ added

patch upload by stanislas69

comment:30 by fatherbushido, 7 years ago

Thanks stanislas69, can you explain me what was broken? (so perhaps I could review that).

comment:31 by Stan, 7 years ago

The file used an incorrect AO file.

So there was

Base mesh ao -> wrong Variant A ao -> good Variant B ao -> good

So I removed the first one as it's not used (and doesn't exist), as it's overwritten by the files in the variants.

Last edited 7 years ago by Stan (previous) (diff)

comment:32 by enrique, 7 years ago

Owner: set to enrique
Resolution: → fixed
Status: new → closed

In 19066:

Added some missing lines in the actors referencing to AO textures.
fixes #2524 , #4394 and #4415

comment:33 by fatherbushido, 7 years ago

Resolution: fixed
Status: closed → reopened

I still have

Missing file 'art/textures/skins/structural/ao/gaul_storehouse_ao.png' referenced by: 'public/art/actors/structures/gauls/storehouse.xml'

by Stan, 7 years ago

Attachment: gaul_storehouse_ao_fix.diff​ added

Same issue as above fixed by the following patch.

comment:34 by Stan, 7 years ago

Cc: Enrique added
Keywords: rfc patch added

comment:35 by fatherbushido, 7 years ago

Keywords: review added; rfc removed

comment:36 by fatherbushido, 7 years ago

New ones:

Missing file 'art/actors/props/units/heads/new/head_vercingentorix.xml' referenced by: 'public/art/actors/units/celts/vercingetorix.xml' Missing file 'art/textures/skins/skeletal/imp_cavalry_javelinist_1.png' referenced by: 'public/art/actors/props/units/imp_scorpio_operator.xml', 'public/art/actors/props/units/imp_scorpio_packed_r.xml' Missing file 'art/textures/skins/skeletal/imp_infantry_swordsman_b_spec.png' referenced by: 'public/art/actors/props/units/imp_scorpio_operator.xml', 'public/art/actors/props/units/imp_scorpio_packed_r.xml' Missing file 'art/textures/skins/structural/ao/gaul_storehouse_ao.png' referenced by: 'public/art/actors/structures/gauls/storehouse.xml'

Last edited 7 years ago by fatherbushido (previous) (diff)

comment:37 by fatherbushido, 7 years ago

stanislas: can you look at those new ones introduced in r19095 (see #4440)

by Stan, 7 years ago

Attachment: Vercingetorix+GaulStorehouse.patch​ added

Fix the warning of the missing head, and the one of the unused, missing AO for the gaul storehouse.

by Stan, 7 years ago

Attachment: imp_cavalry_javelinist_1.png​ added

Fix the warning for imp Javelinist, (missing texture from delenda est)

by Stan, 7 years ago

Attachment: imp_infantry_swordsman_b_spec.png​ added

Fix the warning for imp imp_scorpio_operator, (missing texture from delenda est)

in reply to:  37 comment:38 by Stan, 7 years ago

Replying to fatherbushido:

stanislas: can you look at those new ones introduced in r19095 (see #4440)

Done. Note that the gaul ao fix in the last patch was already in the previous one.

Last edited 7 years ago by Stan (previous) (diff)

comment:39 by enrique, 7 years ago

In 19131:

Batch of patches from Stanislas69
Fixes #3813
Refs #2524 and #4440

-Fixes stoyas foundations
-Fixes walls foundations
-Fixes carth superdock foundation
-Fixes cape_chariot variant
-Fixes missing referenced files in #2524

comment:40 by fatherbushido, 7 years ago

Thanks for fixing that!

Now I have that:

Missing file 'art/actors/props/structures/carthaginians/market.xml' referenced by: 'public/art/actors/structures/carthaginians/market.xml', 'public/art/actors/structures/carthaginians/market_old.xml' Missing file 'art/actors/structures/template_structure_defense_wall_long.xml' referenced by: 'public/simulation/templates/skirmish/structures/default_wall_gate.xml', 'public/simulation/templates/skirmish/structures/iber_wall_gate.xml', 'public/simulation/templates/structures/athen_wall_gate.xml', 'public/simulation/templates/structures/brit_wall_gate.xml', 'public/simulation/templates/structures/cart_wall_gate.xml', 'public/simulation/templates/structures/gaul_wall_gate.xml', 'public/simulation/templates/structures/iber_wall_gate.xml', 'public/simulation/templates/structures/mace_wall_gate.xml', 'public/simulation/templates/structures/maur_wall_gate.xml', 'public/simulation/templates/structures/pers_wall_gate.xml', 'public/simulation/templates/structures/ptol_wall_gate.xml', 'public/simulation/templates/structures/rome_siege_wall_gate.xml', 'public/simulation/templates/structures/rome_wall_gate.xml', 'public/simulation/templates/structures/sele_wall_gate.xml', 'public/simulation/templates/structures/spart_wall_gate.xml'

Last edited 7 years ago by fatherbushido (previous) (diff)

by Stan, 7 years ago

Attachment: CartMarket+WallFix.patch​ added

Fix the cart market by removing a wrong prop in the death variant, the old market by updating the death variant to use market_old instead of market, and the gate main template, even though you can't build gates, to use the actor file instead of the template one.

comment:41 by Stan, 7 years ago

Cc: enrique Stan Johnathan Good added; Enrique removed

comment:42 by enrique, 7 years ago

Resolution: → fixed
Status: reopened → closed

In 19153:

Small improvement in Carthaginian normal map.
Fixed carthaginian market actors.
Fixed gate structure template. Patch by Stanislas69
fixes #2524

comment:43 by Enrique, 7 years ago

Should be fixed now. Please reopen as needed.

comment:44 by Enrique, 7 years ago

Resolution: fixed
Status: closed → reopened

Leaving it open just in case - not sure if there's more missing references in this ticket pending

comment:45 by elexis, 7 years ago

Keywords: review removed

comment:46 by fatherbushido, 7 years ago

(At rev 19355)

Missing file 'art/actors/props/structures/hellenes/fortress_props.xml' referenced by: 'public/art/actors/special/old/athenian_fortress.xml', 'public/art/actors/special/old/athenian_fortress.xml'

Missing file 'art/textures/ui/session/portraits/' referenced by: 'public/simulation/templates/special_filter/mirage.xml'

The second one is perhaps a false alert (the perl script needs perhaps to be update to filter templates)

Last edited 7 years ago by fatherbushido (previous) (diff)

comment:47 by fatherbushido, 7 years ago

In 19509:

Fix Missing props for the old athen fortress. Patch by Stan.
Refs #2524.
Differential Revision: ​https://code.wildfiregames.com/D352

comment:48 by fatherbushido, 7 years ago

In 19510:

Add the missing file in r19509. Refs #2524.

comment:49 by fatherbushido, 7 years ago

Missing file 'art/textures/skins/props/helmet/hele_themistocles.dds' referenced by: 'public/art/actors/props/units/heads/celt_viridomarus.xml'

(tested at 19942)

comment:51 by fatherbushido, 7 years ago

Nice

comment:52 by fatherbushido, 7 years ago

Suggestion to make the unused check optional ​Phab:924

Last edited 7 years ago by fatherbushido (previous) (diff)

comment:53 by Stan, 6 years ago

In 21041:

Fix an incorrect animation reference, and add the native keyword, noticed by checkref.pl refs #2524

comment:54 by Stan, 4 years ago

Keywords: patch removed
Milestone: Backlog → Alpha 24
Resolution: → fixed
Status: reopened → closed

Most of the work is done, there are no obvious warnings anymore.

Note: See TracTickets for help on using tickets.