R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use Vector3D for capsule and hemisphere radius.

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-07-11 20:45:14 +02:00
parent ffa9f12e2b
commit 27ff727949
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/engine/debugoverlay.cpp
View File

@ -219,7 +219,7 @@ void DrawOverlay(OverlayBase_t* pOverlay)
VectorAngles(pCapsule->end, pCapsule->start, angles);
AngleInverse(angles, angles);
DebugDrawCapsule(pCapsule->start, angles, 100, pCapsule->start.DistTo(pCapsule->end), Color(pCapsule->r, pCapsule->g, pCapsule->b, pCapsule->a), true);
DebugDrawCapsule(pCapsule->start, angles, pCapsule->radius, pCapsule->start.DistTo(pCapsule->end), Color(pCapsule->r, pCapsule->g, pCapsule->b, pCapsule->a), true);
break;
}
case OverlayType_t::OVERLAY_UNK0:

18
r5dev/tier2/renderutils.cpp
View File

@ -109,7 +109,7 @@ void DebugDrawCylinder(const Vector3D& vOrigin, const QAngle& vAngles, float flR
// |----|----|
// "-..|..-" --> +x
//-----------------------------------------------------------------------------
void DebugDrawCapsule(const Vector3D& vStart, const QAngle& vAngles, float flRadius, float flHeight, Color color, bool bZBuffer)
void DebugDrawCapsule(const Vector3D& vStart, const QAngle& vAngles, const Vector3D& vRadius, float flHeight, Color color, bool bZBuffer)
{
int nSides = 4;
float flDegrees = 360.0 / float(nSides);
@ -124,7 +124,7 @@ void DebugDrawCapsule(const Vector3D& vStart, const QAngle& vAngles, float flRad
{
AngleCompose(vAngles, { 0, flDegrees * i, 0 }, vComposed);
AngleVectors(vComposed, &vForward);
vvPoints.push_back(vStart + (vForward * flRadius));
vvPoints.push_back(vStart + (vForward * vRadius));
}
for (int i = 0; i < nSides; i++)
@ -135,8 +135,8 @@ void DebugDrawCapsule(const Vector3D& vStart, const QAngle& vAngles, float flRad
AngleCompose(vAngles, { 180, 180, 0 }, vHemi);
DebugDrawHemiSphere(vStart + (vUp * flHeight), vAngles, flRadius, color, 16, bZBuffer);
DebugDrawHemiSphere(vStart, vHemi, flRadius, color, 16, bZBuffer);
DebugDrawHemiSphere(vStart + (vUp * flHeight), vAngles, vRadius, color, 16, bZBuffer);
DebugDrawHemiSphere(vStart, vHemi, vRadius, color, 16, bZBuffer);
}
//-----------------------------------------------------------------------------
@ -171,7 +171,7 @@ void DebugDrawSphere(const Vector3D& vOrigin, float flRadius, Color color, int n
// / | \ /--> +r
// | <----( )---->-|/ --> +x
//-----------------------------------------------------------------------------
void DebugDrawHemiSphere(const Vector3D& vOrigin, const QAngle& vAngles, float flRadius, Color color, int nSegments, bool bZBuffer)
void DebugDrawHemiSphere(const Vector3D& vOrigin, const QAngle& vAngles, const Vector3D& vRadius, Color color, int nSegments, bool bZBuffer)
{
bool bFirstLoop = true;
@ -194,10 +194,10 @@ void DebugDrawHemiSphere(const Vector3D& vOrigin, const QAngle& vAngles, float f
AngleVectors(vComposed[2], &vForward[2]);
AngleVectors(vComposed[3], &vForward[3]);
vEnd[0] = vOrigin + (vForward[0] * flRadius);
vEnd[1] = vOrigin + (vForward[1] * flRadius);
vEnd[2] = vOrigin + (vForward[2] * flRadius);
vEnd[3] = vOrigin + (vForward[3] * flRadius);
vEnd[0] = vOrigin + (vForward[0] * vRadius);
vEnd[1] = vOrigin + (vForward[1] * vRadius);
vEnd[2] = vOrigin + (vForward[2] * vRadius);
vEnd[3] = vOrigin + (vForward[3] * vRadius);
if (!bFirstLoop)
{

4
r5dev/tier2/renderutils.h
View File

@ -4,9 +4,9 @@
void DebugDrawBox(const Vector3D& vOrigin, const QAngle& vAngles, const Vector3D& vMins, const Vector3D& vMaxs, Color color, bool bZBuffer);
void DebugDrawCylinder(const Vector3D& vOrigin, const QAngle& vAngles, float flRadius, float flHeight, Color color, int nSides = 16, bool bZBuffer = false);
void DebugDrawCapsule(const Vector3D& vStart, const QAngle& vAngles, float flRadius, float flHeight, Color color, bool bZBuffer = false);
void DebugDrawCapsule(const Vector3D& vStart, const QAngle& vAngles, const Vector3D& vRadius, float flHeight, Color color, bool bZBuffer = false);
void DebugDrawSphere(const Vector3D& vOrigin, float flRadius, Color color, int nSegments = 16, bool bZBuffer = false);
void DebugDrawHemiSphere(const Vector3D& vOrigin, const QAngle& vAngles, float flRadius, Color color, int nSegments = 16, bool bZBuffer = false);
void DebugDrawHemiSphere(const Vector3D& vOrigin, const QAngle& vAngles, const Vector3D& vRadius, Color color, int nSegments = 16, bool bZBuffer = false);
void DebugDrawCircle(const Vector3D& vOrigin, const QAngle& vAngles, float flRadius, Color color, int nSegments = 16, bool bZBuffer = false);
void DebugDrawSquare(const Vector3D& vOrigin, const QAngle& vAngles, float flSquareSize, Color color, bool bZBuffer = false);
void DebugDrawTriangle(const Vector3D& vOrigin, const QAngle& vAngles, float flTriangleSize, Color color, bool bZBuffer = false);