Diffusion 0 A.D. Public Repository rP21113

Allow random map scripts to load heightmap image files, fixes #5018.
AuditedrP21113
Actions

Tags

None

Subscribers

Description

Allow random map scripts to load heightmap image files, fixes #5018.

Move the atlas heightmap import code to MapIO.cpp and reuse it.
Implements what rP18523 and rP20525 wanted to be.

Details

Auditors

Committed

Feb 5 2018, 5:02 PM

Parents

rP21112: Stop claiming that JPEG files are supported for heightmap import following…

Branches

Unknown

Tags

Unknown

Build Status

Buildable 4814
Build 8351: Trigger Windows Autobuild
Build 8350: Post-Commit Build	Jenkins

Event Timeline

elexis committed rP21113: Allow random map scripts to load heightmap image files, fixes #5018..Feb 5 2018, 5:02 PM

Harbormaster completed building B4814: rP21113: Allow random map scripts to load heightmap image files, fixes #5018..Feb 5 2018, 6:17 PM

elexis mentioned this in rP21133: Implement JS random map library counterpart to rP21131 and rP21113, refs #4816….Feb 7 2018, 3:08 AM

elexis mentioned this in D1480: Fix VFS loading of map heightmap images.May 1 2018, 9:42 PM

elexis mentioned this in rP21814: Fix rP21113 compatibility with zipped mods, refs #5018..May 1 2018, 11:16 PM

Silier raised a concern with this commit.Apr 3 2019, 8:53 PM

Silier added a subscriber: Silier.

Silier added inline comments.

/ps/trunk/source/graphics/MapIO.cpp
68	@elexis the upper or lower line should be removed ? value is reassigned without usage of previous value

This commit now has outstanding concerns.Apr 3 2019, 8:53 PM

elexis added inline comments.Apr 3 2019, 11:01 PM

/ps/trunk/source/graphics/MapIO.cpp
68	Did I leave a line of debug code in there? only picking the red channel instead of max(r,g,b) The two lines incidentally give the same value since vanilla maps are shades of gray IIRC. So looks like L68 should be deleted. Perhaps can inline the remaining line then, static_cast<u16>(...) and \n after ,. Good catch

elexis mentioned this in D1816: Use all three color channels when loading heightmaps following rP21113.Apr 5 2019, 2:18 AM

elexis requested verification of this commit.Sep 12 2019, 9:30 PM

This commit now requires verification by auditors.Sep 12 2019, 9:30 PM

elexis mentioned this in rP22892: Use all three color channels when loading heightmaps following rP21113, refs….Sep 12 2019, 9:32 PM

fixed in rP22892

All concerns with this commit have now been addressed.Sep 12 2019, 9:48 PM

wraitii added a subscriber: wraitii.Jul 30 2021, 5:42 PM

wraitii added inline comments.

/ps/trunk/source/graphics/MapIO.cpp
68	Funnily enough, this 'debug' line made the code not buggy instead of buggy. See D1816 / rP22892 for the bug

Changes (5)

Path

Size

ps/

trunk/

source/

graphics/

MapGenerator.cpp

tools/

atlas/

GameInterface/

Handlers/

MapHandlers.cpp

rP21113

ps/trunk/source/graphics/MapGenerator.cpp

Loading...

ps/trunk/source/graphics/MapGenerator.h

Loading...

ps/trunk/source/graphics/MapIO.cpp

Loading...

ps/trunk/source/graphics/MapIO.h

Loading...

ps/trunk/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp

Loading...