From f56bb35301836e56582a575a75864392a0177875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20P=2E=20Tjern=C3=B8?= Date: Mon, 2 Dec 2013 19:31:46 -0800 Subject: Fix line endings. WHAMMY. --- mp/src/public/simple_physics.cpp | 144 +++++++++++++++++++-------------------- 1 file changed, 72 insertions(+), 72 deletions(-) (limited to 'mp/src/public/simple_physics.cpp') diff --git a/mp/src/public/simple_physics.cpp b/mp/src/public/simple_physics.cpp index d08c041d..0d1eed39 100644 --- a/mp/src/public/simple_physics.cpp +++ b/mp/src/public/simple_physics.cpp @@ -1,72 +1,72 @@ -//========= Copyright Valve Corporation, All rights reserved. ============// -// -// Purpose: -// -// $NoKeywords: $ -// -//=============================================================================// - -#include "simple_physics.h" -#include "tier0/dbg.h" - -// memdbgon must be the last include file in a .cpp file!!! -#include "tier0/memdbgon.h" - -CSimplePhysics::CSimplePhysics() -{ - Init( 1.0f / 30.0f ); // default is 30 steps per second -} - - -void CSimplePhysics::Init( float flTimeStep ) -{ - m_flPredictedTime = 0; - m_iCurTimeStep = 0; - m_flTimeStep = flTimeStep; - m_flTimeStepMul = m_flTimeStep*m_flTimeStep*0.5f; -} - - -void CSimplePhysics::Simulate( - CSimplePhysics::CNode *pNodes, - int nNodes, - CSimplePhysics::IHelper *pHelper, - float dt, - float flDamp ) -{ - // Figure out how many time steps to run. - m_flPredictedTime += dt; - int newTimeStep = (int)ceil( m_flPredictedTime / m_flTimeStep ); - int nTimeSteps = newTimeStep - m_iCurTimeStep; - for( int iTimeStep=0; iTimeStep < nTimeSteps; iTimeStep++ ) - { - // Simulate everything.. - for( int iNode=0; iNode < nNodes; iNode++ ) - { - CSimplePhysics::CNode *pNode = &pNodes[iNode]; - - // Apply forces. - Vector vAccel; - pHelper->GetNodeForces( pNodes, iNode, &vAccel ); - Assert( vAccel.IsValid() ); - - Vector vPrevPos = pNode->m_vPos; - pNode->m_vPos = pNode->m_vPos + (pNode->m_vPos - pNode->m_vPrevPos) * flDamp + vAccel * m_flTimeStepMul; - pNode->m_vPrevPos = vPrevPos; - } - - // Apply constraints. - pHelper->ApplyConstraints( pNodes, nNodes ); - } - m_iCurTimeStep = newTimeStep; - - // Setup predicted positions. - float flInterpolant = (m_flPredictedTime - (GetCurTime() - m_flTimeStep)) / m_flTimeStep; - for( int iNode=0; iNode < nNodes; iNode++ ) - { - CSimplePhysics::CNode *pNode = &pNodes[iNode]; - VectorLerp( pNode->m_vPrevPos, pNode->m_vPos, flInterpolant, pNode->m_vPredicted ); - } -} - - +//========= Copyright Valve Corporation, All rights reserved. ============// +// +// Purpose: +// +// $NoKeywords: $ +// +//=============================================================================// + +#include "simple_physics.h" +#include "tier0/dbg.h" + +// memdbgon must be the last include file in a .cpp file!!! +#include "tier0/memdbgon.h" + +CSimplePhysics::CSimplePhysics() +{ + Init( 1.0f / 30.0f ); // default is 30 steps per second +} + + +void CSimplePhysics::Init( float flTimeStep ) +{ + m_flPredictedTime = 0; + m_iCurTimeStep = 0; + m_flTimeStep = flTimeStep; + m_flTimeStepMul = m_flTimeStep*m_flTimeStep*0.5f; +} + + +void CSimplePhysics::Simulate( + CSimplePhysics::CNode *pNodes, + int nNodes, + CSimplePhysics::IHelper *pHelper, + float dt, + float flDamp ) +{ + // Figure out how many time steps to run. + m_flPredictedTime += dt; + int newTimeStep = (int)ceil( m_flPredictedTime / m_flTimeStep ); + int nTimeSteps = newTimeStep - m_iCurTimeStep; + for( int iTimeStep=0; iTimeStep < nTimeSteps; iTimeStep++ ) + { + // Simulate everything.. + for( int iNode=0; iNode < nNodes; iNode++ ) + { + CSimplePhysics::CNode *pNode = &pNodes[iNode]; + + // Apply forces. + Vector vAccel; + pHelper->GetNodeForces( pNodes, iNode, &vAccel ); + Assert( vAccel.IsValid() ); + + Vector vPrevPos = pNode->m_vPos; + pNode->m_vPos = pNode->m_vPos + (pNode->m_vPos - pNode->m_vPrevPos) * flDamp + vAccel * m_flTimeStepMul; + pNode->m_vPrevPos = vPrevPos; + } + + // Apply constraints. + pHelper->ApplyConstraints( pNodes, nNodes ); + } + m_iCurTimeStep = newTimeStep; + + // Setup predicted positions. + float flInterpolant = (m_flPredictedTime - (GetCurTime() - m_flTimeStep)) / m_flTimeStep; + for( int iNode=0; iNode < nNodes; iNode++ ) + { + CSimplePhysics::CNode *pNode = &pNodes[iNode]; + VectorLerp( pNode->m_vPrevPos, pNode->m_vPos, flInterpolant, pNode->m_vPredicted ); + } +} + + -- cgit v1.2.3