OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- missed some MAX's.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-30 10:45:58 +02:00
commit 07a181090b
13 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/rendering/hwrenderer/doom_aabbtree.cpp
View file

@ -59,8 +59,8 @@ DoomLevelAABBTree::DoomLevelAABBTree(FLevelLocals *lev)
const auto &right = nodes[dynamicroot];
aabb_min.X = min(left.aabb_left, right.aabb_left);
aabb_min.Y = min(left.aabb_top, right.aabb_top);
aabb_max.X = MAX(left.aabb_right, right.aabb_right);
aabb_max.Y = MAX(left.aabb_bottom, right.aabb_bottom);
aabb_max.X = max(left.aabb_right, right.aabb_right);
aabb_max.Y = max(left.aabb_bottom, right.aabb_bottom);
nodes.Push({ aabb_min, aabb_max, staticroot, dynamicroot });
}
@ -138,9 +138,9 @@ bool DoomLevelAABBTree::Update()
int nodeIndex = path[0];
nodes[nodeIndex].aabb_left = min(x1, x2);
nodes[nodeIndex].aabb_right = MAX(x1, x2);
nodes[nodeIndex].aabb_right = max(x1, x2);
nodes[nodeIndex].aabb_top = min(y1, y2);
nodes[nodeIndex].aabb_bottom = MAX(y1, y2);
nodes[nodeIndex].aabb_bottom = max(y1, y2);
for (unsigned int j = 1; j < path.Size(); j++)
{
@ -149,8 +149,8 @@ bool DoomLevelAABBTree::Update()
const auto &right = nodes[cur.right_node];
cur.aabb_left = min(left.aabb_left, right.aabb_left);
cur.aabb_top = min(left.aabb_top, right.aabb_top);
cur.aabb_right = MAX(left.aabb_right, right.aabb_right);
cur.aabb_bottom = MAX(left.aabb_bottom, right.aabb_bottom);
cur.aabb_right = max(left.aabb_right, right.aabb_right);
cur.aabb_bottom = max(left.aabb_bottom, right.aabb_bottom);
}
treelines[i] = treeline;
@ -185,10 +185,10 @@ int DoomLevelAABBTree::GenerateTreeNode(int *lines, int num_lines, const FVector
aabb_min.X = min(aabb_min.X, x2);
aabb_min.Y = min(aabb_min.Y, y1);
aabb_min.Y = min(aabb_min.Y, y2);
aabb_max.X = MAX(aabb_max.X, x1);
aabb_max.X = MAX(aabb_max.X, x2);
aabb_max.Y = MAX(aabb_max.Y, y1);
aabb_max.Y = MAX(aabb_max.Y, y2);
aabb_max.X = max(aabb_max.X, x1);
aabb_max.X = max(aabb_max.X, x2);
aabb_max.Y = max(aabb_max.Y, y1);
aabb_max.Y = max(aabb_max.Y, y2);
median += centroids[mapLines[lines[i]]];
}