Skip to content

Commit f43661b

Browse files
committed
maybe fix meson CI? (missing some headers for building without pch)
1 parent 6d4ba38 commit f43661b

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

Source/Entities/SceneLayer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,8 @@ void SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::UpdateTargetRegion(const Bo
437437
float destY = scaledTarget.GetCorner().GetFloorIntY() + tiledOffsetY - scaledOffset.GetFloorIntY();
438438
Box update = bitmapDimensions.GetIntersection({-Vector(destX, destY), scaledTarget.m_Width, scaledTarget.m_Height});
439439
update.m_Corner = update.m_Corner.GetFloored();
440-
update.m_Width = std::ceilf(update.m_Width) + 1;
441-
update.m_Height = std::ceilf(update.m_Height) + 1;
440+
update.m_Width = std::ceil(update.m_Width) + 1;
441+
update.m_Height = std::ceil(update.m_Height) + 1;
442442
updateRegions.emplace_back(update);
443443
if (!m_WrapY) {
444444
break;

Source/Entities/TerrainObject.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include "SceneObject.h"
44
#include "ContentFile.h"
5+
#include <algorithm>
56

67
namespace RTE {
78

Source/Managers/SettingsMan.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include <list>
77
#include <cmath>
8+
#include <algorithm>
89

910
#define g_SettingsMan SettingsMan::Instance()
1011

Source/Renderer/BigTexture.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@ void BigTexture::Update(const Box& updateRegion) {
9393
for (int i = 0; i < m_Regions.size(); ++i) {
9494
Box intersect = updateRegion.GetIntersection(m_Regions[i]);
9595
if (!intersect.IsEmpty()) {
96-
std::vector<unsigned char> pixels(std::ceilf(intersect.m_Width) * std::ceilf(intersect.m_Height) * bytesPerPixel);
97-
for (size_t y = 0; y < static_cast<int>(std::ceilf(intersect.m_Height)); y++) {
96+
std::vector<unsigned char> pixels(std::ceil(intersect.m_Width) * std::ceil(intersect.m_Height) * bytesPerPixel);
97+
for (size_t y = 0; y < static_cast<int>(std::ceil(intersect.m_Height)); y++) {
9898
memcpy(
9999
pixels.data() + y * static_cast<int>(intersect.m_Width) * bytesPerPixel,
100100
m_Bitmap->line[y + intersect.m_Corner.GetFloorIntY()] + intersect.m_Corner.GetFloorIntX(),
101-
std::ceilf(intersect.m_Width) * bytesPerPixel
101+
std::ceil(intersect.m_Width) * bytesPerPixel
102102
);
103103
}
104104

@@ -108,8 +108,8 @@ void BigTexture::Update(const Box& updateRegion) {
108108
0,
109109
intersect.m_Corner.GetFloorIntX() % s_MaxGLTextureSize,
110110
intersect.m_Corner.GetFloorIntY() % s_MaxGLTextureSize,
111-
std::ceilf(intersect.m_Width),
112-
std::ceilf(intersect.m_Height),
111+
std::ceil(intersect.m_Width),
112+
std::ceil(intersect.m_Height),
113113
bytesPerPixel == 1 ? GL_RED : GL_RGBA,
114114
GL_UNSIGNED_BYTE,
115115
pixels.data()

Source/System/Color.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

33
#include "Serializable.h"
4+
#include <algorithm>
45

56
namespace RTE {
67

0 commit comments

Comments
 (0)