Build has FAILED

builderr-debug-macos.txt
../../../source/graphics/ShaderProgram.cpp:86:15: warning: 'Reload' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void Reload()
                     ^
../../../source/graphics/ShaderProgram.h:124:15: note: overridden virtual function is here
        virtual void Reload() = 0;
                     ^
../../../source/graphics/ShaderProgram.cpp:118:15: warning: 'Bind' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void Bind()
                     ^
../../../source/graphics/ShaderProgram.h:135:15: note: overridden virtual function is here
        virtual void Bind() = 0;
                     ^
../../../source/graphics/ShaderProgram.cpp:128:15: warning: 'Unbind' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void Unbind()
                     ^
../../../source/graphics/ShaderProgram.h:140:

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/3000/display/redirect
See console output for more information: https://jenkins.wildfiregames.com/job/macos-differential/3000/display/redirectconsole

"I guess it is either this or a revert. I don't like the fact that we filter here, I think we should do it earlier, if one has hideInSummary true for the counter, but not for the heading things get ugly again."

That's without the hideInSummary variable already true. If headings and counters contained different number of values it would be ugly (independent of rP24721). It's the disconnection between headings and counters that feels weird. I think in long term the getScorePanelsData should return something like:

[
    {
        "label": ...
        "titleHeadings": ...
        "values": [
            {
                "identifier": "total",
                "caption": translate("Total"),
                "yStart": 34,
                "width": 105,
                "verticalOffset": 3,
                "fn": calculateBuildings
                "hideInSummary": false
            },
            ...
        ],
        "teamCounterFn": calculateBuildingsTeam
    },
    ...    
]

I think the summary needs a general rewrite anyways. IMO not a big deal, performance doesn't matter here.

@toonijn You are right :)

Can anyone confirm this is a proper hotfix then, please :)

In D3440#152272, @toonijn wrote:

"I guess it is either this or a revert. I don't like the fact that we filter here, I think we should do it earlier, if one has hideInSummary true for the counter, but not for the heading things get ugly again."

That's without the hideInSummary variable already true. If headings and counters contained different number of values it would be ugly (independent of rP24721). It's the disconnection between headings and counters that feels weird. I think in long term the getScorePanelsData should return something like:

[
    {
        "label": ...
        "titleHeadings": ...
        "values": [
            {
                "identifier": "total",
                "caption": translate("Total"),
                "yStart": 34,
                "width": 105,
                "verticalOffset": 3,
                "fn": calculateBuildings
                "hideInSummary": false
            },
            ...
        ],
        "teamCounterFn": calculateBuildingsTeam
    },
    ...    
]

Yeah, could make sense. If you want to give it a shot, feel free to try it. (Won't get into A24 ofc ;)
@wraitii what kind of rewrite do you think of?

OOP I guess?