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

Remove measurement code

Browse source
This commit is contained in:
unelsson 2021-10-02 14:58:47 +03:00
parent 7602d677fa
commit 3df9ceda03
2 changed files with 0 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
apps/opencs/view/render/terrainselection.cpp
View file

@ -96,7 +96,6 @@ void CSVRender::TerrainSelection::update()
void CSVRender::TerrainSelection::drawShapeSelection(const osg::ref_ptr<osg::Vec3Array> vertices) void CSVRender::TerrainSelection::drawShapeSelection(const osg::ref_ptr<osg::Vec3Array> vertices)
{ {
resetMeasurements();
if (!mSelection.empty()) if (!mSelection.empty())
{ {
for (std::pair<int, int> &localPos : mSelection) for (std::pair<int, int> &localPos : mSelection)
@ -129,12 +128,10 @@ void CSVRender::TerrainSelection::drawShapeSelection(const osg::ref_ptr<osg::Vec
} }
} }
} }
printMeasurements();
} }
void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr<osg::Vec3Array> vertices) void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr<osg::Vec3Array> vertices)
{ {
resetMeasurements();
if (!mSelection.empty()) if (!mSelection.empty())
{ {
const int landHeightsNudge = (ESM::Land::REAL_SIZE / ESM::Land::LAND_SIZE) / (ESM::Land::LAND_SIZE - 1); // Does this work with all land size configurations? const int landHeightsNudge = (ESM::Land::REAL_SIZE / ESM::Land::LAND_SIZE) / (ESM::Land::LAND_SIZE - 1); // Does this work with all land size configurations?
@ -203,7 +200,6 @@ void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr<osg::V
} }
} }
} }
printMeasurements();
} }
void CSVRender::TerrainSelection::handleSelection(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress, SelectionMethod selectionMethod) void CSVRender::TerrainSelection::handleSelection(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress, SelectionMethod selectionMethod)
@ -329,7 +325,6 @@ bool CSVRender::TerrainSelection::isLandLoaded(const std::string& cellId)
int CSVRender::TerrainSelection::calculateLandHeight(int x, int y) // global vertex coordinates int CSVRender::TerrainSelection::calculateLandHeight(int x, int y) // global vertex coordinates
{ {
auto start = std::chrono::high_resolution_clock::now();
int cellX = std::floor(static_cast<float>(x) / (ESM::Land::LAND_SIZE - 1)); int cellX = std::floor(static_cast<float>(x) / (ESM::Land::LAND_SIZE - 1));
int cellY = std::floor(static_cast<float>(y) / (ESM::Land::LAND_SIZE - 1)); int cellY = std::floor(static_cast<float>(y) / (ESM::Land::LAND_SIZE - 1));
int localX = x - cellX * (ESM::Land::LAND_SIZE - 1); int localX = x - cellX * (ESM::Land::LAND_SIZE - 1);
@ -347,69 +342,8 @@ int CSVRender::TerrainSelection::calculateLandHeight(int x, int y) // global ver
CSMDoc::Document& document = mWorldspaceWidget->getDocument(); CSMDoc::Document& document = mWorldspaceWidget->getDocument();
std::string cellId = CSMWorld::CellCoordinates::generateId(cellX, cellY); std::string cellId = CSMWorld::CellCoordinates::generateId(cellX, cellY);
const ESM::Land::LandData* landData = document.getData().getLand().getRecord(cellId).get().getLandData(ESM::Land::DATA_VHGT); const ESM::Land::LandData* landData = document.getData().getLand().getRecord(cellId).get().getLandData(ESM::Land::DATA_VHGT);
auto stop = std::chrono::high_resolution_clock::now();
int duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start).count();
mDurationsA += duration;
mDurationsAMeasurements++;
return landData->mHeights[localY*ESM::Land::LAND_SIZE + localX]; return landData->mHeights[localY*ESM::Land::LAND_SIZE + localX];
} }
auto stop = std::chrono::high_resolution_clock::now();
int duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start).count();
mDurationsB += duration;
mDurationsBMeasurements++;
return landHeight; return landHeight;
} }
/*int CSVRender::TerrainSelection::OldCalculateLandHeight(int x, int y) // global vertex coordinates
{
auto start = std::chrono::high_resolution_clock::now();
int cellX = std::floor(static_cast<float>(x) / (ESM::Land::LAND_SIZE - 1));
int cellY = std::floor(static_cast<float>(y) / (ESM::Land::LAND_SIZE - 1));
int localX = x - cellX * (ESM::Land::LAND_SIZE - 1);
int localY = y - cellY * (ESM::Land::LAND_SIZE - 1);
CSMWorld::CellCoordinates coords (cellX, cellY);
float landHeight = 0.f;
if (CSVRender::Cell* cell = dynamic_cast<CSVRender::Cell*>(mWorldspaceWidget->getCell(coords)))
{
landHeight = cell->getSumOfAlteredAndTrueHeight(cellX, cellY, localX, localY);
}
else if (isLandLoaded(CSMWorld::CellCoordinates::generateId(cellX, cellY)))
{
CSMDoc::Document& document = mWorldspaceWidget->getDocument();
CSMWorld::IdTable& landTable = dynamic_cast<CSMWorld::IdTable&> ( *document.getData().getTableModel (CSMWorld::UniversalId::Type_Land));
std::string cellId = CSMWorld::CellCoordinates::generateId(cellX, cellY);
int landshapeColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandHeightsIndex);
const CSMWorld::LandHeightsColumn::DataType mPointer = landTable.data(landTable.getModelIndex(cellId, landshapeColumn)).value<CSMWorld::LandHeightsColumn::DataType>();
auto stop = std::chrono::high_resolution_clock::now();
int duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start).count();
mDurationsA += duration;
mDurationsAMeasurements++;
return mPointer[localY*ESM::Land::LAND_SIZE + localX];
}
auto stop = std::chrono::high_resolution_clock::now();
int duration = std::chrono::duration_cast<std::chrono::microseconds>(stop - start).count();
mDurationsB += duration;
mDurationsBMeasurements++;
return landHeight;
}*/
void CSVRender::TerrainSelection::resetMeasurements()
{
mDurationsA = 0;
mDurationsB = 0;
mDurationsAMeasurements = 0;
mDurationsBMeasurements = 0;
}
void CSVRender::TerrainSelection::printMeasurements()
{
if (mDurationsAMeasurements != 0)
Log(Debug::Warning) << "A (total) " << mDurationsA << "(avg) " << mDurationsA / mDurationsAMeasurements << "(meas.) " << mDurationsAMeasurements;
if (mDurationsBMeasurements != 0)
Log(Debug::Warning) << "B (total) " << mDurationsB << "(avg) " << mDurationsB / mDurationsBMeasurements << "(meas.) " << mDurationsBMeasurements;
}

8
apps/opencs/view/render/terrainselection.hpp
View file

@ -64,10 +64,6 @@ namespace CSVRender
private: private:
void resetMeasurements();
void printMeasurements();
void handleSelection(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress, SelectionMethod selectionMethod); void handleSelection(const std::vector<std::pair<int, int>>& localPositions, bool toggleInProgress, SelectionMethod selectionMethod);
bool noCell(const std::string& cellId); bool noCell(const std::string& cellId);
@ -87,10 +83,6 @@ namespace CSVRender
std::vector<std::pair<int, int>> mTemporarySelection; // Used during toggle to compare the most recent drag operation std::vector<std::pair<int, int>> mTemporarySelection; // Used during toggle to compare the most recent drag operation
bool mDraggedOperationFlag; //true during drag operation, false when click-operation bool mDraggedOperationFlag; //true during drag operation, false when click-operation
TerrainSelectionType mSelectionType; TerrainSelectionType mSelectionType;
int mDurationsA;
int mDurationsB;
int mDurationsAMeasurements;
int mDurationsBMeasurements;
}; };
} }