immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored Math::IntPoint in CTerrain

dev
Tomasz Kapuściński 2021-12-23 22:47:44 +01:00
parent bd2ad39f6a
commit 835f84584e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/graphics/engine/terrain.cpp
View File

@ -237,7 +237,7 @@ bool CTerrain::LoadResources(const std::string& fileName)
{ {
for (int y = 0; y < size; ++y) for (int y = 0; y < size; ++y)
{ {
Gfx::IntColor pixel = img.GetPixelInt(Math::IntPoint(x, size - y - 1)); Gfx::IntColor pixel = img.GetPixelInt({ x, size - y - 1 });
TerrainRes res = TR_NULL; TerrainRes res = TR_NULL;
for (const auto& it : RESOURCE_PALETTE) for (const auto& it : RESOURCE_PALETTE)
@ -324,7 +324,7 @@ bool CTerrain::LoadRelief(const std::string &fileName, float scaleRelief,
{ {
for (int x = 0; x < size; x++) for (int x = 0; x < size; x++)
{ {
Gfx::IntColor color = img.GetPixelInt(Math::IntPoint(x, size - y - 1)); Gfx::IntColor color = img.GetPixelInt({ x, size - y - 1 });
float avg = (color.r + color.g + color.b) / 3.0f; // to be sure it is grayscale float avg = (color.r + color.g + color.b) / 3.0f; // to be sure it is grayscale
float level = (255.0f - avg) * scaleRelief; float level = (255.0f - avg) * scaleRelief;
@ -1285,7 +1285,7 @@ bool CTerrain::Terraform(const Math::Vector &p1, const Math::Vector &p2, float h
{ {
float dim = (m_mosaicCount*m_brickCount*m_brickSize)/2.0f; float dim = (m_mosaicCount*m_brickCount*m_brickSize)/2.0f;
Math::IntPoint tp1, tp2; glm::ivec2 tp1, tp2;
tp1.x = static_cast<int>((p1.x+dim+m_brickSize/2.0f)/m_brickSize); tp1.x = static_cast<int>((p1.x+dim+m_brickSize/2.0f)/m_brickSize);
tp1.y = static_cast<int>((p1.z+dim+m_brickSize/2.0f)/m_brickSize); tp1.y = static_cast<int>((p1.z+dim+m_brickSize/2.0f)/m_brickSize);
tp2.x = static_cast<int>((p2.x+dim+m_brickSize/2.0f)/m_brickSize); tp2.x = static_cast<int>((p2.x+dim+m_brickSize/2.0f)/m_brickSize);
@ -1342,7 +1342,7 @@ bool CTerrain::Terraform(const Math::Vector &p1, const Math::Vector &p2, float h
} }
AdjustRelief(); AdjustRelief();
Math::IntPoint pp1, pp2; glm::ivec2 pp1, pp2;
pp1.x = (tp1.x-2)/m_brickCount; pp1.x = (tp1.x-2)/m_brickCount;
pp1.y = (tp1.y-2)/m_brickCount; pp1.y = (tp1.y-2)/m_brickCount;
pp2.x = (tp2.x+1)/m_brickCount; pp2.x = (tp2.x+1)/m_brickCount;