mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 00:15:35 +00:00
Code Issues Releases Wiki Activity

Set mPluginIndex to -1 for textures defined in this plugin

Browse source
This commit is contained in:
Evil Eye 2024-05-22 22:41:23 +02:00
parent ed5bedb9db
commit 965bc20bab
5 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/opencs/model/world/idcollection.hpp
View file

@ -73,6 +73,13 @@ namespace CSMWorld
bool isDeleted = false; bool isDeleted = false;
loadRecord(record, reader, isDeleted); loadRecord(record, reader, isDeleted);
if constexpr (std::is_same_v<ESXRecordT, LandTexture>)
{
// This doesn't really matter since the value never gets saved, but it makes the index uniqueness check more
// sensible
if (!base)
record.mPluginIndex = -1;
}
ESM::RefId id = getRecordId(record); ESM::RefId id = getRecordId(record);
int index = this->searchId(id); int index = this->searchId(id);

2
apps/opencs/model/world/idtable.cpp
View file

@ -410,7 +410,7 @@ CSMWorld::LandTextureIdTable::ImportResults CSMWorld::LandTextureIdTable::import
int startIndex = index; int startIndex = index;
do do
{ {
std::string newId = LandTexture::createUniqueRecordId(0, index); std::string newId = LandTexture::createUniqueRecordId(-1, index);
const ESM::RefId newRefId = ESM::RefId::stringRefId(newId); const ESM::RefId newRefId = ESM::RefId::stringRefId(newId);
int newRow = idCollection()->searchId(newRefId); int newRow = idCollection()->searchId(newRefId);

6
apps/opencs/view/render/terraintexturemode.cpp
View file

@ -680,13 +680,13 @@ void CSVRender::TerrainTextureMode::createTexture(const std::string& textureFile
const size_t maxCounter = std::numeric_limits<uint16_t>::max() - 1; const size_t maxCounter = std::numeric_limits<uint16_t>::max() - 1;
try try
{ {
newId = CSMWorld::LandTexture::createUniqueRecordId(0, counter); newId = CSMWorld::LandTexture::createUniqueRecordId(-1, counter);
if (ltexTable.getRecord(newId).isDeleted() == 0) if (!ltexTable.getRecord(newId).isDeleted())
counter = (counter + 1) % maxCounter; counter = (counter + 1) % maxCounter;
} }
catch (const std::exception&) catch (const std::exception&)
{ {
newId = CSMWorld::LandTexture::createUniqueRecordId(0, counter); newId = CSMWorld::LandTexture::createUniqueRecordId(-1, counter);
freeIndexFound = true; freeIndexFound = true;
} }
} while (freeIndexFound == false); } while (freeIndexFound == false);

4
apps/opencs/view/widget/scenetooltexturebrush.cpp
View file

@ -167,7 +167,7 @@ void CSVWidget::TextureBrushWindow::setBrushTexture(std::string brushTexture)
int pluginInDragged = 0; int pluginInDragged = 0;
CSMWorld::LandTexture::parseUniqueRecordId(brushTexture, pluginInDragged, index); CSMWorld::LandTexture::parseUniqueRecordId(brushTexture, pluginInDragged, index);
const ESM::RefId brushTextureRefId = ESM::RefId::stringRefId(brushTexture); const ESM::RefId brushTextureRefId = ESM::RefId::stringRefId(brushTexture);
std::string newBrushTextureId = CSMWorld::LandTexture::createUniqueRecordId(0, index); std::string newBrushTextureId = CSMWorld::LandTexture::createUniqueRecordId(-1, index);
ESM::RefId newBrushTextureRefId = ESM::RefId::stringRefId(newBrushTextureId); ESM::RefId newBrushTextureRefId = ESM::RefId::stringRefId(newBrushTextureId);
int rowInBase = landtexturesCollection.searchId(brushTextureRefId); int rowInBase = landtexturesCollection.searchId(brushTextureRefId);
int rowInNew = landtexturesCollection.searchId(newBrushTextureRefId); int rowInNew = landtexturesCollection.searchId(newBrushTextureRefId);
@ -184,7 +184,7 @@ void CSVWidget::TextureBrushWindow::setBrushTexture(std::string brushTexture)
const int maxCounter = std::numeric_limits<uint16_t>::max() - 1; const int maxCounter = std::numeric_limits<uint16_t>::max() - 1;
do do
{ {
newBrushTextureId = CSMWorld::LandTexture::createUniqueRecordId(0, counter); newBrushTextureId = CSMWorld::LandTexture::createUniqueRecordId(-1, counter);
newBrushTextureRefId = ESM::RefId::stringRefId(newBrushTextureId); newBrushTextureRefId = ESM::RefId::stringRefId(newBrushTextureId);
if (landtexturesCollection.searchId(brushTextureRefId) != -1 if (landtexturesCollection.searchId(brushTextureRefId) != -1
&& landtexturesCollection.getRecord(brushTextureRefId).isDeleted() == 0 && landtexturesCollection.getRecord(brushTextureRefId).isDeleted() == 0

2
apps/opencs/view/world/landtexturecreator.cpp
View file

@ -91,7 +91,7 @@ namespace CSVWorld
std::string LandTextureCreator::getId() const std::string LandTextureCreator::getId() const
{ {
return CSMWorld::LandTexture::createUniqueRecordId(0, mIndexBox->value()); return CSMWorld::LandTexture::createUniqueRecordId(-1, mIndexBox->value());
} }
void LandTextureCreator::nameChanged(const QString& value) void LandTextureCreator::nameChanged(const QString& value)