made cl_viewmodel_scale apply to csqc and gettaginfo

fixed bug with concat order in stereo rendering (it was offseting along X in worldspace due to wrong concat order)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6620 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_screen.c b/cl_screen.c
index 8ab102be0b1eebbc5ec980048ef938ede09a5481..164ed0c2e0638283e32c3c741b483c09b55a8e07 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -1748,7 +1748,7 @@ void CL_UpdateScreen(void)
                matrix4x4_t originalmatrix = r_view.matrix;
                matrix4x4_t offsetmatrix;
                Matrix4x4_CreateTranslate(&offsetmatrix, 0, r_stereo_separation.value * -0.5f, 0);
-               Matrix4x4_Concat(&r_view.matrix, &offsetmatrix, &originalmatrix);
+               Matrix4x4_Concat(&r_view.matrix, &originalmatrix, &offsetmatrix);
 
                if (r_stereo_sidebyside.integer)
                        r_stereo_side = 0;
@@ -1766,7 +1766,7 @@ void CL_UpdateScreen(void)
                SCR_DrawScreen();
 
                Matrix4x4_CreateTranslate(&offsetmatrix, 0, r_stereo_separation.value * 0.5f, 0);
-               Matrix4x4_Concat(&r_view.matrix, &offsetmatrix, &originalmatrix);
+               Matrix4x4_Concat(&r_view.matrix, &originalmatrix, &offsetmatrix);
 
                if (r_stereo_sidebyside.integer)
                        r_stereo_side = 1;

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 4f9f3680f81c77686a4cadb93bed75f1dafceb14..0e5a9e27ba0cf499310c0c412e72e7f7d3856ee6 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -773,7 +773,7 @@ static void CSQC_R_RecalcView (void)
        viewmodelmatrix = identitymatrix;
        r_view.matrix = identitymatrix;
        Matrix4x4_CreateFromQuakeEntity(&r_view.matrix, csqc_origin[0], csqc_origin[1], csqc_origin[2], csqc_angles[0], csqc_angles[1], csqc_angles[2], 1);
-       Matrix4x4_CreateFromQuakeEntity(&viewmodelmatrix, csqc_origin[0], csqc_origin[1], csqc_origin[2], csqc_angles[0], csqc_angles[1], csqc_angles[2], 0.3);
+       Matrix4x4_CreateFromQuakeEntity(&viewmodelmatrix, csqc_origin[0], csqc_origin[1], csqc_origin[2], csqc_angles[0], csqc_angles[1], csqc_angles[2], cl_viewmodel_scale.value);
 }
 
 //#300 void() clearscene (EXT_CSQC)

diff --git a/quakedef.h b/quakedef.h
index 675914072423d88d97d5cc75e07e412f745c8004..cd43b7d0b41c57f156b766243bc6e744de4b9a1f 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -254,6 +254,7 @@ extern int current_skill;
 // chase
 //
 extern cvar_t chase_active;
+extern cvar_t cl_viewmodel_scale;
 
 void Chase_Init (void);
 void Chase_Reset (void);

diff --git a/svvm_cmds.c b/svvm_cmds.c
index 524eb60038604cafd8a797109d809b0353f1a2fa..f8bc0d8ac3634650d23fda1ae5859eaa5390bd0f 100644 (file)
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -2384,7 +2384,7 @@ void SV_GetEntityMatrix (prvm_edict_t *ent, matrix4x4_t *out, qboolean viewmatri
        if (viewmatrix)
                Matrix4x4_CreateFromQuakeEntity(out, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2] + ent->fields.server->view_ofs[2], ent->fields.server->v_angle[0], ent->fields.server->v_angle[1], ent->fields.server->v_angle[2], scale);
        else
-               Matrix4x4_CreateFromQuakeEntity(out, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2], -ent->fields.server->angles[0], ent->fields.server->angles[1], ent->fields.server->angles[2], scale * 0.333);
+               Matrix4x4_CreateFromQuakeEntity(out, ent->fields.server->origin[0], ent->fields.server->origin[1], ent->fields.server->origin[2], -ent->fields.server->angles[0], ent->fields.server->angles[1], ent->fields.server->angles[2], scale * cl_viewmodel_scale.value);
 }
 
 int SV_GetEntityLocalTagMatrix(prvm_edict_t *ent, int tagindex, matrix4x4_t *out)