mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-09-24 04:11:50 -04:00
CS: Fix landshape editor to allow all possible type of cell.
This commit is contained in:
Marius DAVID
parent
a0863290be
commit
77b08943a7
@ -258,35 +258,12 @@ void CSVRender::TerrainShapeMode::dragWheel(int diff, double speedFactor) {}
|
||||
|
||||
void CSVRender::TerrainShapeMode::sortAndLimitAlteredCells()
|
||||
{
|
||||
bool passing = false;
|
||||
int passes = 0;
|
||||
|
||||
std::sort(mAlteredCells.begin(), mAlteredCells.end());
|
||||
mAlteredCells.erase(std::unique(mAlteredCells.begin(), mAlteredCells.end()), mAlteredCells.end());
|
||||
|
||||
while (!passing) // Multiple passes are needed when steepness problems arise for both x and y axis simultaneously
|
||||
for (CSMWorld::CellCoordinates cellCoordinates : mAlteredCells)
|
||||
{
|
||||
passing = true;
|
||||
for (CSMWorld::CellCoordinates cellCoordinates : mAlteredCells)
|
||||
{
|
||||
limitAlteredHeights(cellCoordinates);
|
||||
}
|
||||
std::reverse(mAlteredCells.begin(),
|
||||
mAlteredCells
|
||||
.end()); // Instead of alphabetical order, this should be fixed to sort cells by cell coordinates
|
||||
for (CSMWorld::CellCoordinates cellCoordinates : mAlteredCells)
|
||||
{
|
||||
if (!limitAlteredHeights(cellCoordinates, true))
|
||||
passing = false;
|
||||
}
|
||||
++passes;
|
||||
if (passes > 2)
|
||||
{
|
||||
Log(Debug::Warning) << "Warning: User edit exceeds accepted slope steepness. Automatic limiting has "
|
||||
"failed, edit has been discarded.";
|
||||
clearTransientEdits();
|
||||
return;
|
||||
}
|
||||
limitAlteredHeights(cellCoordinates);
|
||||
}
|
||||
}
|
||||
|
||||
@ -590,8 +567,8 @@ void CSVRender::TerrainShapeMode::setFlattenToolTargetHeight(const WorldspaceHit
|
||||
mTargetHeight = landShapePointer[inCellY * ESM::Land::LAND_SIZE + inCellX];
|
||||
}
|
||||
|
||||
void CSVRender::TerrainShapeMode::alterHeight(
|
||||
const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, float alteredHeight, bool useTool)
|
||||
void CSVRender::TerrainShapeMode::alterHeight(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY,
|
||||
float alteredHeight, bool useTool, bool useAndAlterAdjacentCell)
|
||||
{
|
||||
std::string cellId = CSMWorld::CellCoordinates::generateId(cellCoords.getX(), cellCoords.getY());
|
||||
|
||||
@ -629,113 +606,121 @@ void CSVRender::TerrainShapeMode::alterHeight(
|
||||
alteredHeight = *paged->getCellAlteredHeight(cellCoords, inCellX, inCellY) + alteredHeight;
|
||||
}
|
||||
|
||||
if (inCellX != 0 && inCellY != 0 && inCellX != ESM::Land::LAND_SIZE - 1 && inCellY != ESM::Land::LAND_SIZE - 1)
|
||||
if ((inCellX != 0 && inCellY != 0 && inCellX != ESM::Land::LAND_SIZE - 1 && inCellY != ESM::Land::LAND_SIZE - 1)
|
||||
|| !useAndAlterAdjacentCell)
|
||||
paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
|
||||
|
||||
// Change values of cornering cells
|
||||
if ((inCellX == 0 && inCellY == 0) && (useTool || isLandLoaded(cellUpLeftId)))
|
||||
if (useAndAlterAdjacentCell)
|
||||
{
|
||||
if (allowLandShapeEditing(cellUpLeftId, useTool) && allowLandShapeEditing(cellLeftId, useTool)
|
||||
&& allowLandShapeEditing(cellUpId, useTool))
|
||||
// Change values of cornering cells
|
||||
if ((inCellX == 0 && inCellY == 0) && (useTool || isLandLoaded(cellUpLeftId)))
|
||||
{
|
||||
CSMWorld::CellCoordinates cornerCellCoords = cellCoords.move(-1, -1);
|
||||
if (useTool
|
||||
&& std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(cornerCellCoords);
|
||||
paged->setCellAlteredHeight(
|
||||
cornerCellCoords, ESM::Land::LAND_SIZE - 1, ESM::Land::LAND_SIZE - 1, alteredHeight);
|
||||
if (allowLandShapeEditing(cellUpLeftId, useTool) && allowLandShapeEditing(cellLeftId, useTool)
|
||||
&& allowLandShapeEditing(cellUpId, useTool))
|
||||
{
|
||||
CSMWorld::CellCoordinates cornerCellCoords = cellCoords.move(-1, -1);
|
||||
if (useTool
|
||||
&& std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(cornerCellCoords);
|
||||
paged->setCellAlteredHeight(
|
||||
cornerCellCoords, ESM::Land::LAND_SIZE - 1, ESM::Land::LAND_SIZE - 1, alteredHeight);
|
||||
}
|
||||
else
|
||||
return;
|
||||
}
|
||||
else
|
||||
return;
|
||||
}
|
||||
else if ((inCellX == 0 && inCellY == ESM::Land::LAND_SIZE - 1) && (useTool || isLandLoaded(cellDownLeftId)))
|
||||
{
|
||||
if (allowLandShapeEditing(cellDownLeftId, useTool) && allowLandShapeEditing(cellLeftId, useTool)
|
||||
&& allowLandShapeEditing(cellDownId, useTool))
|
||||
else if ((inCellX == 0 && inCellY == ESM::Land::LAND_SIZE - 1) && (useTool || isLandLoaded(cellDownLeftId)))
|
||||
{
|
||||
CSMWorld::CellCoordinates cornerCellCoords = cellCoords.move(-1, 1);
|
||||
if (useTool
|
||||
&& std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(cornerCellCoords);
|
||||
paged->setCellAlteredHeight(cornerCellCoords, ESM::Land::LAND_SIZE - 1, 0, alteredHeight);
|
||||
if (allowLandShapeEditing(cellDownLeftId, useTool) && allowLandShapeEditing(cellLeftId, useTool)
|
||||
&& allowLandShapeEditing(cellDownId, useTool))
|
||||
{
|
||||
CSMWorld::CellCoordinates cornerCellCoords = cellCoords.move(-1, 1);
|
||||
if (useTool
|
||||
&& std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(cornerCellCoords);
|
||||
paged->setCellAlteredHeight(cornerCellCoords, ESM::Land::LAND_SIZE - 1, 0, alteredHeight);
|
||||
}
|
||||
else
|
||||
return;
|
||||
}
|
||||
else
|
||||
return;
|
||||
}
|
||||
else if ((inCellX == ESM::Land::LAND_SIZE - 1 && inCellY == 0) && (useTool || isLandLoaded(cellUpRightId)))
|
||||
{
|
||||
if (allowLandShapeEditing(cellUpRightId, useTool) && allowLandShapeEditing(cellRightId, useTool)
|
||||
&& allowLandShapeEditing(cellUpId, useTool))
|
||||
else if ((inCellX == ESM::Land::LAND_SIZE - 1 && inCellY == 0) && (useTool || isLandLoaded(cellUpRightId)))
|
||||
{
|
||||
CSMWorld::CellCoordinates cornerCellCoords = cellCoords.move(1, -1);
|
||||
if (useTool
|
||||
&& std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(cornerCellCoords);
|
||||
paged->setCellAlteredHeight(cornerCellCoords, 0, ESM::Land::LAND_SIZE - 1, alteredHeight);
|
||||
if (allowLandShapeEditing(cellUpRightId, useTool) && allowLandShapeEditing(cellRightId, useTool)
|
||||
&& allowLandShapeEditing(cellUpId, useTool))
|
||||
{
|
||||
CSMWorld::CellCoordinates cornerCellCoords = cellCoords.move(1, -1);
|
||||
if (useTool
|
||||
&& std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(cornerCellCoords);
|
||||
paged->setCellAlteredHeight(cornerCellCoords, 0, ESM::Land::LAND_SIZE - 1, alteredHeight);
|
||||
}
|
||||
else
|
||||
return;
|
||||
}
|
||||
else
|
||||
return;
|
||||
}
|
||||
else if ((inCellX == ESM::Land::LAND_SIZE - 1 && inCellY == ESM::Land::LAND_SIZE - 1)
|
||||
&& (useTool || isLandLoaded(cellDownRightId)))
|
||||
{
|
||||
if (allowLandShapeEditing(cellDownRightId, useTool) && allowLandShapeEditing(cellRightId, useTool)
|
||||
&& allowLandShapeEditing(cellDownId, useTool))
|
||||
else if ((inCellX == ESM::Land::LAND_SIZE - 1 && inCellY == ESM::Land::LAND_SIZE - 1)
|
||||
&& (useTool || isLandLoaded(cellDownRightId)))
|
||||
{
|
||||
CSMWorld::CellCoordinates cornerCellCoords = cellCoords.move(1, 1);
|
||||
if (useTool
|
||||
&& std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(cornerCellCoords);
|
||||
paged->setCellAlteredHeight(cornerCellCoords, 0, 0, alteredHeight);
|
||||
if (allowLandShapeEditing(cellDownRightId, useTool) && allowLandShapeEditing(cellRightId, useTool)
|
||||
&& allowLandShapeEditing(cellDownId, useTool))
|
||||
{
|
||||
CSMWorld::CellCoordinates cornerCellCoords = cellCoords.move(1, 1);
|
||||
if (useTool
|
||||
&& std::find(mAlteredCells.begin(), mAlteredCells.end(), cornerCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(cornerCellCoords);
|
||||
paged->setCellAlteredHeight(cornerCellCoords, 0, 0, alteredHeight);
|
||||
}
|
||||
else
|
||||
return;
|
||||
}
|
||||
else
|
||||
return;
|
||||
}
|
||||
|
||||
// Change values of edging cells
|
||||
if ((inCellX == 0) && (useTool || isLandLoaded(cellLeftId)))
|
||||
{
|
||||
if (allowLandShapeEditing(cellLeftId, useTool))
|
||||
// Change values of edging cells
|
||||
if ((inCellX == 0) && (useTool || isLandLoaded(cellLeftId)))
|
||||
{
|
||||
CSMWorld::CellCoordinates edgeCellCoords = cellCoords.move(-1, 0);
|
||||
if (useTool && std::find(mAlteredCells.begin(), mAlteredCells.end(), edgeCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(edgeCellCoords);
|
||||
paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
|
||||
paged->setCellAlteredHeight(edgeCellCoords, ESM::Land::LAND_SIZE - 1, inCellY, alteredHeight);
|
||||
if (allowLandShapeEditing(cellLeftId, useTool))
|
||||
{
|
||||
CSMWorld::CellCoordinates edgeCellCoords = cellCoords.move(-1, 0);
|
||||
if (useTool
|
||||
&& std::find(mAlteredCells.begin(), mAlteredCells.end(), edgeCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(edgeCellCoords);
|
||||
paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
|
||||
paged->setCellAlteredHeight(edgeCellCoords, ESM::Land::LAND_SIZE - 1, inCellY, alteredHeight);
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((inCellY == 0) && (useTool || isLandLoaded(cellUpId)))
|
||||
{
|
||||
if (allowLandShapeEditing(cellUpId, useTool))
|
||||
if ((inCellY == 0) && (useTool || isLandLoaded(cellUpId)))
|
||||
{
|
||||
CSMWorld::CellCoordinates edgeCellCoords = cellCoords.move(0, -1);
|
||||
if (useTool && std::find(mAlteredCells.begin(), mAlteredCells.end(), edgeCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(edgeCellCoords);
|
||||
paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
|
||||
paged->setCellAlteredHeight(edgeCellCoords, inCellX, ESM::Land::LAND_SIZE - 1, alteredHeight);
|
||||
if (allowLandShapeEditing(cellUpId, useTool))
|
||||
{
|
||||
CSMWorld::CellCoordinates edgeCellCoords = cellCoords.move(0, -1);
|
||||
if (useTool
|
||||
&& std::find(mAlteredCells.begin(), mAlteredCells.end(), edgeCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(edgeCellCoords);
|
||||
paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
|
||||
paged->setCellAlteredHeight(edgeCellCoords, inCellX, ESM::Land::LAND_SIZE - 1, alteredHeight);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((inCellX == ESM::Land::LAND_SIZE - 1) && (useTool || isLandLoaded(cellRightId)))
|
||||
{
|
||||
if (allowLandShapeEditing(cellRightId, useTool))
|
||||
if ((inCellX == ESM::Land::LAND_SIZE - 1) && (useTool || isLandLoaded(cellRightId)))
|
||||
{
|
||||
CSMWorld::CellCoordinates edgeCellCoords = cellCoords.move(1, 0);
|
||||
if (useTool && std::find(mAlteredCells.begin(), mAlteredCells.end(), edgeCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(edgeCellCoords);
|
||||
paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
|
||||
paged->setCellAlteredHeight(edgeCellCoords, 0, inCellY, alteredHeight);
|
||||
if (allowLandShapeEditing(cellRightId, useTool))
|
||||
{
|
||||
CSMWorld::CellCoordinates edgeCellCoords = cellCoords.move(1, 0);
|
||||
if (useTool
|
||||
&& std::find(mAlteredCells.begin(), mAlteredCells.end(), edgeCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(edgeCellCoords);
|
||||
paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
|
||||
paged->setCellAlteredHeight(edgeCellCoords, 0, inCellY, alteredHeight);
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((inCellY == ESM::Land::LAND_SIZE - 1) && (useTool || isLandLoaded(cellDownId)))
|
||||
{
|
||||
if (allowLandShapeEditing(cellDownId, useTool))
|
||||
if ((inCellY == ESM::Land::LAND_SIZE - 1) && (useTool || isLandLoaded(cellDownId)))
|
||||
{
|
||||
CSMWorld::CellCoordinates edgeCellCoords = cellCoords.move(0, 1);
|
||||
if (useTool && std::find(mAlteredCells.begin(), mAlteredCells.end(), edgeCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(edgeCellCoords);
|
||||
paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
|
||||
paged->setCellAlteredHeight(edgeCellCoords, inCellX, 0, alteredHeight);
|
||||
if (allowLandShapeEditing(cellDownId, useTool))
|
||||
{
|
||||
CSMWorld::CellCoordinates edgeCellCoords = cellCoords.move(0, 1);
|
||||
if (useTool
|
||||
&& std::find(mAlteredCells.begin(), mAlteredCells.end(), edgeCellCoords) == mAlteredCells.end())
|
||||
mAlteredCells.emplace_back(edgeCellCoords);
|
||||
paged->setCellAlteredHeight(cellCoords, inCellX, inCellY, alteredHeight);
|
||||
paged->setCellAlteredHeight(edgeCellCoords, inCellX, 0, alteredHeight);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -966,70 +951,6 @@ void CSVRender::TerrainShapeMode::updateKeyHeightValues(const CSMWorld::CellCoor
|
||||
*rightHeight = *thisHeight;
|
||||
*downHeight = *thisHeight;
|
||||
|
||||
// If at edge, get values from neighboring cell
|
||||
if (inCellX == 0)
|
||||
{
|
||||
if (isLandLoaded(cellLeftId))
|
||||
{
|
||||
const CSMWorld::LandHeightsColumn::DataType landLeftShapePointer
|
||||
= landTable.data(landTable.getModelIndex(cellLeftId, landshapeColumn))
|
||||
.value<CSMWorld::LandHeightsColumn::DataType>();
|
||||
*leftHeight = landLeftShapePointer[inCellY * ESM::Land::LAND_SIZE + (ESM::Land::LAND_SIZE - 2)];
|
||||
if (paged->getCellAlteredHeight(cellCoords.move(-1, 0), ESM::Land::LAND_SIZE - 2, inCellY))
|
||||
{
|
||||
*leftAlteredHeight
|
||||
= *paged->getCellAlteredHeight(cellCoords.move(-1, 0), ESM::Land::LAND_SIZE - 2, inCellY);
|
||||
*leftHeight += *leftAlteredHeight;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (inCellY == 0)
|
||||
{
|
||||
if (isLandLoaded(cellUpId))
|
||||
{
|
||||
const CSMWorld::LandHeightsColumn::DataType landUpShapePointer
|
||||
= landTable.data(landTable.getModelIndex(cellUpId, landshapeColumn))
|
||||
.value<CSMWorld::LandHeightsColumn::DataType>();
|
||||
*upHeight = landUpShapePointer[(ESM::Land::LAND_SIZE - 2) * ESM::Land::LAND_SIZE + inCellX];
|
||||
if (paged->getCellAlteredHeight(cellCoords.move(0, -1), inCellX, ESM::Land::LAND_SIZE - 2))
|
||||
{
|
||||
*upAlteredHeight
|
||||
= *paged->getCellAlteredHeight(cellCoords.move(0, -1), inCellX, ESM::Land::LAND_SIZE - 2);
|
||||
*upHeight += *upAlteredHeight;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (inCellX == ESM::Land::LAND_SIZE - 1)
|
||||
{
|
||||
if (isLandLoaded(cellRightId))
|
||||
{
|
||||
const CSMWorld::LandHeightsColumn::DataType landRightShapePointer
|
||||
= landTable.data(landTable.getModelIndex(cellRightId, landshapeColumn))
|
||||
.value<CSMWorld::LandHeightsColumn::DataType>();
|
||||
*rightHeight = landRightShapePointer[inCellY * ESM::Land::LAND_SIZE + 1];
|
||||
if (paged->getCellAlteredHeight(cellCoords.move(1, 0), 1, inCellY))
|
||||
{
|
||||
*rightAlteredHeight = *paged->getCellAlteredHeight(cellCoords.move(1, 0), 1, inCellY);
|
||||
*rightHeight += *rightAlteredHeight;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (inCellY == ESM::Land::LAND_SIZE - 1)
|
||||
{
|
||||
if (isLandLoaded(cellDownId))
|
||||
{
|
||||
const CSMWorld::LandHeightsColumn::DataType landDownShapePointer
|
||||
= landTable.data(landTable.getModelIndex(cellDownId, landshapeColumn))
|
||||
.value<CSMWorld::LandHeightsColumn::DataType>();
|
||||
*downHeight = landDownShapePointer[ESM::Land::LAND_SIZE + inCellX];
|
||||
if (paged->getCellAlteredHeight(cellCoords.move(0, 1), inCellX, 1))
|
||||
{
|
||||
*downAlteredHeight = *paged->getCellAlteredHeight(cellCoords.move(0, 1), inCellX, 1);
|
||||
*downHeight += *downAlteredHeight;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// If not at edge, get values from the same cell
|
||||
if (inCellX != 0)
|
||||
{
|
||||
@ -1063,38 +984,7 @@ void CSVRender::TerrainShapeMode::updateKeyHeightValues(const CSMWorld::CellCoor
|
||||
}
|
||||
}
|
||||
|
||||
void CSVRender::TerrainShapeMode::compareAndLimit(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY,
|
||||
float* limitedAlteredHeightXAxis, float* limitedAlteredHeightYAxis, bool* steepnessIsWithinLimits)
|
||||
{
|
||||
if (limitedAlteredHeightXAxis)
|
||||
{
|
||||
if (limitedAlteredHeightYAxis)
|
||||
{
|
||||
if (std::abs(*limitedAlteredHeightXAxis) >= std::abs(*limitedAlteredHeightYAxis))
|
||||
{
|
||||
alterHeight(cellCoords, inCellX, inCellY, *limitedAlteredHeightXAxis, false);
|
||||
*steepnessIsWithinLimits = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
alterHeight(cellCoords, inCellX, inCellY, *limitedAlteredHeightYAxis, false);
|
||||
*steepnessIsWithinLimits = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
alterHeight(cellCoords, inCellX, inCellY, *limitedAlteredHeightXAxis, false);
|
||||
*steepnessIsWithinLimits = false;
|
||||
}
|
||||
}
|
||||
else if (limitedAlteredHeightYAxis)
|
||||
{
|
||||
alterHeight(cellCoords, inCellX, inCellY, *limitedAlteredHeightYAxis, false);
|
||||
*steepnessIsWithinLimits = false;
|
||||
}
|
||||
}
|
||||
|
||||
bool CSVRender::TerrainShapeMode::limitAlteredHeights(const CSMWorld::CellCoordinates& cellCoords, bool reverseMode)
|
||||
void CSVRender::TerrainShapeMode::limitAlteredHeights(const CSMWorld::CellCoordinates& cellCoords)
|
||||
{
|
||||
CSMDoc::Document& document = getWorldspaceWidget().getDocument();
|
||||
CSMWorld::IdTable& landTable
|
||||
@ -1104,7 +994,6 @@ bool CSVRender::TerrainShapeMode::limitAlteredHeights(const CSMWorld::CellCoordi
|
||||
std::string cellId = CSMWorld::CellCoordinates::generateId(cellCoords.getX(), cellCoords.getY());
|
||||
|
||||
int limitHeightChange = 1016.0f; // Limited by save format
|
||||
bool steepnessIsWithinLimits = true;
|
||||
|
||||
if (isLandLoaded(cellId))
|
||||
{
|
||||
@ -1123,27 +1012,18 @@ bool CSVRender::TerrainShapeMode::limitAlteredHeights(const CSMWorld::CellCoordi
|
||||
float downHeight = 0.0f;
|
||||
float downAlteredHeight = 0.0f;
|
||||
|
||||
if (!reverseMode)
|
||||
for (int inCellY = 0; inCellY < ESM::Land::LAND_SIZE; ++inCellY)
|
||||
{
|
||||
for (int inCellY = 0; inCellY < ESM::Land::LAND_SIZE; ++inCellY)
|
||||
for (int inCellX = 0; inCellX < ESM::Land::LAND_SIZE; ++inCellX)
|
||||
{
|
||||
for (int inCellX = 0; inCellX < ESM::Land::LAND_SIZE; ++inCellX)
|
||||
updateKeyHeightValues(cellCoords, inCellX, inCellY, &thisHeight, &thisAlteredHeight, &leftHeight,
|
||||
&leftAlteredHeight, &upHeight, &upAlteredHeight, &rightHeight, &rightAlteredHeight, &downHeight,
|
||||
&downAlteredHeight);
|
||||
|
||||
if (inCellX == 0)
|
||||
{
|
||||
std::unique_ptr<float> limitedAlteredHeightXAxis(nullptr);
|
||||
std::unique_ptr<float> limitedAlteredHeightYAxis(nullptr);
|
||||
updateKeyHeightValues(cellCoords, inCellX, inCellY, &thisHeight, &thisAlteredHeight, &leftHeight,
|
||||
&leftAlteredHeight, &upHeight, &upAlteredHeight, &rightHeight, &rightAlteredHeight, &downHeight,
|
||||
&downAlteredHeight);
|
||||
|
||||
// Check for height limits on x-axis
|
||||
if (leftHeight - thisHeight > limitHeightChange)
|
||||
limitedAlteredHeightXAxis = std::make_unique<float>(
|
||||
leftHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
|
||||
else if (leftHeight - thisHeight < -limitHeightChange)
|
||||
limitedAlteredHeightXAxis = std::make_unique<float>(
|
||||
leftHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
|
||||
|
||||
// Check for height limits on y-axis
|
||||
std::unique_ptr<float> limitedAlteredHeightYAxis(nullptr);
|
||||
if (upHeight - thisHeight > limitHeightChange)
|
||||
limitedAlteredHeightYAxis
|
||||
= std::make_unique<float>(upHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
|
||||
@ -1151,49 +1031,26 @@ bool CSVRender::TerrainShapeMode::limitAlteredHeights(const CSMWorld::CellCoordi
|
||||
limitedAlteredHeightYAxis
|
||||
= std::make_unique<float>(upHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
|
||||
|
||||
// Limit altered height value based on x or y, whichever is the smallest
|
||||
compareAndLimit(cellCoords, inCellX, inCellY, limitedAlteredHeightXAxis.get(),
|
||||
limitedAlteredHeightYAxis.get(), &steepnessIsWithinLimits);
|
||||
if (limitedAlteredHeightYAxis)
|
||||
alterHeight(cellCoords, inCellX, inCellY, *limitedAlteredHeightYAxis, false, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (reverseMode)
|
||||
{
|
||||
for (int inCellY = ESM::Land::LAND_SIZE - 1; inCellY >= 0; --inCellY)
|
||||
{
|
||||
for (int inCellX = ESM::Land::LAND_SIZE - 1; inCellX >= 0; --inCellX)
|
||||
else
|
||||
{
|
||||
std::unique_ptr<float> limitedAlteredHeightXAxis(nullptr);
|
||||
std::unique_ptr<float> limitedAlteredHeightYAxis(nullptr);
|
||||
updateKeyHeightValues(cellCoords, inCellX, inCellY, &thisHeight, &thisAlteredHeight, &leftHeight,
|
||||
&leftAlteredHeight, &upHeight, &upAlteredHeight, &rightHeight, &rightAlteredHeight, &downHeight,
|
||||
&downAlteredHeight);
|
||||
|
||||
// Check for height limits on x-axis
|
||||
if (rightHeight - thisHeight > limitHeightChange)
|
||||
std::unique_ptr<float> limitedAlteredHeightXAxis(nullptr);
|
||||
if (leftHeight - thisHeight > limitHeightChange)
|
||||
limitedAlteredHeightXAxis = std::make_unique<float>(
|
||||
rightHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
|
||||
else if (rightHeight - thisHeight < -limitHeightChange)
|
||||
leftHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
|
||||
else if (leftHeight - thisHeight < -limitHeightChange)
|
||||
limitedAlteredHeightXAxis = std::make_unique<float>(
|
||||
rightHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
|
||||
leftHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
|
||||
|
||||
// Check for height limits on y-axis
|
||||
if (downHeight - thisHeight > limitHeightChange)
|
||||
limitedAlteredHeightYAxis = std::make_unique<float>(
|
||||
downHeight - limitHeightChange - (thisHeight - thisAlteredHeight));
|
||||
else if (downHeight - thisHeight < -limitHeightChange)
|
||||
limitedAlteredHeightYAxis = std::make_unique<float>(
|
||||
downHeight + limitHeightChange - (thisHeight - thisAlteredHeight));
|
||||
|
||||
// Limit altered height value based on x or y, whichever is the smallest
|
||||
compareAndLimit(cellCoords, inCellX, inCellY, limitedAlteredHeightXAxis.get(),
|
||||
limitedAlteredHeightYAxis.get(), &steepnessIsWithinLimits);
|
||||
if (limitedAlteredHeightXAxis)
|
||||
alterHeight(cellCoords, inCellX, inCellY, *limitedAlteredHeightXAxis, false, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return steepnessIsWithinLimits;
|
||||
}
|
||||
|
||||
bool CSVRender::TerrainShapeMode::isInCellSelection(int globalSelectionX, int globalSelectionY)
|
||||
|
||||
@ -137,7 +137,7 @@ namespace CSVRender
|
||||
|
||||
/// Do a single height alteration for transient shape edit map
|
||||
void alterHeight(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, float alteredHeight,
|
||||
bool useTool = true);
|
||||
bool useTool = true, bool useAndAlterAdjacentCell = true);
|
||||
|
||||
/// Do a single smoothing height alteration for transient shape edit map
|
||||
void smoothHeight(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, int toolStrength);
|
||||
@ -149,19 +149,15 @@ namespace CSVRender
|
||||
/// Do a single equalize alteration for transient shape edit map
|
||||
void equalizeHeight(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY, int targetHeight);
|
||||
|
||||
/// Get altered height values around one vertex
|
||||
/// Get altered height values around one vertex. Default to value of this height for height out of this cell,
|
||||
/// with 0 for altered height.
|
||||
void updateKeyHeightValues(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY,
|
||||
float* thisHeight, float* thisAlteredHeight, float* leftHeight, float* leftAlteredHeight, float* upHeight,
|
||||
float* upAlteredHeight, float* rightHeight, float* rightAlteredHeight, float* downHeight,
|
||||
float* downAlteredHeight);
|
||||
|
||||
/// Limit steepness based on either X or Y and return false if steepness is limited
|
||||
void compareAndLimit(const CSMWorld::CellCoordinates& cellCoords, int inCellX, int inCellY,
|
||||
float* limitedAlteredHeightXAxis, float* limitedAlteredHeightYAxis, bool* steepnessIsWithinLimits);
|
||||
|
||||
/// Check that the edit doesn't break save format limits, fix if necessary, return true if slope steepness is
|
||||
/// within limits
|
||||
bool limitAlteredHeights(const CSMWorld::CellCoordinates& cellCoords, bool reverseMode = false);
|
||||
/// Check that the edit doesn't break save format limits, fix if necessary
|
||||
void limitAlteredHeights(const CSMWorld::CellCoordinates& cellCoords);
|
||||
|
||||
/// Check if global selection coordinate belongs to cell in view
|
||||
bool isInCellSelection(int globalSelectionX, int globalSelectionY);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user