Page MenuHomeWildfire Games

[ATLAS] Adds a tool to pick water high by terrain click
ClosedPublic

Authored by vladislavbelov on Thu, Jul 4, 2:31 AM.

Details

Reviewers
trompetin17
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Restricted Owners Package(Owns No Changed Paths)
Commits
rP22445: Adds an tool to pick water high by terrain click in Atlas.
Summary

Water height at the slider will be updated after the tool was disabled. Because currently we don't any way to notify EnvironmentSettings about engine changes.

Test Plan
  1. Apply the patch and compile the game
  2. Run Atlas
  3. Make sure that the tool works

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

vladislavbelov created this revision.Thu, Jul 4, 2:31 AM
vladislavbelov retitled this revision from Adds a tool to pick water high by terrain click to [ATLAS] Adds a tool to pick water high by terrain click.
Vulcan added a comment.Thu, Jul 4, 2:40 AM

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

Linter detected issues:
Executing section Source...

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.h
|   1| /*·Copyright·(C)·2009·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2009"

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2017"

source/tools/atlas/GameInterface/Messages.h
| 211| »   »   );
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Invalid number of character '{' when these macros are defined: 'MESSAGESSETUP_NOTFIRST'.

source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp
|   1| /*·Copyright·(C)·2016·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2016"

source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp
| 211| »   »   m_OldWaterHeight·=·cmpWaterManager->GetWaterLevel(
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Invalid number of character '{' when these macros are defined: 'MESSAGESSETUP_NOTFIRST'.
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/differential/1895/display/redirect

elexis awarded a token.Thu, Jul 4, 9:29 AM
trompetin17 accepted this revision.EditedThu, Jul 4, 7:39 PM
trompetin17 added a subscriber: trompetin17.

Tested on OSX Mojave

  • Select PickWaterHeight click in a different position
  • Toggle PickWaterHeight, Slider Water Height Updated
  • Select PickWaterHeight and move slider Water Height

nothing was broken form my test

This revision is now accepted and ready to land.Thu, Jul 4, 7:39 PM
This revision was automatically updated to reflect the committed changes.
historic_bruno added inline comments.
ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp
296

This line is missing a WXUNUSED macro, causes a build warning on gcc:

Environment.cpp
../../../source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp: In member function ‘void EnvironmentSidebar::OnPickWaterHeight(wxCommandEvent&)’:
../../../source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp:296:60: warning: unused parameter ‘evt’ [-Wunused-parameter]
 void EnvironmentSidebar::OnPickWaterHeight(wxCommandEvent& evt)