OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Use std::min and std::max

Browse Source
This commit is contained in:
Michael Hansen
2014-07-22 21:12:09 -07:00
parent 4f5a941d41
commit e36220cca5
35 changed files with 101 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/Tools/MaxConvert/plDistributor.cpp
View File

@ -501,16 +501,16 @@ bool plDistributor::IFailsProbBitmap(int iFace, const Point3& bary) const
break;
case kMax:
case kMaxColor:
frac = hsMaximum(evCol.r, hsMaximum(evCol.g, evCol.b));
frac = std::max({ evCol.r, evCol.g, evCol.b });
break;
case kMaxColorTimesAlpha:
frac = hsMaximum(evCol.r, hsMaximum(evCol.g, evCol.b)) * evCol.a;
frac = std::max({ evCol.r, evCol.g, evCol.b }) * evCol.a;
break;
case kMaxRedGreen:
frac = hsMaximum(evCol.r, evCol.g);
frac = std::max(evCol.r, evCol.g);
break;
case kMaxRedGreenTimesAlpha:
frac = hsMaximum(evCol.r, evCol.g) * evCol.a;
frac = std::max(evCol.r, evCol.g) * evCol.a;
break;
}

12
Sources/Tools/MaxMain/plMaxMeshExtractor.cpp
View File

@ -83,12 +83,12 @@ static void MeshMinMax(hsPoint3& min, hsPoint3& max, int numVerts, hsPoint3* pVe
for (int i = 0; i < numVerts; i++)
{
hsPoint3* vert = &pVerts[i];
min.fX = hsMinimum(vert->fX, min.fX);
min.fY = hsMinimum(vert->fY, min.fY);
min.fZ = hsMinimum(vert->fZ, min.fZ);
max.fX = hsMaximum(vert->fX, max.fX);
max.fY = hsMaximum(vert->fY, max.fY);
max.fZ = hsMaximum(vert->fZ, max.fZ);
min.fX = std::min(vert->fX, min.fX);
min.fY = std::min(vert->fY, min.fY);
min.fZ = std::min(vert->fZ, min.fZ);
max.fX = std::max(vert->fX, max.fX);
max.fY = std::max(vert->fY, max.fY);
max.fZ = std::max(vert->fZ, max.fZ);
}
}

26
Sources/Tools/MaxMain/plMaxNode.cpp
View File

@ -699,12 +699,12 @@ bool plMaxNode::MakePhysical(plErrorMsg *pErrMsg, plConvertSettings *settings)
hsPoint3 minV(FLT_MAX, FLT_MAX, FLT_MAX), maxV(-FLT_MAX, -FLT_MAX, -FLT_MAX);
for (int i = 0; i < mesh.fNumVerts; i++)
{
minV.fX = hsMinimum(mesh.fVerts[i].fX, minV.fX);
minV.fY = hsMinimum(mesh.fVerts[i].fY, minV.fY);
minV.fZ = hsMinimum(mesh.fVerts[i].fZ, minV.fZ);
maxV.fX = hsMaximum(mesh.fVerts[i].fX, maxV.fX);
maxV.fY = hsMaximum(mesh.fVerts[i].fY, maxV.fY);
maxV.fZ = hsMaximum(mesh.fVerts[i].fZ, maxV.fZ);
minV.fX = std::min(mesh.fVerts[i].fX, minV.fX);
minV.fY = std::min(mesh.fVerts[i].fY, minV.fY);
minV.fZ = std::min(mesh.fVerts[i].fZ, minV.fZ);
maxV.fX = std::max(mesh.fVerts[i].fX, maxV.fX);
maxV.fY = std::max(mesh.fVerts[i].fY, maxV.fY);
maxV.fZ = std::max(mesh.fVerts[i].fZ, maxV.fZ);
}
hsPoint3 width = maxV - minV;
recipe.bDimensions = width / 2;
@ -770,15 +770,15 @@ bool plMaxNode::MakePhysical(plErrorMsg *pErrMsg, plConvertSettings *settings)
hsPoint3 minV(FLT_MAX, FLT_MAX, FLT_MAX), maxV(-FLT_MAX, -FLT_MAX, -FLT_MAX);
for (int i = 0; i < mesh.fNumVerts; i++)
{
minV.fX = hsMinimum(mesh.fVerts[i].fX, minV.fX);
minV.fY = hsMinimum(mesh.fVerts[i].fY, minV.fY);
minV.fZ = hsMinimum(mesh.fVerts[i].fZ, minV.fZ);
maxV.fX = hsMaximum(mesh.fVerts[i].fX, maxV.fX);
maxV.fY = hsMaximum(mesh.fVerts[i].fY, maxV.fY);
maxV.fZ = hsMaximum(mesh.fVerts[i].fZ, maxV.fZ);
minV.fX = std::min(mesh.fVerts[i].fX, minV.fX);
minV.fY = std::min(mesh.fVerts[i].fY, minV.fY);
minV.fZ = std::min(mesh.fVerts[i].fZ, minV.fZ);
maxV.fX = std::max(mesh.fVerts[i].fX, maxV.fX);
maxV.fY = std::max(mesh.fVerts[i].fY, maxV.fY);
maxV.fZ = std::max(mesh.fVerts[i].fZ, maxV.fZ);
}
hsPoint3 width = maxV - minV;
recipe.radius = hsMaximum(width.fX, hsMaximum(width.fY, width.fZ));
recipe.radius = std::max({ width.fX, width.fY, width.fZ });
recipe.radius /= 2.f;
recipe.offset = minV + (width / 2.f);
}

