Merge remote-tracking branch 'upstream/master'

1 files changed, 51 insertions, 51 deletions

diff --git a/mp/src/game/shared/debugoverlay_shared.h b/mp/src/game/shared/debugoverlay_shared.h
index 89c1c422..a37a1b9e 100644
--- a/mp/src/game/shared/debugoverlay_shared.h
+++ b/mp/src/game/shared/debugoverlay_shared.h
@@ -1,51 +1,51 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//

-//

-// Purpose: 

-//

-//=============================================================================//

-

-#ifndef DEBUGOVERLAY_SHARED_H

-#define DEBUGOVERLAY_SHARED_H

-#ifdef _WIN32

-#pragma once

-#endif

-

-#include "engine/ivdebugoverlay.h"

-#include "mathlib/vector.h"

-

-//=============================================================================

-// NDebugOverlay

-//=============================================================================

-namespace NDebugOverlay

-{

-	void	Box(const Vector &origin, const Vector &mins, const Vector &maxs, int r, int g, int b, int a, float flDuration);

-	void	BoxDirection(const Vector &origin, const Vector &mins, const Vector &maxs, const Vector &forward, int r, int g, int b, int a, float flDuration);

-	void	BoxAngles(const Vector &origin, const Vector &mins, const Vector &maxs, const QAngle &angles, int r, int g, int b, int a, float flDuration);

-	void	SweptBox(const Vector& start, const Vector& end, const Vector& mins, const Vector& maxs, const QAngle & angles, int r, int g, int b, int a, float flDuration);

-	void	EntityBounds( const CBaseEntity *pEntity, int r, int g, int b, int a, float flDuration );

-	void	Line( const Vector &origin, const Vector &target, int r, int g, int b, bool noDepthTest, float flDuration );

-	void	Triangle( const Vector &p1, const Vector &p2, const Vector &p3, int r, int g, int b, int a, bool noDepthTest, float duration );

-	void	EntityText( int entityID, int text_offset, const char *text, float flDuration, int r = 255, int g = 255, int b = 255, int a = 255);

-	void	EntityTextAtPosition( const Vector &origin, int text_offset, const char *text, float flDuration, int r = 255, int g = 255, int b = 255, int a = 255);

-	void	Grid( const Vector &vPosition );

-	void	Text( const Vector &origin, const char *text, bool bViewCheck, float flDuration );

-	void	ScreenText( float fXpos, float fYpos, const char *text, int r, int g, int b, int a, float flDuration);

-	void	Cross3D(const Vector &position, const Vector &mins, const Vector &maxs, int r, int g, int b, bool noDepthTest, float flDuration );

-	void	Cross3D(const Vector &position, float size, int r, int g, int b, bool noDepthTest, float flDuration );

-	void	Cross3DOriented( const Vector &position, const QAngle &angles, float size, int r, int g, int b, bool noDepthTest, float flDuration );

-	void	Cross3DOriented( const matrix3x4_t &m, float size, int c, bool noDepthTest, float flDuration );

-	void	DrawOverlayLines(void);

-	void	DrawTickMarkedLine(const Vector &startPos, const Vector &endPos, float tickDist, int tickTextDist, int r, int g, int b, bool noDepthTest, float flDuration );

-	void	DrawGroundCrossHairOverlay();

-	void	HorzArrow( const Vector &startPos, const Vector &endPos, float width, int r, int g, int b, int a, bool noDepthTest, float flDuration);

-	void	YawArrow( const Vector &startPos, float yaw, float length, float width, int r, int g, int b, int a, bool noDepthTest, float flDuration);

-	void	VertArrow( const Vector &startPos, const Vector &endPos, float width, int r, int g, int b, int a, bool noDepthTest, float flDuration);

-	void	Axis( const Vector &position, const QAngle &angles, float size, bool noDepthTest, float flDuration );

-	void	Sphere( const Vector &center, float radius, int r, int g, int b, bool noDepthTest, float flDuration );

-	void	Circle( const Vector &position, float radius, int r, int g, int b, int a, bool bNoDepthTest, float flDuration );

-	void	Circle( const Vector &position, const QAngle &angles, float radius, int r, int g, int b, int a, bool bNoDepthTest, float flDuration );

-	void	Circle( const Vector &position, const Vector &xAxis, const Vector &yAxis, float radius, int r, int g, int b, int a, bool bNoDepthTest, float flDuration );

-	void	Sphere( const Vector &position, const QAngle &angles, float radius, int r, int g, int b, int a, bool bNoDepthTest, float flDuration );

-};

