Page MenuHomeWildfire Games
Differential D2963

Improve splash damage falloff calculation to account somewhat for obstruction size
ClosedPublic
Actions

Authored by wraitii on Aug 17 2020, 12:32 PM.

Details

Reviewers
Freagarach
bb
Group Reviewers
Balancing
Commits
rP24010: Improve splash damage falloff calculation to account for obstruction size.
Summary

As noted in D2759, splash calculates falloff based on centre-to-point distance, which is somewhat incorrect -> it ought to use nearest-edge-to-point distance.

This:

  • cleans up GetUnitSize for just GetSize (unrelated in this iteration of the patch but I noticed it while working on this)
  • Uses DistanceToPoint to calculate an exact distance for falloff
  • Makes sure the damage multiplier cannot be below 0.

The change to DistanceToPoint might be controversial - it's certainly slower, but for buildings it's required.

Test Plan

Check that the new maths is correct and agree that this new behaviour is preferable.

Diff Detail

Event Timeline

wraitii created this revision.Aug 17 2020, 12:32 PM
wraitii updated this revision to Diff 13219.Aug 17 2020, 12:32 PM

Update to the good diff.

wraitii mentioned this in D2759: Update range queries to account for entity size.Aug 17 2020, 12:33 PM
Vulcan added a comment.Aug 17 2020, 12:41 PM

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

builderr-debug-macos.txt
../../../source/simulation2/scripting/JSInterface_Simulation.cpp:154:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        CFixedVector2D(-halfSize.X, -halfSize.Y),
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
In file included from ../../../source/graphics/tests/test_Camera.cpp:17:
/Users/wfg/Jenkins/workspace/macos-differential/source/graphics/tests/test_Camera.h:168:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        CVector3D(-101.0f, -101.0f, 101.0f),
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
In file included from ../../../source/simulation2/tests/test_SerializeTemplates.cpp:17:
/Users/wfg/Jenkins/workspace/macos-differential/source/simulation2/tests/test_SerializeTemplates.h:39:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        3, 0, 1, 4, 1, 5
                        ^~~~~~~~~~~~~~~~
                        {               }
1 warning generated.
builderr-release-macos.txt
../../../source/simulation2/scripting/JSInterface_Simulation.cpp:154: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/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
In file included from ../../../source/graphics/tests/test_Camera.cpp:17:
/Users/wfg/Jenkins/workspace/macos-differential/source/graphics/tests/test_Camera.h:168:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        CVector3D(-101.0f, -101.0f, 101.0f),
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
In file included from ../../../source/simulation2/tests/test_SerializeTemplates.cpp:17:
/Users/wfg/Jenkins/workspace/macos-differential/source/simulation2/tests/test_SerializeTemplates.h:39:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        3, 0, 1, 4, 1, 5
                        ^~~~~~~~~~~~~~~~
                        {               }
1 warning generated.

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

Vulcan added a comment.Aug 17 2020, 12:50 PM

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

builderr-debug-macos.txt
../../../source/simulation2/scripting/JSInterface_Simulation.cpp:154:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        CFixedVector2D(-halfSize.X, -halfSize.Y),
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
In file included from ../../../source/graphics/tests/test_Camera.cpp:17:
/Users/wfg/Jenkins/workspace/macos-differential/source/graphics/tests/test_Camera.h:168:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        CVector3D(-101.0f, -101.0f, 101.0f),
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
In file included from ../../../source/simulation2/tests/test_SerializeTemplates.cpp:17:
/Users/wfg/Jenkins/workspace/macos-differential/source/simulation2/tests/test_SerializeTemplates.h:39:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        3, 0, 1, 4, 1, 5
                        ^~~~~~~~~~~~~~~~
                        {               }
1 warning generated.
builderr-release-macos.txt
../../../source/simulation2/scripting/JSInterface_Simulation.cpp:154: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/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
In file included from ../../../source/graphics/tests/test_Camera.cpp:17:
/Users/wfg/Jenkins/workspace/macos-differential/source/graphics/tests/test_Camera.h:168:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        CVector3D(-101.0f, -101.0f, 101.0f),
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
In file included from ../../../source/simulation2/tests/test_SerializeTemplates.cpp:17:
/Users/wfg/Jenkins/workspace/macos-differential/source/simulation2/tests/test_SerializeTemplates.h:39:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        3, 0, 1, 4, 1, 5
                        ^~~~~~~~~~~~~~~~
                        {               }
1 warning generated.

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

