mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-01-26 02:07:26 +00:00
Code Issues Releases Wiki Activity

correctly update VBO of GridRender(OT_BLACK) after trimGrid()

Browse source 
This fixes blackness showing occasionally even though it was no longer there
This commit is contained in:
fgenesis 2024-07-08 03:54:00 +02:00
parent a5b25af6d5
commit b54d8d05ac
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Aquaria/Game.cpp
View file

@ -547,6 +547,9 @@ void Game::reconstructEntityGrid()
updateGridRender(OT_INVISIBLEENT); updateGridRender(OT_INVISIBLEENT);
} }
// TODO: ideally this would be split into two functions, one that reconstructs blackness
// and is called on map load or by the editor, and another one that just reconstructs
// the dynamic parts of the grid.
void Game::reconstructGrid(bool force) void Game::reconstructGrid(bool force)
{ {
if (!force && isSceneEditorActive()) return; if (!force && isSceneEditorActive()) return;
@ -581,8 +584,8 @@ void Game::reconstructGrid(bool force)
trimGrid(); trimGrid();
// This does intentionally not update black. // Must update OT_BLACK after trimGrid()
updateGridRender(OT_MASK_NOTBLACK); updateGridRender(OT_MASK_ALL);
} }
void Game::trimGrid() void Game::trimGrid()

1
Aquaria/GameEnums.h
View file

@ -33,6 +33,7 @@ enum ObsType
OT_USER_MASK = OT_USER1 | OT_USER2, OT_USER_MASK = OT_USER1 | OT_USER2,
OT_OUTOFBOUNDS = 0xff, // all bits set OT_OUTOFBOUNDS = 0xff, // all bits set
OT_MASK_ALL = 0xff
}; };