[iortcw] 95/497: Ported shake camera (on explosions..) from NQ mod as default came shaking makes me dizzy..

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 37d5b2f9d06c954202fb11c6b0bd2f44362f8489
Author: nate.afk at gmail.com <nate.afk at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Mon Apr 28 02:10:09 2014 +0000

    Ported shake camera (on explosions..) from NQ mod as default came shaking makes me dizzy..
---
 MP/code/cgame/cg_draw.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/MP/code/cgame/cg_draw.c b/MP/code/cgame/cg_draw.c
index d4257d0..f7fc77d 100644
--- a/MP/code/cgame/cg_draw.c
+++ b/MP/code/cgame/cg_draw.c
@@ -3630,14 +3630,13 @@ void CG_ShakeCamera( void ) {
 
 	// JPW NERVE starts at 1, approaches 0 over time
 	x = ( cg.cameraShakeTime - cg.time ) / cg.cameraShakeLength;
-
-	// up/down
-	val = sin( M_PI * 8 * x + cg.cameraShakePhase ) * x * 18.0f * cg.cameraShakeScale;
-	cg.refdefViewAngles[0] += val;
-
-	// left/right
-	val = sin( M_PI * 15 * x + cg.cameraShakePhase ) * x * 16.0f * cg.cameraShakeScale;
-	cg.refdefViewAngles[1] += val;
+
+	val = sin(M_PI * 7 * x + cg.cameraShakePhase) * x * 4.0f * cg.cameraShakeScale;
+	cg.refdef.vieworg[2] += val;
+	val = sin(M_PI * 13 * x + cg.cameraShakePhase) * x * 4.0f * cg.cameraShakeScale;
+	cg.refdef.vieworg[1] += val;
+	val = cos(M_PI * 17 * x + cg.cameraShakePhase) * x * 4.0f * cg.cameraShakeScale;
+	cg.refdef.vieworg[0] += val;	
 
 	AnglesToAxis( cg.refdefViewAngles, cg.refdef.viewaxis );
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git