eliminated calls to Matrix4x4_CreateIdentity (now copies from the already existing...

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

diff --git a/cl_main.c b/cl_main.c
index 9a651dbb0859387ab22a84b6dfe9e66f3f8dc0d4..0ef8768fd7faa2c33ad6853d3c5b7b46e99b4de6 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -1240,8 +1240,8 @@ void CL_RelinkWorld(void)
        entity_t *ent = &cl_entities[0];
        cl_brushmodel_entities[cl_num_brushmodel_entities++] = 0;
        // FIXME: this should be done at load
-       Matrix4x4_CreateIdentity(&ent->render.matrix);
-       Matrix4x4_CreateIdentity(&ent->render.inversematrix);
+       ent->render.matrix = identitymatrix;
+       ent->render.inversematrix = identitymatrix;
        R_LerpAnimation(&ent->render);
        CL_BoundingBoxForEntity(&ent->render);
        ent->render.flags = RENDER_SHADOW;
@@ -1259,8 +1259,8 @@ void CL_RelinkCSQCWorld(void)     //[515]: csqc
                return;
 //     cl_brushmodel_entities[cl_num_brushmodel_entities++] = 0;
        // FIXME: this should be done at load
-       Matrix4x4_CreateIdentity(&ent->render.matrix);
-       Matrix4x4_CreateIdentity(&ent->render.inversematrix);
+       ent->render.matrix = identitymatrix;
+       ent->render.inversematrix = identitymatrix;
        R_LerpAnimation(&ent->render);
        CL_BoundingBoxForEntity(&ent->render);
        ent->render.flags = RENDER_SHADOW;
@@ -1625,7 +1625,7 @@ int CL_ReadFromServer(void)
        r_refdef.time = cl.time;
        r_refdef.extraupdate = !r_speeds.integer;
        r_refdef.numentities = 0;
-       Matrix4x4_CreateIdentity(&r_refdef.viewentitymatrix);
+       r_refdef.viewentitymatrix = identitymatrix;
        cl_num_brushmodel_entities = 0;
 
        if (cls.state == ca_connected && cls.signon == SIGNONS)

diff --git a/cl_particles.c b/cl_particles.c
index a7ea21464198478a09f241f1c5e4fadd174cfffc..94e6e582d313c2db58b28903b245e883e46e0025 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -2119,7 +2119,7 @@ void R_DrawParticle_TransparentCallback(const entity_render_t *ent, int surfacen
                }
        }
 
-       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_Matrix(&identitymatrix);
 
        memset(&m, 0, sizeof(m));
        m.tex[0] = R_GetTexture(tex->texture);

diff --git a/clvm_cmds.c b/clvm_cmds.c
index e828cdc0c6775f52ce6cbd9de7c21e23ed020c6c..a58818910e37643faeb7d763fe85ba428a2ff571 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -800,8 +800,8 @@ static const int particleeffects_num = sizeof(particleeffect_names)/sizeof(char*
 static void CSQC_R_RecalcView (void)
 {
        extern matrix4x4_t viewmodelmatrix;
-       Matrix4x4_CreateIdentity(&viewmodelmatrix);
-       Matrix4x4_CreateIdentity(&r_refdef.viewentitymatrix);
+       viewmodelmatrix = identitymatrix;
+       r_refdef.viewentitymatrix = identitymatrix;
        Matrix4x4_CreateFromQuakeEntity(&r_refdef.viewentitymatrix, 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);
 }
@@ -2248,7 +2248,7 @@ int CL_GetTagMatrix (matrix4x4_t *out, prvm_edict_t *ent, int tagindex)
        prvm_edict_t *attachent;
        model_t *model;
 
-       Matrix4x4_CreateIdentity(out); // warnings and errors return identical matrix
+       out = identitymatrix; // warnings and errors return identical matrix
 
        if (ent == prog->edicts)
                return 1;
@@ -2285,7 +2285,7 @@ int CL_GetTagMatrix (matrix4x4_t *out, prvm_edict_t *ent, int tagindex)
                        return ret;
        }
        else
