From: divverent Date: Sun, 29 May 2011 16:56:25 +0000 (+0000) Subject: fix calculation of viewangles to include v_idlescale X-Git-Tag: xonotic-v0.6.0~163^2~375 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6cc0a6e1e0bf9142cbbf9e5d93264d736fa342cf;p=xonotic%2Fdarkplaces.git fix calculation of viewangles to include v_idlescale git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11171 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/view.c b/view.c index e31c9e42..772c31d1 100644 --- a/view.c +++ b/view.c @@ -794,9 +794,12 @@ void V_CalcRefdef (void) } // calculate a view matrix for rendering the scene if (v_idlescale.value) - Matrix4x4_CreateFromQuakeEntity(&r_refdef.view.matrix, vieworg[0], vieworg[1], vieworg[2], viewangles[0] + v_idlescale.value * sin(cl.time*v_ipitch_cycle.value) * v_ipitch_level.value, viewangles[1] + v_idlescale.value * sin(cl.time*v_iyaw_cycle.value) * v_iyaw_level.value, viewangles[2] + v_idlescale.value * sin(cl.time*v_iroll_cycle.value) * v_iroll_level.value, 1); - else - Matrix4x4_CreateFromQuakeEntity(&r_refdef.view.matrix, vieworg[0], vieworg[1], vieworg[2], viewangles[0], viewangles[1], viewangles[2], 1); + { + viewangles[0] += v_idlescale.value * sin(cl.time*v_ipitch_cycle.value) * v_ipitch_level.value; + viewangles[1] += v_idlescale.value * sin(cl.time*v_iyaw_cycle.value) * v_iyaw_level.value; + viewangles[2] += v_idlescale.value * sin(cl.time*v_iroll_cycle.value) * v_iroll_level.value; + } + Matrix4x4_CreateFromQuakeEntity(&r_refdef.view.matrix, vieworg[0], vieworg[1], vieworg[2], viewangles[0], viewangles[1], viewangles[2], 1); // calculate a viewmodel matrix for use in view-attached entities Matrix4x4_CreateFromQuakeEntity(&viewmodelmatrix, gunorg[0], gunorg[1], gunorg[2], gunangles[0], gunangles[1], gunangles[2], cl_viewmodel_scale.value); VectorCopy(vieworg, cl.csqc_vieworiginfromengine);