Units demo fixes
AbandonedPublic
Actions

Authored by Langbart on Apr 4 2022, 7:41 AM.

Details

Reviewers: None
Trac Tickets: #6486

Summary

Several issues

The height of the terrain has been changed so that the polygon is no longer misaligned (ref #6116 )
The map was enlarged and the distances between units increased, this solves the problem with the Viking Longship (ref #6486) and some objects were sitting too close to each other.
The starting position of the first unit was increased, the previous values were too low, some objects appeared only partly. See image below.

Furthermore
The terrain texture has been changed to whiteness, now the units appear the same as in the Actor Viewer. It just looks better.

Test Plan

Open units demo map.

Diff Detail

Repository

rP 0 A.D. Public Repository

Branch

arcpatch_D4589 (branched from master)

Lint

Lint OK

Severity	Location	Code	Message
Warning	binaries/data/mods/public/maps/scenarios/units_demo.js:9	ESLINT	prefer-const
Warning	binaries/data/mods/public/maps/scenarios/units_demo.js:10	ESLINT	prefer-const
Warning	binaries/data/mods/public/maps/scenarios/units_demo.js:15	ESLINT	prefer-const
Warning	binaries/data/mods/public/maps/scenarios/units_demo.js:31	ESLINT	prefer-const

Unit

No Unit Test Coverage

Build Status

Buildable 20066
Build 48161: Vulcan Build	Jenkins
Build 48160: Vulcan Build (macOS)	Jenkins
Build 48159: Vulcan Build (Windows)	Jenkins
Build 48158: arc lint + arc unit

Event Timeline

Langbart created this revision.Apr 4 2022, 7:41 AM

Owners added a subscriber: Restricted Owners Package.Apr 4 2022, 7:41 AM

Langbart edited the summary of this revision. (Show Details)Apr 4 2022, 7:42 AM

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

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

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

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

Harbormaster completed remote builds in B20062: Diff 20050.Apr 4 2022, 7:57 AM

Langbart requested review of this revision.Apr 4 2022, 7:57 AM

this solves the problem with the Viking Longship (ref #6486) and some objects were sitting too close to each other.

I believe it doesn't solve the issue but hides it. It seems if someone would make a test when the ship is pushed (or vice versa) the test might fail for the same reason.

Silier added a subscriber: Silier.Apr 4 2022, 7:52 PM

Silier added inline comments.

binaries/data/mods/public/maps/scenarios/units_demo.js
75	just mental note: this should jumpTo not moveTo

Replace "MoveTo" with "JumpTo"; Remove unnecessary whitespace

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

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

In D4589#195396, @vladislavbelov wrote:

this solves the problem with the Viking Longship (ref #6486) and some objects were sitting too close to each other.

I believe it doesn't solve the issue but hides it. It seems if someone would make a test when the ship is pushed (or vice versa) the test might fail for the same reason.

@wraitii can you help to adjust the bounds check in the .cpp code?

[16:58:45] elexis for #6486 I wanted to ask if that ship might happen to be close to the map border, seems to be the case, D4589
[16:59:44] elexis if the viking ship was just too close to the map border, then perhaps wraitii just forgot some bounds check
[16:59:54] elexis or wrote one that wasn't right

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

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

Harbormaster completed remote builds in B20066: Diff 20054.Apr 5 2022, 5:59 AM

Honestly, I think gray or brown would look nicer than plain white, but the other improvements are really nice.

The starting position of the first unit was increased, the previous values were too low, some objects appeared only partly. See image below.

Entities are moved half of their width so the issue is that the size in template does not fit the graphic model and this is just workaround.
To fix height/depth, that should be accounted too when placing so ideally every entity would be centered. Yes, there might be bigger gaps but who cares about aesthetic here.

Silier mentioned this in D4600: Fix #6486.Apr 11 2022, 8:53 PM

Silier mentioned this in rP26775: Fix unit demo map.Apr 11 2022, 8:59 PM

Langbart abandoned this revision.Apr 12 2022, 6:45 AM