24
Sources/Tools/MaxMain/plPhysXCooking.cpp
View File

@ -304,12 +304,12 @@ void ReadBoxFromHull(hsStream* stream, NxBoxShapeDesc& box)
for (int i = 0; i < nVertices; i++)
{
hsPoint3& vec = pVertices[i];
minX = hsMinimum(minX, vec.fX);
minY = hsMinimum(minY, vec.fY);
minZ = hsMinimum(minZ, vec.fZ);
maxX = hsMaximum(maxX, vec.fX);
maxY = hsMaximum(maxY, vec.fY);
maxZ = hsMaximum(maxZ, vec.fZ);
minX = std::min(minX, vec.fX);
minY = std::min(minY, vec.fY);
minZ = std::min(minZ, vec.fZ);
maxX = std::max(maxX, vec.fX);
maxY = std::max(maxY, vec.fY);
maxZ = std::max(maxZ, vec.fZ);
}
delete[] pVertices;
@ -453,12 +453,12 @@ hsVectorStream* plPhysXCooking::IMakePolytope(const plMaxMeshExtractor::NeutralM
}
for(int i=0;i<inMesh.fNumVerts;i++)
{
AABBMin.fX = hsMinimum(nxLocs2[i].x, AABBMin.fX);
AABBMin.fY = hsMinimum(nxLocs2[i].y, AABBMin.fY);
AABBMin.fZ = hsMinimum(nxLocs2[i].z, AABBMin.fZ);
AABBMax.fX = hsMaximum(nxLocs2[i].x, AABBMax.fX);
AABBMax.fY = hsMaximum(nxLocs2[i].y, AABBMax.fY);
AABBMax.fZ = hsMaximum(nxLocs2[i].z, AABBMax.fZ);
AABBMin.fX = std::min(nxLocs2[i].x, AABBMin.fX);
AABBMin.fY = std::min(nxLocs2[i].y, AABBMin.fY);
AABBMin.fZ = std::min(nxLocs2[i].z, AABBMin.fZ);
AABBMax.fX = std::max(nxLocs2[i].x, AABBMax.fX);
AABBMax.fY = std::max(nxLocs2[i].y, AABBMax.fY);
AABBMax.fZ = std::max(nxLocs2[i].z, AABBMax.fZ);
}
int resultingPoints=0;

2
Sources/Tools/MaxPlasmaLights/plRealTimeLights.cpp
View File

@ -315,7 +315,7 @@ int SpotLight::Update(TimeValue t, const RendContext &rc, RenderGlobalContext *r
decayRadius = gl->GetDecayRadius(t);
projector = gl->GetProjector();
fov = hsMaximum(fs,hs);
fov = std::max(fs, hs);
float aspect = 1.0f;