mirrors/0ad
1
0 Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-11-09 01:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove u16

Browse Source 
It's better to use types from the standard library.
This commit is contained in:
phosit committed 2026-09-21 18:11:22 +02:00
1 parent 00ee825374
commit 500606e587
110 files changed
+848 -818
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

source/graphics/MiniMapTexture.cpp
+10 -10
View File
@@ -232,7 +232,7 @@ CMiniMapTexture::CMiniMapTexture(Renderer::Backend::IDevice* device, CSimulation
m_IndexArray.SetNumberOfVertices(MAX_ENTITIES_DRAWN * 6);
m_IndexArray.Layout();
VertexArrayIterator<u16> index = m_IndexArray.GetIterator();
VertexArrayIterator<std::uint16_t> index = m_IndexArray.GetIterator();
for (size_t i = 0; i < m_IndexArray.GetNumberOfVertices(); ++i)
*index++ = 0;
m_IndexArray.Upload();
@@ -709,9 +709,9 @@ void CMiniMapTexture::UpdateAndUploadEntities(
const CellIconKey key{
cmpMinimap->GetIconPath(), v.r, v.g, v.b};
const u16 gridX = Clamp<u16>(
const std::uint16_t gridX = Clamp<std::uint16_t>(
(v.position.X * invTileMapSize) * ICON_COMBINING_GRID_SIZE, 0, ICON_COMBINING_GRID_SIZE - 1);
const u16 gridY = Clamp<u16>(
const std::uint16_t gridY = Clamp<std::uint16_t>(
(v.position.Y * invTileMapSize) * ICON_COMBINING_GRID_SIZE, 0, ICON_COMBINING_GRID_SIZE - 1);
CellIcon icon{
gridX, gridY, cmpMinimap->GetIconSize() * iconsSizeScale * 0.5f, v.position};
@@ -798,15 +798,15 @@ void CMiniMapTexture::UpdateAndUploadEntities(
if (!m_UseInstancing)
{
VertexArrayIterator<u16> index = m_IndexArray.GetIterator();
VertexArrayIterator<std::uint16_t> index = m_IndexArray.GetIterator();
for (size_t entityIndex = 0; entityIndex < m_EntitiesDrawn; ++entityIndex)
{
index[entityIndex * 6 + 0] = static_cast<u16>(entityIndex * 4 + 0);
index[entityIndex * 6 + 1] = static_cast<u16>(entityIndex * 4 + 1);
index[entityIndex * 6 + 2] = static_cast<u16>(entityIndex * 4 + 2);
index[entityIndex * 6 + 3] = static_cast<u16>(entityIndex * 4 + 0);
index[entityIndex * 6 + 4] = static_cast<u16>(entityIndex * 4 + 2);
index[entityIndex * 6 + 5] = static_cast<u16>(entityIndex * 4 + 3);
index[entityIndex * 6 + 0] = static_cast<std::uint16_t>(entityIndex * 4 + 0);
index[entityIndex * 6 + 1] = static_cast<std::uint16_t>(entityIndex * 4 + 1);
index[entityIndex * 6 + 2] = static_cast<std::uint16_t>(entityIndex * 4 + 2);
index[entityIndex * 6 + 3] = static_cast<std::uint16_t>(entityIndex * 4 + 0);
index[entityIndex * 6 + 4] = static_cast<std::uint16_t>(entityIndex * 4 + 2);
index[entityIndex * 6 + 5] = static_cast<std::uint16_t>(entityIndex * 4 + 3);
}
m_IndexArray.Upload();