ad3laid3/skate3recomp-multiplayer
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Selection outline: require the guest edge-detect draw (gameplay ghosts)

Browse source
This commit is contained in:
mchughalex 2026-07-09 00:33:29 +01:00
parent e2a7255ed3
commit 60be1f9316
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/skate3_native_scene.cpp
View file

@ -251,6 +251,13 @@ struct SelectedDrawKey {
}; };
bool g_sky_seen_this_frame = false; bool g_sky_seen_this_frame = false;
std::vector<SelectedDrawKey> g_frame_selected; std::vector<SelectedDrawKey> g_frame_selected;
// The guest issued its postfx_edgedetectstencil draw this frame: the game's
// own "an outline is being drawn" signal (park editor / object mover with an
// active selection). Post-sky double-draws alone are NOT sufficient evidence
// of a selection: normal gameplay draws some small props twice after the sky
// (far LOD/imposter passes), which used to sprout phantom outlines on distant
// objects. Guest render thread only; reset per frame in BuildFrameScene.
bool g_outline_edge_seen = false;
// Outline color, refreshed from the guest postfx_edgedetectstencil draw's // Outline color, refreshed from the guest postfx_edgedetectstencil draw's
// PS c0 (the park-editor blue in every capture) whenever that pass runs. // PS c0 (the park-editor blue in every capture) whenever that pass runs.
float g_outline_color[4] = {0.21569f, 0.64706f, 1.0f, 1.0f}; float g_outline_color[4] = {0.21569f, 0.64706f, 1.0f, 1.0f};
@ -2529,8 +2536,11 @@ void OnDrawDone(uint8_t* base, uint32_t func, uint32_t r4, uint32_t r5, uint32_t
break; break;
} }
} else if (fam == 3) { } else if (fam == 3) {
// postfx edge-detect: PS c0 = the outline color as staged (the // postfx edge-detect: the presence of this draw is what authorizes the
// park-editor blue (0.216, 0.647, 1.0) in every capture). // native outline this frame (see g_outline_edge_seen); its PS c0 = the
// outline color as staged (the park-editor blue (0.216, 0.647, 1.0) in
// every capture).
g_outline_edge_seen = true;
const uint32_t ps_bank = g_ps_bank.load(std::memory_order_relaxed); const uint32_t ps_bank = g_ps_bank.load(std::memory_order_relaxed);
if (ps_bank != 0) { if (ps_bank != 0) {
float c[4]; float c[4];
@ -3112,6 +3122,8 @@ void BuildFrameScene(uint8_t* base, const SubmitRecord* records, size_t count) {
std::vector<SelectedDrawKey> frame_selected; std::vector<SelectedDrawKey> frame_selected;
frame_selected.swap(g_frame_selected); frame_selected.swap(g_frame_selected);
g_sky_seen_this_frame = false; g_sky_seen_this_frame = false;
const bool outline_edge_seen = g_outline_edge_seen;
g_outline_edge_seen = false;
if (count == 0) { if (count == 0) {
return; return;
} }
@ -3296,10 +3308,14 @@ void BuildFrameScene(uint8_t* base, const SubmitRecord* records, size_t count) {
// Selected-object outline: flag items matching this frame's post-sky // Selected-object outline: flag items matching this frame's post-sky
// re-draw captures. >= 2 identical draws = the stencil-marking pair; a // re-draw captures. >= 2 identical draws = the stencil-marking pair; a
// single occurrence is a legitimately late-drawn object, not a selection. // single occurrence is a legitimately late-drawn object, not a selection.
// BOTH signals are required: the guest's own postfx_edgedetectstencil draw
// must have run this frame too (park editor with an active selection);
// gameplay draws some small props twice after the sky as well, which used
// to outline distant objects during normal play.
{ {
uint32_t outline_items = 0; uint32_t outline_items = 0;
for (const SelectedDrawKey& k : frame_selected) { for (const SelectedDrawKey& k : frame_selected) {
if (k.count < 2) { if (!outline_edge_seen || k.count < 2) {
continue; continue;
} }
for (DrawItem& item : scene.items) { for (DrawItem& item : scene.items) {