Harbormaster completed remote builds in B12905: Diff 13218.Aug 17 2020, 12:50 PM
Harbormaster completed remote builds in B12906: Diff 13219.Aug 17 2020, 1:04 PM
wraitii requested review of this revision.Aug 17 2020, 1:04 PM
bb accepted this revision.Aug 25 2020, 1:55 PM

Good use of those range functions imo.

Some small stuffs, otherwise good to go:

./source/simulation2/components/tests/test_ObstructionManager.h has a GetUnitRadius reference. Straightforward nuke

binaries/data/mods/public/simulation/components/Trader.js
301

could add spaces while at it

binaries/data/mods/public/simulation/components/tests/test_Builder.js
80

can nuke a .0 while at it

binaries/data/mods/public/simulation/components/tests/test_Damage.js
201

Make the linter happy, by quoting the object keys

203

weird that the linter doesn't complain about trailing comma's

297

Please some linter

binaries/data/mods/public/simulation/helpers/Attacking.js
333

I believe this reason not to be accurate. The reason it can become negative is the rangemanager returning to many to far away entities (due to square/circular shape mismatch)

This revision is now accepted and ready to land.Aug 25 2020, 1:55 PM
wraitii added inline comments.Aug 27 2020, 9:38 AM
binaries/data/mods/public/simulation/helpers/Attacking.js
333

Mh, that's kind of what I meant here. I'll clarify.

wraitii updated this revision to Diff 13351.Aug 31 2020, 11:19 AM

@bb's comments + Rebased.

Will commit once lights are green.

Vulcan added a comment.Aug 31 2020, 11:31 AM

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

builderr-debug-macos.txt
../../../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.
In file included from ../../../source/graphics/tests/test_Camera.cpp:17:
/Users/wfg/Jenkins/workspace/macos-differential/source/graphics/tests/test_Camera.h:168:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        CVector3D(-101.0f, -101.0f, 101.0f),
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
In file included from ../../../source/simulation2/tests/test_SerializeTemplates.cpp:17:
/Users/wfg/Jenkins/workspace/macos-differential/source/simulation2/tests/test_SerializeTemplates.h:39:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        3, 0, 1, 4, 1, 5
                        ^~~~~~~~~~~~~~~~
                        {               }
1 warning generated.
builderr-release-macos.txt
../../../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/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
In file included from ../../../source/graphics/tests/test_Camera.cpp:17:
/Users/wfg/Jenkins/workspace/macos-differential/source/graphics/tests/test_Camera.h:168:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        CVector3D(-101.0f, -101.0f, 101.0f),
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
In file included from ../../../source/simulation2/tests/test_SerializeTemplates.cpp:17:
/Users/wfg/Jenkins/workspace/macos-differential/source/simulation2/tests/test_SerializeTemplates.h:39:4: warning: suggest braces around initialization of subobject [-Wmissing-braces]
                        3, 0, 1, 4, 1, 5
                        ^~~~~~~~~~~~~~~~
                        {               }
1 warning generated.

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

Harbormaster completed remote builds in B13041: Diff 13351.Aug 31 2020, 1:02 PM
Closed by commit rP24010: Improve splash damage falloff calculation to account for obstruction size. (authored by wraitii). · Explain WhyAug 31 2020, 5:01 PM
This revision was automatically updated to reflect the committed changes.
wraitii added a commit: rP24010: Improve splash damage falloff calculation to account for obstruction size..

Revision Contents
Changeset List

PathSize
binaries/
data/
mods/
public/
simulation/
components/
2 lines
4 lines
2 lines
tests/
2 lines
72 lines
helpers/
17 lines
source/
simulation2/
components/
4 lines
8 lines
8 lines
2 lines
tests/
1 line

Diff 13351

View Options

binaries/data/mods/public/simulation/components/Builder.js

Loading...
View Options

binaries/data/mods/public/simulation/components/GarrisonHolder.js

Loading...
View Options

binaries/data/mods/public/simulation/components/Trader.js

Loading...
View Options

binaries/data/mods/public/simulation/components/tests/test_Builder.js

Loading...
View Options

binaries/data/mods/public/simulation/components/tests/test_Damage.js

Loading...
View Options

binaries/data/mods/public/simulation/helpers/Attacking.js

Loading...
View Options

source/simulation2/components/CCmpFootprint.cpp

Loading...
View Options

source/simulation2/components/CCmpObstruction.cpp

Loading...
View Options

source/simulation2/components/ICmpObstruction.h

Loading...
View Options

source/simulation2/components/ICmpObstruction.cpp

Loading...
View Options

source/simulation2/components/tests/test_ObstructionManager.h

Loading...
Wildfire Games · Phabricator