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

Fix Smart Pistol's trajectory trace (laser line)

Browse Source 
The smart pistol's laser line overlay did not draw after the debug overlay rebuild. After some small debugging, I found out that there was a function that creates the curved trace, and creates an overlay with index 4 (originally swept_box), however, the structure is different to that of swept_box. This is laser_line. Implemented logic for drawing out laser line, which essentially just calls DrawLine (as is the case in the engine).
This commit is contained in:
Kawe Mazidjatari 2022-10-30 23:38:19 +01:00
parent 3ea5ec1d5e
commit 2a86970f12
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
r5dev/engine/debugoverlay.cpp
View File

@ -85,7 +85,7 @@ void DestroyOverlay(OverlayBase_t* pOverlay)
case OverlayType_t::OVERLAY_TRIANGLE:
pOverlaySize = 6200i64;
goto LABEL_MALLOC;
case OverlayType_t::OVERLAY_SWEPT_BOX:
case OverlayType_t::OVERLAY_LASER_LINE:
pOverlay->m_Type = OverlayType_t::OVERLAY_UNK1;
LeaveCriticalSection(&*s_OverlayMutex);
return;
@ -189,9 +189,10 @@ void DrawOverlay(OverlayBase_t* pOverlay)
//printf("TRIANGLE %p\n", pOverlay);
break;
}
case OverlayType_t::OVERLAY_SWEPT_BOX:
case OverlayType_t::OVERLAY_LASER_LINE:
{
//printf("SBOX %p\n", pOverlay);
OverlayLaserLine_t* pLaser = static_cast<OverlayLaserLine_t*>(pOverlay);
v_RenderLine(pLaser->start, pLaser->end, Color(pLaser->r, pLaser->g, pLaser->b, pLaser->a), !pLaser->noDepthTest);
break;
}
case OverlayType_t::OVERLAY_BOX2:

36
r5dev/engine/debugoverlay.h
View File

@ -26,7 +26,7 @@ enum class OverlayType_t
OVERLAY_SPHERE,
OVERLAY_LINE,
OVERLAY_TRIANGLE,
OVERLAY_SWEPT_BOX,
OVERLAY_LASER_LINE,
OVERLAY_BOX2,
OVERLAY_CAPSULE,
OVERLAY_UNK0,
@ -55,19 +55,6 @@ struct OverlayBase_t
int m_nFlags{}; // Maybe
};
struct OverlayLine_t : public OverlayBase_t
{
OverlayLine_t(void) { m_Type = OverlayType_t::OVERLAY_LINE; }
Vector3D origin{};
Vector3D dest{};
int r{};
int g{};
int b{};
int a{};
bool noDepthTest{};
};
struct OverlayBox_t : public OverlayBase_t
{
OverlayBox_t(void) { m_Type = OverlayType_t::OVERLAY_BOX; }
@ -111,6 +98,19 @@ struct OverlaySphere_t : public OverlayBase_t
int a{};
};
struct OverlayLine_t : public OverlayBase_t
{
OverlayLine_t(void) { m_Type = OverlayType_t::OVERLAY_LINE; }
Vector3D origin{};
Vector3D dest{};
int r{};
int g{};
int b{};
int a{};
bool noDepthTest{};
};
struct OverlayTriangle_t : public OverlayBase_t
{
OverlayTriangle_t() { m_Type = OverlayType_t::OVERLAY_TRIANGLE; }
@ -125,19 +125,17 @@ struct OverlayTriangle_t : public OverlayBase_t
bool noDepthTest;
};
struct OverlaySweptBox_t : public OverlayBase_t
struct OverlayLaserLine_t : public OverlayBase_t
{
OverlaySweptBox_t() { m_Type = OverlayType_t::OVERLAY_SWEPT_BOX; }
OverlayLaserLine_t() { m_Type = OverlayType_t::OVERLAY_LASER_LINE; }
Vector3D start;
Vector3D end;
Vector3D mins;
Vector3D maxs;
QAngle angles;
int r;
int g;
int b;
int a;
bool noDepthTest;
};
struct OverlayCapsule_t : public OverlayBase_t