mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-29 03:33:48 +00:00
Code Issues Releases Wiki Activity

fix editor bug (tile confusion) when moving tiles to front or back while also dragging them

Browse source
This commit is contained in:
fgenesis 2024-07-13 06:44:41 +02:00
parent b54d8d05ac
commit 2f47d11271
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Aquaria/SceneEditor.cpp
View file

@ -133,24 +133,31 @@ static void quadToTile(TileData& t, const Quad *q)
class MultiTileHelper : public Quad class MultiTileHelper : public Quad
{ {
TileStorage& _ts; TileStorage& _ts;
std::vector<size_t> _indices;
std::vector<Quad*> _quads; std::vector<Quad*> _quads;
Vector lastScale; Vector lastScale;
MultiTileHelper(TileStorage& ts, const size_t *indices, size_t n) // This NEEDS to be a reference. The tile bulk-manipulation functions that take an array of indices
// as parameters and also update those parameters shall modify only a single source of truth,
// and that's SceneEditor::selectedTiles.
// Otherwise it could happen that indices change in that vector while a previously made copy
// carries around outdated indices, possibly leading to modification of unrelated tiles.
const std::vector<size_t> & _indices;
MultiTileHelper(TileStorage& ts, const std::vector<size_t>& indices)
: Quad() : Quad()
, _ts(ts), _indices(indices, indices + n) , _ts(ts), _indices(indices)
{ {
_quads.reserve(n); _quads.reserve(indices.size());
this->cull = false; this->cull = false;
} }
public: public:
static MultiTileHelper *New(unsigned bgLayer, const size_t *indices, size_t n) static MultiTileHelper *New(unsigned bgLayer, const std::vector<size_t>& indices)
{ {
const size_t n = indices.size();
assert(n); assert(n);
TileStorage& ts = dsq->tilemgr.tilestore[bgLayer]; TileStorage& ts = dsq->tilemgr.tilestore[bgLayer];
MultiTileHelper *th = new MultiTileHelper(ts, indices, n); MultiTileHelper *th = new MultiTileHelper(ts, indices);
if(n == 1) if(n == 1)
{ {
@ -241,7 +248,7 @@ public:
void finish() void finish()
{ {
size_t n = _indices.size(); const size_t n = _indices.size();
if(n == 1) if(n == 1)
{ {
TileData& t = _ts.tiles[_indices[0]]; TileData& t = _ts.tiles[_indices[0]];
@ -250,6 +257,7 @@ public:
} }
else else
{ {
assert(n == _quads.size());
for(size_t i = 0; i < n; ++i) for(size_t i = 0; i < n; ++i)
{ {
TileData& t = _ts.tiles[_indices[i]]; TileData& t = _ts.tiles[_indices[i]];
@ -2894,7 +2902,7 @@ MultiTileHelper * SceneEditor::createMultiTileHelperFromSelection()
assert(!multi); assert(!multi);
if(selectedTiles.empty()) if(selectedTiles.empty())
return NULL; return NULL;
return (multi = MultiTileHelper::New(bgLayer, &selectedTiles[0], selectedTiles.size())); return (multi = MultiTileHelper::New(bgLayer, selectedTiles));
} }
void SceneEditor::destroyMultiTileHelper() void SceneEditor::destroyMultiTileHelper()