ofxAddons/ofxGPUFont
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

explicit std namespace

Browse source
This commit is contained in:
themancalledjakob 2024-03-16 13:20:36 +01:00
parent 02c5364f23
commit d482bb7cbd
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gpufont/font.hpp
View file

@ -1147,10 +1147,10 @@ class Font {
result.x2 = p2.x; result.x2 = p2.x;
result.y2 = p2.y; result.y2 = p2.y;
direction += getDirection(p0, p2); direction += getDirection(p0, p2);
bb.xMin = min(bb.xMin, min(p0.x, min(p1.x, p2.x))); bb.xMin = std::min(bb.xMin, std::min(p0.x, std::min(p1.x, p2.x)));
bb.xMax = max(bb.xMax, max(p0.x, max(p1.x, p2.x))); bb.xMax = std::max(bb.xMax, std::max(p0.x, std::max(p1.x, p2.x)));
bb.yMin = min(bb.yMin, min(p0.y, min(p1.y, p2.y))); bb.yMin = std::min(bb.yMin, std::min(p0.y, std::min(p1.y, p2.y)));
bb.yMax = max(bb.yMax, max(p0.y, max(p1.y, p2.y))); bb.yMax = std::max(bb.yMax, std::max(p0.y, std::max(p1.y, p2.y)));
return result; return result;
}; };
@ -1389,10 +1389,10 @@ class Font {
y0 += advanceY; y0 += advanceY;
y1 += advanceY; y1 += advanceY;
minX = min(x0, min(x1, minX)); minX = std::min(x0, std::min(x1, minX));
maxX = max(x0, max(x1, maxX)); maxX = std::max(x0, std::max(x1, maxX));
minY = min(y0, min(y1, minY)); minY = std::min(y0, std::min(y1, minY));
maxY = max(y0, max(y1, maxY)); maxY = std::max(y0, std::max(y1, maxY));
boundingBoxes.push_back({ boundingBoxes.push_back({
glm::vec4(x0, y0, 0, 1), glm::vec4(x0, y0, 0, 1),