diff options
| author | Narendra Umate <[email protected]> | 2013-12-02 23:36:05 -0800 |
|---|---|---|
| committer | Narendra Umate <[email protected]> | 2013-12-02 23:36:05 -0800 |
| commit | 8737f191f3b59f001a77bf6c08091109211c1c9f (patch) | |
| tree | dbbf05c004d9b026f2c1f23f06600fe0add82c36 /mp/src/game/shared/predicted_viewmodel.cpp | |
| parent | Update .gitignore. (diff) | |
| parent | Make .xcconfigs text files too. (diff) | |
| download | source-sdk-2013-8737f191f3b59f001a77bf6c08091109211c1c9f.tar.xz source-sdk-2013-8737f191f3b59f001a77bf6c08091109211c1c9f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mp/src/game/shared/predicted_viewmodel.cpp')
| -rw-r--r-- | mp/src/game/shared/predicted_viewmodel.cpp | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/mp/src/game/shared/predicted_viewmodel.cpp b/mp/src/game/shared/predicted_viewmodel.cpp index 5af87f46..06691d02 100644 --- a/mp/src/game/shared/predicted_viewmodel.cpp +++ b/mp/src/game/shared/predicted_viewmodel.cpp @@ -1,71 +1,71 @@ -//========= Copyright Valve Corporation, All rights reserved. ============//
-//
-// Purpose:
-//
-//=============================================================================//
-#include "cbase.h"
-#include "predicted_viewmodel.h"
-
-// memdbgon must be the last include file in a .cpp file!!!
-#include "tier0/memdbgon.h"
-
-LINK_ENTITY_TO_CLASS( predicted_viewmodel, CPredictedViewModel );
-
-IMPLEMENT_NETWORKCLASS_ALIASED( PredictedViewModel, DT_PredictedViewModel )
-
-BEGIN_NETWORK_TABLE( CPredictedViewModel, DT_PredictedViewModel )
-END_NETWORK_TABLE()
-
-//-----------------------------------------------------------------------------
-// Purpose:
-//-----------------------------------------------------------------------------
-#ifdef CLIENT_DLL
-CPredictedViewModel::CPredictedViewModel() : m_LagAnglesHistory("CPredictedViewModel::m_LagAnglesHistory")
-{
- m_vLagAngles.Init();
- m_LagAnglesHistory.Setup( &m_vLagAngles, 0 );
-}
-#else
-CPredictedViewModel::CPredictedViewModel()
-{
-}
-#endif
-
-
-//-----------------------------------------------------------------------------
-// Purpose:
-//-----------------------------------------------------------------------------
-CPredictedViewModel::~CPredictedViewModel()
-{
-}
-
-#ifdef CLIENT_DLL
-ConVar cl_wpn_sway_interp( "cl_wpn_sway_interp", "0.1", FCVAR_CLIENTDLL );
-ConVar cl_wpn_sway_scale( "cl_wpn_sway_scale", "1.0", FCVAR_CLIENTDLL|FCVAR_CHEAT );
-#endif
-
-void CPredictedViewModel::CalcViewModelLag( Vector& origin, QAngle& angles, QAngle& original_angles )
-{
- #ifdef CLIENT_DLL
- // Calculate our drift
- Vector forward, right, up;
- AngleVectors( angles, &forward, &right, &up );
-
- // Add an entry to the history.
- m_vLagAngles = angles;
- m_LagAnglesHistory.NoteChanged( gpGlobals->curtime, cl_wpn_sway_interp.GetFloat(), false );
-
- // Interpolate back 100ms.
- m_LagAnglesHistory.Interpolate( gpGlobals->curtime, cl_wpn_sway_interp.GetFloat() );
-
- // Now take the 100ms angle difference and figure out how far the forward vector moved in local space.
- Vector vLaggedForward;
- QAngle angleDiff = m_vLagAngles - angles;
- AngleVectors( -angleDiff, &vLaggedForward, 0, 0 );
- Vector vForwardDiff = Vector(1,0,0) - vLaggedForward;
-
- // Now offset the origin using that.
- vForwardDiff *= cl_wpn_sway_scale.GetFloat();
- origin += forward*vForwardDiff.x + right*-vForwardDiff.y + up*vForwardDiff.z;
- #endif
+//========= Copyright Valve Corporation, All rights reserved. ============// +// +// Purpose: +// +//=============================================================================// +#include "cbase.h" +#include "predicted_viewmodel.h" + +// memdbgon must be the last include file in a .cpp file!!! +#include "tier0/memdbgon.h" + +LINK_ENTITY_TO_CLASS( predicted_viewmodel, CPredictedViewModel ); + +IMPLEMENT_NETWORKCLASS_ALIASED( PredictedViewModel, DT_PredictedViewModel ) + +BEGIN_NETWORK_TABLE( CPredictedViewModel, DT_PredictedViewModel ) +END_NETWORK_TABLE() + +//----------------------------------------------------------------------------- +// Purpose: +//----------------------------------------------------------------------------- +#ifdef CLIENT_DLL +CPredictedViewModel::CPredictedViewModel() : m_LagAnglesHistory("CPredictedViewModel::m_LagAnglesHistory") +{ + m_vLagAngles.Init(); + m_LagAnglesHistory.Setup( &m_vLagAngles, 0 ); +} +#else +CPredictedViewModel::CPredictedViewModel() +{ +} +#endif + + +//----------------------------------------------------------------------------- +// Purpose: +//----------------------------------------------------------------------------- +CPredictedViewModel::~CPredictedViewModel() +{ +} + +#ifdef CLIENT_DLL +ConVar cl_wpn_sway_interp( "cl_wpn_sway_interp", "0.1", FCVAR_CLIENTDLL ); +ConVar cl_wpn_sway_scale( "cl_wpn_sway_scale", "1.0", FCVAR_CLIENTDLL|FCVAR_CHEAT ); +#endif + +void CPredictedViewModel::CalcViewModelLag( Vector& origin, QAngle& angles, QAngle& original_angles ) +{ + #ifdef CLIENT_DLL + // Calculate our drift + Vector forward, right, up; + AngleVectors( angles, &forward, &right, &up ); + + // Add an entry to the history. + m_vLagAngles = angles; + m_LagAnglesHistory.NoteChanged( gpGlobals->curtime, cl_wpn_sway_interp.GetFloat(), false ); + + // Interpolate back 100ms. + m_LagAnglesHistory.Interpolate( gpGlobals->curtime, cl_wpn_sway_interp.GetFloat() ); + + // Now take the 100ms angle difference and figure out how far the forward vector moved in local space. + Vector vLaggedForward; + QAngle angleDiff = m_vLagAngles - angles; + AngleVectors( -angleDiff, &vLaggedForward, 0, 0 ); + Vector vForwardDiff = Vector(1,0,0) - vLaggedForward; + + // Now offset the origin using that. + vForwardDiff *= cl_wpn_sway_scale.GetFloat(); + origin += forward*vForwardDiff.x + right*-vForwardDiff.y + up*vForwardDiff.z; + #endif }
\ No newline at end of file |