Persson-dev/Tower-Defense
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

refactor: cpp style casts

Browse Source
This commit is contained in:
Simon Pribylski
2022-04-27 19:25:36 +02:00
parent d3edc0cb6c
commit d5b42caf39
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/render/loader/WorldLoader.cpp
View File

@@ -69,14 +69,14 @@ GL::VertexArray LoadWorldModel(const td::game::World* world) {
continue;
positions.insert(positions.end(), {
(float)chunkX + tileX, (float)chunkY + tileY,
(float)chunkX + tileX + 1, (float)chunkY + tileY,
(float)chunkX + tileX, (float)chunkY + tileY + 1,
static_cast<float>(chunkX + tileX), static_cast<float>(chunkY + tileY),
static_cast<float>(chunkX + tileX + 1), static_cast<float>(chunkY + tileY),
static_cast<float>(chunkX + tileX), static_cast<float>(chunkY + tileY + 1),
(float)chunkX + tileX + 1, (float)chunkY + tileY,
(float)chunkX + tileX, (float)chunkY + tileY + 1,
(float)chunkX + tileX + 1, (float)chunkY + tileY + 1,
});
static_cast<float>(chunkX + tileX + 1), static_cast<float>(chunkY + tileY),
static_cast<float>(chunkX + tileX), static_cast<float>(chunkY + tileY + 1),
static_cast<float>(chunkX + tileX + 1), static_cast<float>(chunkY + tileY + 1),
});
const td::game::Color* tileColor = world->GetTileColor(tile);
@@ -178,7 +178,7 @@ GL::VertexArray LoadTileSelectModel() {
int color = 255 << 24 | 255 << 16 | 255 << 8 | 150;
float colorFloat;
memcpy((std::uint8_t*)&colorFloat, &color, sizeof(float));
memcpy(reinterpret_cast<std::uint8_t*>(&colorFloat), &color, sizeof(float));
std::vector<float> colors(6, colorFloat);