diff options
| author | Jørgen P. Tjernø <[email protected]> | 2013-12-02 19:31:46 -0800 |
|---|---|---|
| committer | Jørgen P. Tjernø <[email protected]> | 2013-12-02 19:46:31 -0800 |
| commit | f56bb35301836e56582a575a75864392a0177875 (patch) | |
| tree | de61ddd39de3e7df52759711950b4c288592f0dc /mp/src/game/shared/script_intro_shared.cpp | |
| parent | Mark some more files as text. (diff) | |
| download | source-sdk-2013-f56bb35301836e56582a575a75864392a0177875.tar.xz source-sdk-2013-f56bb35301836e56582a575a75864392a0177875.zip | |
Fix line endings. WHAMMY.
Diffstat (limited to 'mp/src/game/shared/script_intro_shared.cpp')
| -rw-r--r-- | mp/src/game/shared/script_intro_shared.cpp | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/mp/src/game/shared/script_intro_shared.cpp b/mp/src/game/shared/script_intro_shared.cpp index e8659f7c..a96e9dd0 100644 --- a/mp/src/game/shared/script_intro_shared.cpp +++ b/mp/src/game/shared/script_intro_shared.cpp @@ -1,39 +1,39 @@ -//========= Copyright Valve Corporation, All rights reserved. ============//
-#include "cbase.h"
-
-//-----------------------------------------------------------------------------
-// Purpose: Calculate the FOV for the intro sequence (needed by both server and client)
-//-----------------------------------------------------------------------------
-float ScriptInfo_CalculateFOV( float flFOVBlendStartTime, float flNextFOVBlendTime, int nFOV, int nNextFOV, bool bSplineRamp )
-{
- // Handle the spline case
- if ( bSplineRamp )
- {
- //If we're past the zoom time, just take the new value and stop transitioning
- float deltaTime = (float)( gpGlobals->curtime - flFOVBlendStartTime ) / ( flNextFOVBlendTime - flFOVBlendStartTime );
- if ( deltaTime >= 1.0f )
- return nNextFOV;
-
- float flResult = SimpleSplineRemapVal( deltaTime, 0.0f, 1.0f, (float) nFOV, (float) nNextFOV );
-
- // Msg("FOV BLENDING: curtime %.2f StartedAt %.2f FinishAt: %.2f\n", gpGlobals->curtime, flFOVBlendStartTime, flNextFOVBlendTime );
- // Msg(" Perc: %.2f Start: %d End: %d FOV: %.2f\n", SimpleSplineRemapVal( deltaTime, 0.0f, 1.0f, nFOV, nNextFOV ), nFOV, nNextFOV, flResult );
-
- return flResult;
- }
-
- // Common, linear blend
- if ( (flNextFOVBlendTime - flFOVBlendStartTime) != 0 )
- {
- float flResult = RemapValClamped( gpGlobals->curtime, flFOVBlendStartTime, flNextFOVBlendTime, (float) nFOV, (float) nNextFOV );
-
- // Msg("FOV BLENDING: curtime %.2f StartedAt %.2f FinishAt: %.2f\n", gpGlobals->curtime, flFOVBlendStartTime, flNextFOVBlendTime );
- // Msg(" Perc: %.2f Start: %d End: %d FOV: %.2f\n", RemapValClamped( gpGlobals->curtime, flFOVBlendStartTime, flNextFOVBlendTime, 0.0, 1.0 ), nFOV, nNextFOV, flResult );
-
- return flResult;
- }
-
-
- // Msg("FOV BLENDING: JUMPED TO NEXT FOV (%d)\n", nNextFOV );
- return nNextFOV;
-}
+//========= Copyright Valve Corporation, All rights reserved. ============// +#include "cbase.h" + +//----------------------------------------------------------------------------- +// Purpose: Calculate the FOV for the intro sequence (needed by both server and client) +//----------------------------------------------------------------------------- +float ScriptInfo_CalculateFOV( float flFOVBlendStartTime, float flNextFOVBlendTime, int nFOV, int nNextFOV, bool bSplineRamp ) +{ + // Handle the spline case + if ( bSplineRamp ) + { + //If we're past the zoom time, just take the new value and stop transitioning + float deltaTime = (float)( gpGlobals->curtime - flFOVBlendStartTime ) / ( flNextFOVBlendTime - flFOVBlendStartTime ); + if ( deltaTime >= 1.0f ) + return nNextFOV; + + float flResult = SimpleSplineRemapVal( deltaTime, 0.0f, 1.0f, (float) nFOV, (float) nNextFOV ); + + // Msg("FOV BLENDING: curtime %.2f StartedAt %.2f FinishAt: %.2f\n", gpGlobals->curtime, flFOVBlendStartTime, flNextFOVBlendTime ); + // Msg(" Perc: %.2f Start: %d End: %d FOV: %.2f\n", SimpleSplineRemapVal( deltaTime, 0.0f, 1.0f, nFOV, nNextFOV ), nFOV, nNextFOV, flResult ); + + return flResult; + } + + // Common, linear blend + if ( (flNextFOVBlendTime - flFOVBlendStartTime) != 0 ) + { + float flResult = RemapValClamped( gpGlobals->curtime, flFOVBlendStartTime, flNextFOVBlendTime, (float) nFOV, (float) nNextFOV ); + + // Msg("FOV BLENDING: curtime %.2f StartedAt %.2f FinishAt: %.2f\n", gpGlobals->curtime, flFOVBlendStartTime, flNextFOVBlendTime ); + // Msg(" Perc: %.2f Start: %d End: %d FOV: %.2f\n", RemapValClamped( gpGlobals->curtime, flFOVBlendStartTime, flNextFOVBlendTime, 0.0, 1.0 ), nFOV, nNextFOV, flResult ); + + return flResult; + } + + + // Msg("FOV BLENDING: JUMPED TO NEXT FOV (%d)\n", nNextFOV ); + return nNextFOV; +} |