-

-#endif // DEBUGOVERLAY_SHARED_H

+//========= Copyright Valve Corporation, All rights reserved. ============//
+//
+// Purpose: 
+//
+//=============================================================================//
+
+#ifndef DEBUGOVERLAY_SHARED_H
+#define DEBUGOVERLAY_SHARED_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+#include "engine/ivdebugoverlay.h"
+#include "mathlib/vector.h"
+
+//=============================================================================
+// NDebugOverlay
+//=============================================================================
+namespace NDebugOverlay
+{
+	void	Box(const Vector &origin, const Vector &mins, const Vector &maxs, int r, int g, int b, int a, float flDuration);
+	void	BoxDirection(const Vector &origin, const Vector &mins, const Vector &maxs, const Vector &forward, int r, int g, int b, int a, float flDuration);
+	void	BoxAngles(const Vector &origin, const Vector &mins, const Vector &maxs, const QAngle &angles, int r, int g, int b, int a, float flDuration);
+	void	SweptBox(const Vector& start, const Vector& end, const Vector& mins, const Vector& maxs, const QAngle & angles, int r, int g, int b, int a, float flDuration);
+	void	EntityBounds( const CBaseEntity *pEntity, int r, int g, int b, int a, float flDuration );
+	void	Line( const Vector &origin, const Vector &target, int r, int g, int b, bool noDepthTest, float flDuration );
+	void	Triangle( const Vector &p1, const Vector &p2, const Vector &p3, int r, int g, int b, int a, bool noDepthTest, float duration );
+	void	EntityText( int entityID, int text_offset, const char *text, float flDuration, int r = 255, int g = 255, int b = 255, int a = 255);
+	void	EntityTextAtPosition( const Vector &origin, int text_offset, const char *text, float flDuration, int r = 255, int g = 255, int b = 255, int a = 255);
+	void	Grid( const Vector &vPosition );
+	void	Text( const Vector &origin, const char *text, bool bViewCheck, float flDuration );
+	void	ScreenText( float fXpos, float fYpos, const char *text, int r, int g, int b, int a, float flDuration);
+	void	Cross3D(const Vector &position, const Vector &mins, const Vector &maxs, int r, int g, int b, bool noDepthTest, float flDuration );
+	void	Cross3D(const Vector &position, float size, int r, int g, int b, bool noDepthTest, float flDuration );
+	void	Cross3DOriented( const Vector &position, const QAngle &angles, float size, int r, int g, int b, bool noDepthTest, float flDuration );
+	void	Cross3DOriented( const matrix3x4_t &m, float size, int c, bool noDepthTest, float flDuration );
+	void	DrawOverlayLines(void);
+	void	DrawTickMarkedLine(const Vector &startPos, const Vector &endPos, float tickDist, int tickTextDist, int r, int g, int b, bool noDepthTest, float flDuration );
+	void	DrawGroundCrossHairOverlay();
+	void	HorzArrow( const Vector &startPos, const Vector &endPos, float width, int r, int g, int b, int a, bool noDepthTest, float flDuration);
+	void	YawArrow( const Vector &startPos, float yaw, float length, float width, int r, int g, int b, int a, bool noDepthTest, float flDuration);
+	void	VertArrow( const Vector &startPos, const Vector &endPos, float width, int r, int g, int b, int a, bool noDepthTest, float flDuration);
+	void	Axis( const Vector &position, const QAngle &angles, float size, bool noDepthTest, float flDuration );
+	void	Sphere( const Vector &center, float radius, int r, int g, int b, bool noDepthTest, float flDuration );
+	void	Circle( const Vector &position, float radius, int r, int g, int b, int a, bool bNoDepthTest, float flDuration );
+	void	Circle( const Vector &position, const QAngle &angles, float radius, int r, int g, int b, int a, bool bNoDepthTest, float flDuration );
+	void	Circle( const Vector &position, const Vector &xAxis, const Vector &yAxis, float radius, int r, int g, int b, int a, bool bNoDepthTest, float flDuration );
+	void	Sphere( const Vector &position, const QAngle &angles, float radius, int r, int g, int b, int a, bool bNoDepthTest, float flDuration );
+};
+
+#endif // DEBUGOVERLAY_SHARED_H