Page MenuHomeWildfire Games

Moves foam calculation into a separate function and fixes its lighting
ClosedPublic

Authored by vladislavbelov on Nov 8 2020, 11:36 AM.

Details

Reviewers
None
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP24145: Moves foam calculation into a separate function and fixes its lighting.
Summary

Subj.

Test Plan
  1. Apply the patch and compile the game
  2. Make sure that foams/shore lines look mostly the same and no much over brightness

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.Nov 8 2020, 11:36 AM

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

builderr-release-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libnetwork.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/liblobby.a(precompiled.o) has no symbols
../../../source/simulation2/scripting/JSInterface_Simulation.cpp:155:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        CFixedVector2D(-halfSize.X, -halfSize.Y),
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libengine.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgraphics.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libatlas.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgui.a(precompiled.o) has no symbols

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

Stan added a subscriber: Stan.EditedNov 8 2020, 3:51 PM

The difference is slightly visible, the new ones seem darker.

VanillaPatched
Intel
Nvidia
binaries/data/mods/public/shaders/glsl/water_high.fs
136 ↗(On Diff #13790)

Maybe?

vladislavbelov added inline comments.Nov 8 2020, 3:57 PM
binaries/data/mods/public/shaders/glsl/water_high.fs
136 ↗(On Diff #13790)

It will be optimized by compiler anyway, it inlines all functions.

This revision was not accepted when it landed; it landed in state Draft.Nov 8 2020, 11:18 PM
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.