-               Matrix4x4_CreateIdentity(&tagmatrix);
+               tagmatrix = identitymatrix;
 
        if ((val = PRVM_GETEDICTFIELDVALUE(ent, csqc_fieldoff_tag_entity)) && val->edict)
        { // DP_GFX_QUAKE3MODELTAGS, scan all chain and stop on unattached entity
@@ -2310,7 +2310,7 @@ int CL_GetTagMatrix (matrix4x4_t *out, prvm_edict_t *ent, int tagindex)
                        if (model && val->_float >= 1 && model->animscenes && attachent->fields.client->frame >= 0 && attachent->fields.client->frame < model->numframes)
                                Mod_Alias_GetTagMatrix(model, model->animscenes[(int)attachent->fields.client->frame].firstframe, val->_float - 1, &attachmatrix);
                        else
-                               Matrix4x4_CreateIdentity(&attachmatrix);
+                               attachmatrix = identitymatrix;
 
                        // apply transformation by child entity matrix
                        val = PRVM_GETEDICTFIELDVALUE(ent, csqc_fieldoff_scale);

diff --git a/collision.c b/collision.c
index 225caab2d9030d1a34f9b53b60a7bac6f8e37f2e..02ccb4630a4917b8746c9ea233e82eef9a1bed9c 100644 (file)
--- a/collision.c
+++ b/collision.c
@@ -1035,7 +1035,6 @@ colbrushf_t *Collision_BrushForBox(const matrix4x4_t *matrix, const vec3_t mins,
 void Collision_ClipTrace_BrushBox(trace_t *trace, const vec3_t cmins, const vec3_t cmaxs, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontentsmask)
 {
        colbrushf_t *boxbrush, *thisbrush_start, *thisbrush_end;
-       matrix4x4_t identitymatrix;
        vec3_t startmins, startmaxs, endmins, endmaxs;
 
        // create brushes for the collision
@@ -1043,7 +1042,6 @@ void Collision_ClipTrace_BrushBox(trace_t *trace, const vec3_t cmins, const vec3
        VectorAdd(start, maxs, startmaxs);
        VectorAdd(end, mins, endmins);
        VectorAdd(end, maxs, endmaxs);
-       Matrix4x4_CreateIdentity(&identitymatrix);
        boxbrush = Collision_BrushForBox(&identitymatrix, cmins, cmaxs);
        thisbrush_start = Collision_BrushForBox(&identitymatrix, startmins, startmaxs);
        thisbrush_end = Collision_BrushForBox(&identitymatrix, endmins, endmaxs);

diff --git a/gl_backend.c b/gl_backend.c
index 439ec64b777964b30d43e77b97e3cae6fcfc2a0a..5d63a28a7a82da5b5ae973c54800bebdade3be35 100644 (file)
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -256,7 +256,7 @@ void gl_backend_init(void)
 
 void GL_SetupView_Orientation_Identity (void)
 {
-       Matrix4x4_CreateIdentity(&backend_viewmatrix);
+       backend_viewmatrix = identitymatrix;
        memset(&backend_modelmatrix, 0, sizeof(backend_modelmatrix));
 }
 
@@ -445,7 +445,7 @@ void GL_SetupTextureState(void)
                unit->combinergb = GL_MODULATE;
                unit->combinealpha = GL_MODULATE;
                unit->texmatrixenabled = false;
-               unit->matrix = r_identitymatrix;
+               unit->matrix = identitymatrix;
        }
 
        for (i = 0;i < backendimageunits;i++)
@@ -1845,7 +1845,7 @@ void SCR_UpdateLoadingScreen (void)
        R_Textures_Frame();
        GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
        R_Mesh_Start();
-       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_Matrix(&identitymatrix);
        // draw the loading plaque
        pic = Draw_CachePic("gfx/loading", false);
        x = (vid_conwidth.integer - pic->width)/2;

diff --git a/gl_draw.c b/gl_draw.c
index aecd32133b6ce9febb6fb1e23b68b7f110a86430..b908a2429e2fecda4292f23aa67fcc866090f3df 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -536,7 +536,7 @@ void R_DrawQueue(void)
        qglViewport(r_view_x, vid.height - (r_view_y + r_view_height), r_view_width, r_view_height);
        GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
        qglDepthFunc(GL_LEQUAL);
-       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_Matrix(&identitymatrix);
 
        chartexnum = R_GetTexture(char_texture);
 

diff --git a/gl_rmain.c b/gl_rmain.c
index 3e6c5d6859628e40097000f404f3567ee3baf52e..e22cf40bb84a78f1a9b6e8a10a30b1a6b59c8dfd 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -28,7 +28,7 @@ int r_framecount;
 
 mplane_t frustum[5];
 
-matrix4x4_t r_identitymatrix;
+matrix4x4_t identitymatrix;
 
 renderstats_t renderstats;
 
@@ -450,7 +450,6 @@ void gl_main_newmap(void)
 
 void GL_Main_Init(void)
 {
-       Matrix4x4_CreateIdentity(&r_identitymatrix);
 // FIXME: move this to client?
        FOG_registercvars();
        Cvar_RegisterVariable(&r_showtris);
@@ -862,7 +861,7 @@ static void R_BlendView(void)
        GL_SetupView_Mode_Ortho(0, 0, 1, 1, -10, 100);
        GL_DepthMask(true);
        GL_DepthTest(false);
-       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_Matrix(&identitymatrix);
        // vertex coordinates for a quad that covers the screen exactly
        varray_vertex3f[0] = 0;varray_vertex3f[1] = 0;varray_vertex3f[2] = 0;
        varray_vertex3f[3] = 1;varray_vertex3f[4] = 0;varray_vertex3f[5] = 0;
@@ -1333,7 +1332,7 @@ void R_DrawBBoxMesh(vec3_t mins, vec3_t maxs, float cr, float cg, float cb, floa
        GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
        GL_DepthMask(false);
        GL_DepthTest(true);
-       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_Matrix(&identitymatrix);
 
        vertex3f[ 0] = mins[0];vertex3f[ 1] = mins[1];vertex3f[ 2] = mins[2];
        vertex3f[ 3] = maxs[0];vertex3f[ 4] = mins[1];vertex3f[ 5] = mins[2];
@@ -1498,7 +1497,7 @@ void R_DrawSprite(int blendfunc1, int blendfunc2, rtexture_t *texture, rtexture_
                fog = VERTEXFOGTABLE(VectorDistance(origin, r_vieworigin));
        ifog = 1 - fog;
 
-       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_Matrix(&identitymatrix);
        GL_BlendFunc(blendfunc1, blendfunc2);
        GL_DepthMask(false);
        GL_DepthTest(!depthdisable);
@@ -1656,17 +1655,17 @@ void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t)
        if (t->currentmaterialflags & MATERIALFLAG_WATER && r_waterscroll.value != 0)
                t->currenttexmatrix = r_waterscrollmatrix;
        else
-               t->currenttexmatrix = r_identitymatrix;
+               t->currenttexmatrix = identitymatrix;
        t->currentnumlayers = 0;
        if (!(t->currentmaterialflags & MATERIALFLAG_NODRAW))
        {
                if (gl_lightmaps.integer)
-                       R_Texture_AddLayer(t, true, GL_ONE, GL_ZERO, TEXTURELAYERTYPE_LITTEXTURE_MULTIPASS, r_texture_white, &r_identitymatrix, 1, 1, 1, 1);
+                       R_Texture_AddLayer(t, true, GL_ONE, GL_ZERO, TEXTURELAYERTYPE_LITTEXTURE_MULTIPASS, r_texture_white, &identitymatrix, 1, 1, 1, 1);
                else if (t->currentmaterialflags & MATERIALFLAG_SKY)
                {
                        // transparent sky would be ridiculous
                        if (!(t->currentmaterialflags & MATERIALFLAG_TRANSPARENT))
-                               R_Texture_AddLayer(t, true, GL_ONE, GL_ZERO, TEXTURELAYERTYPE_SKY, r_texture_white, &r_identitymatrix, fogcolor[0], fogcolor[1], fogcolor[2], 1);
+                               R_Texture_AddLayer(t, true, GL_ONE, GL_ZERO, TEXTURELAYERTYPE_SKY, r_texture_white, &identitymatrix, fogcolor[0], fogcolor[1], fogcolor[2], 1);
                }
                else
                {
@@ -1751,7 +1750,7 @@ void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t)
                                        // were darkened by fog already, and we should not add fog color
                                        // (because the background was not darkened, there is no fog color
                                        // that was lost behind it).
-                                       R_Texture_AddLayer(t, false, GL_SRC_ALPHA, (t->currentmaterialflags & MATERIALFLAG_TRANSPARENT) ? GL_ONE : GL_ONE_MINUS_SRC_ALPHA, TEXTURELAYERTYPE_FOG, t->skin.fog, &r_identitymatrix, fogcolor[0], fogcolor[1], fogcolor[2], t->currentalpha);
+                                       R_Texture_AddLayer(t, false, GL_SRC_ALPHA, (t->currentmaterialflags & MATERIALFLAG_TRANSPARENT) ? GL_ONE : GL_ONE_MINUS_SRC_ALPHA, TEXTURELAYERTYPE_FOG, t->skin.fog, &identitymatrix, fogcolor[0], fogcolor[1], fogcolor[2], t->currentalpha);
                                }
                        }
                }

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 065e77019a880e5ba2456ca5fe90b374c29cb119..69164fb2ef1781ca7030b4fc215825156afd1db2 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -301,7 +301,7 @@ static void R_DrawPortal_Callback(const entity_render_t *ent, int surfacenumber,
        GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
        GL_DepthMask(false);
        GL_DepthTest(true);
-       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_Matrix(&identitymatrix);
 
        memset(&m, 0, sizeof(m));
        m.pointer_vertex = varray_vertex3f;

diff --git a/model_alias.c b/model_alias.c
index b27d8054c1d736cc5f279ce58b8a9b8ba75f27fa..4159cd20f182879866b653018e6f7830c6299a77 100644 (file)
--- a/model_alias.c
+++ b/model_alias.c
@@ -126,7 +126,7 @@ int Mod_Alias_GetTagMatrix(const model_t *model, int poseframe, int tagindex, ma
 {
        const float *boneframe;
        float tempbonematrix[12], bonematrix[12];
-       Matrix4x4_CreateIdentity(outmatrix);
+       *outmatrix = identitymatrix;
        if (model->num_bones)
        {
                if (tagindex < 0 || tagindex >= model->num_bones)
@@ -221,8 +221,8 @@ static void Mod_MDLMD2MD3_TraceBox(model_t *model, int frame, trace_t *trace, co
        if (!linetrace)
        {
                // box trace, performed as brush trace
-               Matrix4x4_CreateIdentity(&startmatrix);
-               Matrix4x4_CreateIdentity(&endmatrix);
+               startmatrix = identitymatrix;
+               endmatrix = identitymatrix;
                thisbrush_start = Collision_BrushForBox(&startmatrix, boxstartmins, boxstartmaxs);
                thisbrush_end = Collision_BrushForBox(&endmatrix, boxendmins, boxendmaxs);
        }
@@ -1069,7 +1069,7 @@ void Mod_IDP3_Load(model_t *mod, void *buffer, void *bufferend)
        for (i = 0, pintag = (md3tag_t *)((unsigned char *)pinmodel + LittleLong(pinmodel->lump_tags));i < loadmodel->num_tagframes * loadmodel->num_tags;i++, pintag++)
        {
                strcpy(loadmodel->data_tags[i].name, pintag->name);
-               Matrix4x4_CreateIdentity(&loadmodel->data_tags[i].matrix);
+               loadmodel->data_tags[i].matrix = identitymatrix;
                for (j = 0;j < 3;j++)
                {
                        for (k = 0;k < 3;k++)
@@ -2143,7 +2143,7 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
                                mesh->data_vertexboneweights[mesh->num_vertexboneweights].vertexindex = index;
                                mesh->data_vertexboneweights[mesh->num_vertexboneweights].boneindex = rawweights[j].boneindex;
                                mesh->data_vertexboneweights[mesh->num_vertexboneweights].weight = rawweights[j].weight;
-                               Matrix4x4_CreateIdentity(&matrix);
+                               matrix = identitymatrix;
                                for (i = rawweights[j].boneindex;i >= 0;i = loadmodel->data_bones[i].parent)
                                {
                                        matrix4x4_t childmatrix, tempmatrix;

diff --git a/model_brush.c b/model_brush.c
index a6ca9c0ec5f11b18daf1b09c742a96310aca7b4e..ecbe140182366676891afe6c01596955cc43be29 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -5359,8 +5359,8 @@ static void Mod_Q3BSP_TraceBox(model_t *model, int frame, trace_t *trace, const
        trace->fraction = 1;
        trace->realfraction = 1;
        trace->hitsupercontentsmask = hitsupercontentsmask;
-       Matrix4x4_CreateIdentity(&startmatrix);
-       Matrix4x4_CreateIdentity(&endmatrix);
+       startmatrix = identitymatrix;
+       endmatrix = identitymatrix;
        segmentmins[0] = min(boxstartmins[0], boxendmins[0]);
        segmentmins[1] = min(boxstartmins[1], boxendmins[1]);
        segmentmins[2] = min(boxstartmins[2], boxendmins[2]);

diff --git a/model_shared.c b/model_shared.c
index 2b9f947615d2f0f834547adfe9ca2037240fefd0..558e0deaba79b3b3a83f45812b01852acfbcfefa 100644 (file)
--- a/model_shared.c
+++ b/model_shared.c
@@ -593,6 +593,8 @@ void Mod_BuildTextureVectorsAndNormals(int firstvertex, int numvertices, int num
 {
        int i, tnum;
        float sdir[3], tdir[3], normal[3], *v;
+       const float *v0, *v1, *v2, *tc0, *tc1, *tc2;
+       float f, tangentcross[3], v10[3], v20[3], tc10[2], tc20[2];
        const int *e;
        // clear the vectors
        if (svector3f)
@@ -604,7 +606,59 @@ void Mod_BuildTextureVectorsAndNormals(int firstvertex, int numvertices, int num
        // process each vertex of each triangle and accumulate the results
        for (tnum = 0, e = elements;tnum < numtriangles;tnum++, e += 3)
        {
-               Mod_BuildBumpVectors(vertex3f + e[0] * 3, vertex3f + e[1] * 3, vertex3f + e[2] * 3, texcoord2f + e[0] * 2, texcoord2f + e[1] * 2, texcoord2f + e[2] * 2, sdir, tdir, normal);
+               v0 = vertex3f + e[0] * 3;
+               v1 = vertex3f + e[1] * 3;
+               v2 = vertex3f + e[2] * 3;
+               tc0 = texcoord2f + e[0] * 2;
+               tc1 = texcoord2f + e[1] * 2;
+               tc2 = texcoord2f + e[2] * 2;
+
+               // 79 add/sub/negate/multiply (1 cycle), 1 compare (3 cycle?), total cycles not counting load/store/exchange roughly 82 cycles
+               // 6 add, 28 subtract, 39 multiply, 1 compare, 50% chance of 6 negates
+
+               // calculate the edge directions and surface normal
+               // 6 multiply, 9 subtract
+               VectorSubtract(v1, v0, v10);
+               VectorSubtract(v2, v0, v20);
+               normal[0] = v20[1] * v10[2] - v20[2] * v10[1];
+               normal[1] = v20[2] * v10[0] - v20[0] * v10[2];
+               normal[2] = v20[0] * v10[1] - v20[1] * v10[0];
+
+               // calculate the tangents
+               // 12 multiply, 10 subtract
+               tc10[1] = tc1[1] - tc0[1];
+               tc20[1] = tc2[1] - tc0[1];
+               sdir[0] = tc10[1] * v20[0] - tc20[1] * v10[0];
+               sdir[1] = tc10[1] * v20[1] - tc20[1] * v10[1];
+               sdir[2] = tc10[1] * v20[2] - tc20[1] * v10[2];
+               tc10[0] = tc1[0] - tc0[0];
+               tc20[0] = tc2[0] - tc0[0];
+               tdir[0] = tc10[0] * v20[0] - tc20[0] * v10[0];
+               tdir[1] = tc10[0] * v20[1] - tc20[0] * v10[1];
+               tdir[2] = tc10[0] * v20[2] - tc20[0] * v10[2];
+
+               // make the tangents completely perpendicular to the surface normal
+               // 12 multiply, 4 add, 6 subtract
+               f = DotProduct(sdir, normal);
+               sdir[0] -= f * normal[0];
+               sdir[1] -= f * normal[1];
+               sdir[2] -= f * normal[2];
+               f = DotProduct(tdir, normal);
+               tdir[0] -= f * normal[0];
+               tdir[1] -= f * normal[1];
+               tdir[2] -= f * normal[2];
+
+               // if texture is mapped the wrong way (counterclockwise), the tangents
+               // have to be flipped, this is detected by calculating a normal from the
+               // two tangents, and seeing if it is opposite the surface normal
+               // 9 multiply, 2 add, 3 subtract, 1 compare, 50% chance of: 6 negates
+               CrossProduct(tdir, sdir, tangentcross);
+               if (DotProduct(tangentcross, normal) < 0)
+               {
+                       VectorNegate(sdir, sdir);
+                       VectorNegate(tdir, tdir);
+               }
+
                if (!areaweighting)
                {
                        VectorNormalize(sdir);

diff --git a/r_explosion.c b/r_explosion.c
index d1e51b97b4ff5d607982e8666ac87f526e0fa25b..28f8bae0ff05679069a0ea9f86a6ce87f916d444 100644 (file)
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -190,7 +190,7 @@ static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, int
        GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
        GL_DepthMask(false);
        GL_DepthTest(true);
-       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_Matrix(&identitymatrix);
 
        numtriangles = EXPLOSIONTRIS;
        numverts = EXPLOSIONVERTS;

diff --git a/r_light.c b/r_light.c
index f06c41e0208bb07d7cae921c4a8c7aaa69bdb284..572d6ed030feab895ccb0885b8f7d5dc50b6710a 100644 (file)
--- a/r_light.c
+++ b/r_light.c
@@ -81,7 +81,7 @@ void R_DrawCoronas(void)
        dlight_t *light;
        if (r_coronas.value < 0.01)
                return;
-       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_Matrix(&identitymatrix);
        viewdist = DotProduct(r_vieworigin, r_viewforward);
        flag = r_rtworld ? LIGHTFLAG_REALTIMEMODE : LIGHTFLAG_NORMALMODE;
        for (lnum = 0, light = r_shadow_worldlightchain;light;light = light->next, lnum++)

diff --git a/r_lightning.c b/r_lightning.c
index bc4efbb0e64dc33bcad42853d4c75962a3e641fc..f6b5bd3ae0c5c741fadb01bbe50dc9fec7a8dd6e 100644 (file)
--- a/r_lightning.c
+++ b/r_lightning.c
@@ -236,7 +236,7 @@ void R_DrawLightningBeam_TransparentCallback(const entity_render_t *ent, int sur
        vec3_t beamdir, right, up, offset;
        float length, t1, t2;
 
-       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_Matrix(&identitymatrix);
 
        // calculate beam direction (beamdir) vector and beam length
        // get difference vector

diff --git a/r_sprites.c b/r_sprites.c
index 70169e1258e32855c793f0865e61ba937f1a4f1e..af4bbfd2b63935e340a1d42183e71e01ac8d29e5 100644 (file)
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -73,7 +73,7 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, int sur
                break;
        }
 
-       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_Matrix(&identitymatrix);
 
        if (!(ent->flags & RENDER_LIGHT))
                color[0] = color[1] = color[2] = 1;

diff --git a/render.h b/render.h
index 5646c6669ecbab5005f9ad1fb6cbf723e339c247..ee06c0f1212ce870f1893279825e72310928226e 100644 (file)
--- a/render.h
+++ b/render.h
@@ -30,8 +30,6 @@ extern unsigned char r_worldleafvisible[32768];
 // TODO: dynamic resize according to r_refdef.worldmodel->num_surfaces
 extern unsigned char r_worldsurfacevisible[262144];
 
-extern matrix4x4_t r_identitymatrix;
-
 // 1.0f / N table
 extern float ixtable[4096];
 

diff --git a/svvm_cmds.c b/svvm_cmds.c
index 7758ed47fbad8d3138a976e3719f6a5e49a4b0be..c178bab907c7bce6997d476526a2def700b2e183 100644 (file)
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -2258,7 +2258,7 @@ int SV_GetEntityLocalTagMatrix(prvm_edict_t *ent, int tagindex, matrix4x4_t *out
                        frame = 0;
                return Mod_Alias_GetTagMatrix(model, model->animscenes[frame].firstframe, tagindex, out);
        }
-       Matrix4x4_CreateIdentity(out);
+       *out = identitymatrix;
        return 0;
 }
 
@@ -2280,7 +2280,7 @@ int SV_GetTagMatrix (matrix4x4_t *out, prvm_edict_t *ent, int tagindex)
        matrix4x4_t entitymatrix, tagmatrix, attachmatrix;
        model_t *model;
 
-       Matrix4x4_CreateIdentity(out); // warnings and errors return identical matrix
+       *out = identitymatrix; // warnings and errors return identical matrix
 
        if (ent == prog->edicts)
                return 1;
@@ -2293,7 +2293,7 @@ int SV_GetTagMatrix (matrix4x4_t *out, prvm_edict_t *ent, int tagindex)
 
        model = sv.models[modelindex];
 
-       Matrix4x4_CreateIdentity(&tagmatrix);
+       tagmatrix = identitymatrix;
        // DP_GFX_QUAKE3MODELTAGS, scan all chain and stop on unattached entity
        attachloop = 0;
        for (;;)

diff --git a/view.c b/view.c
index 2a9629c36a15e05c26b6f340679865965872708f..28fe76408f0e0918211441987c58751f38e7c3a5 100644 (file)
--- a/view.c
+++ b/view.c
@@ -325,8 +325,8 @@ void V_CalcRefdef (void)
        if(csqc_loaded)
                return;
        VectorClear(gunorg);
-       Matrix4x4_CreateIdentity(&viewmodelmatrix);
-       Matrix4x4_CreateIdentity(&r_refdef.viewentitymatrix);
+       viewmodelmatrix = identitymatrix;
+       r_refdef.viewentitymatrix = identitymatrix;
        if (cls.state == ca_connected && cls.signon == SIGNONS)
        {
                // ent is the view entity (visible when out of body)