Page MenuHomeWildfire Games

[art/actors] wall_med → wall_medium
ClosedPublic

Authored by Nescio on Jan 9 2020, 12:59 PM.

Details

Reviewers
Stan
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP23524: Rename wall_med to wall_medium for consistency.
Summary

Most medium wall files are just called wall_medium, but a few are called wall_med instead; this patch standardizes those for consistency; similar to D2552 and D2553.

Test Plan

Check for completeness, mistakes, and omissions.

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.Jan 9 2020, 12:59 PM
Owners added a subscriber: Restricted Owners Package.Jan 9 2020, 12:59 PM
Vulcan added a comment.Jan 9 2020, 1:01 PM

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

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/989/display/redirect

Vulcan added a comment.Jan 9 2020, 1:02 PM

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

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/85/display/redirect

Vulcan added a comment.Jan 9 2020, 1:03 PM

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

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

Nescio updated this revision to Diff 11129.Jan 20 2020, 8:28 PM
Nescio retitled this revision from standardize medium walls actor names to wall_med → wall_medium.
Nescio edited the summary of this revision. (Show Details)
Nescio edited the test plan for this revision. (Show Details)
Nescio added a subscriber: Stan.

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

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

Stan added a comment.Jan 20 2020, 8:36 PM

If changing ao files, strip the _AO suffix, as they already are in an ao folder (I only do it on a case to case basis)
Any reason for those collada edits? I know Linux needs EOF to be on a newline, but stuff handling DAE seems not to care at all...

Any reason for those collada edits? I know Linux needs EOF to be on a newline, but stuff handling DAE seems not to care at all...

Did I break something? arcanist was complaining, first about mime-type (which I set to text/plain), then about something:

>>> Lint for binaries/data/mods/public/art/meshes/structural/brit_wall_medium.dae:


   Error  (TXT4) File Does Not End in Newline
    Files must end in a newline.

              79   <scene>
              80     <instance_visual_scene url="#Scene"/>
              81   </scene>
    >>> -     82 </COLLADA>
        +        </COLLADA>
        +        
--- /home/b/Projects/0ad/binaries/data/mods/public/art/meshes/structural/brit_wall_medium.dae	2020-01-20 19:54:14.785429846 +0100
+++ /tmp/3nhikiehcjuos4c0/216067-c8CxWb	2020-01-20 20:26:59.719626454 +0100
@@ -79,4 +79,4 @@
   <scene>
     <instance_visual_scene url="#Scene"/>
   </scene>
-</COLLADA>
\ No newline at end of file
+</COLLADA>


    Apply this patch to
    binaries/data/mods/public/art/meshes/structural/brit_wall_medium.dae?
    [Y/n] Y

>>> Lint for binaries/data/mods/public/art/meshes/structural/kush_wall_medium.dae:


   Error  (TXT4) File Does Not End in Newline
    Files must end in a newline.

             117   <scene>
             118     <instance_visual_scene url="#Scene"/>
             119   </scene>
    >>> -    120 </COLLADA>
        +        </COLLADA>
        +        
--- /home/b/Projects/0ad/binaries/data/mods/public/art/meshes/structural/kush_wall_medium.dae	2020-01-20 19:54:14.763429889 +0100
+++ /tmp/8nalbb30mqo0sg88/216067-oto4fb	2020-01-20 20:27:02.211621670 +0100
@@ -117,4 +117,4 @@
   <scene>
     <instance_visual_scene url="#Scene"/>
   </scene>
-</COLLADA>
\ No newline at end of file
+</COLLADA>


    Apply this patch to
    binaries/data/mods/public/art/meshes/structural/kush_wall_medium.dae?
    [Y/n] Y

>>> Lint for binaries/data/mods/public/art/meshes/structural/sele_wall_medium.dae:


   Error  (TXT4) File Does Not End in Newline
    Files must end in a newline.

              78   <scene>
              79     <instance_visual_scene url="#Scene"/>
              80   </scene>
    >>> -     81 </COLLADA>
        +        </COLLADA>
        +        
--- /home/b/Projects/0ad/binaries/data/mods/public/art/meshes/structural/sele_wall_medium.dae	2020-01-20 19:54:14.765429885 +0100
+++ /tmp/7k6vnpka8hkwk4kk/216067-czmAra	2020-01-20 20:27:03.304619571 +0100
@@ -78,4 +78,4 @@
   <scene>
     <instance_visual_scene url="#Scene"/>
   </scene>
-</COLLADA>
\ No newline at end of file
+</COLLADA>


    Apply this patch to
    binaries/data/mods/public/art/meshes/structural/sele_wall_medium.dae?
    [Y/n] Y

Pressing Y was the only way to continue.

Also, I didn't rename, art/meshes/props/decal_struct_wall_med.dae, because I'm unsure what to do with it; I couldn't find any file that uses it.

Stan added a comment.EditedJan 20 2020, 9:18 PM

Given it was committed in rP6904 I assume checkrefs.pl --check-unused reports it?

Changes in collada do not matter :) It's just best to avoid them when there is no reason :)

Given it was committed in rP6904 I assume checkrefs.pl --check-unused reports it?

Yes it does, amongst hundreds of other files.
grep -r decal_struct_wall_med didn't yield any results either.

Changes in collada do not matter :) It's just best to avoid them when there is no reason :)

Blame arcanist; I have no idea what those .dae files are, I didn't even open them.

Stan accepted this revision.Mar 8 2020, 11:23 AM

Forgot to accept it, can you close it?

This revision is now accepted and ready to land.Mar 8 2020, 11:23 AM
This revision was automatically updated to reflect the committed changes.
Owners added a subscriber: Restricted Owners Package.Mar 8 2020, 11:26 AM
Nescio retitled this revision from wall_med → wall_medium to [art/actors] wall_med → wall_medium.May 18 2020, 10:14 AM