X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gl_rmain.c;h=b2c5683df8c1dd7e8418690658d8a99e4020c5b4;hb=9e279d8ea4a631713d98132cd1b01338e81f5c0b;hp=fa49f791629dcba2cf89ffeab3cacf4a858ad185;hpb=0f3e880c9e2d7f490bfb4e8a1c318bd7428a695b;p=xonotic%2Fdarkplaces.git diff --git a/gl_rmain.c b/gl_rmain.c index fa49f791..b2c5683d 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -1232,15 +1232,6 @@ void R_RenderScene(void) r_refdef.worldmodel->Draw(r_refdef.worldentity); R_TimeReport("world"); } - - R_DrawLightningBeams(); - R_TimeReport("lightning"); - - R_DrawParticles(); - R_TimeReport("particles"); - - R_DrawExplosions(); - R_TimeReport("explosions"); } // don't let sound skip if going slow @@ -1266,6 +1257,18 @@ void R_RenderScene(void) GL_ShowTrisColor(0.1, 0, 0, 1); + if (cl.csqc_vidvars.drawworld) + { + R_DrawLightningBeams(); + R_TimeReport("lightning"); + + R_DrawParticles(); + R_TimeReport("particles"); + + R_DrawExplosions(); + R_TimeReport("explosions"); + } + R_MeshQueue_RenderTransparent(); R_TimeReport("drawtrans"); @@ -1566,7 +1569,7 @@ void R_Mesh_AddBrushMeshFromPlanes(rmesh_t *mesh, int numplanes, mplane_t *plane { if (planenum2 == planenum) continue; - PolygonF_Divide(tempnumpoints, temppoints[w], plane2->normal[0], plane2->normal[1], plane2->normal[2], plane2->dist, 1.0/32.0, 0, NULL, NULL, 256, temppoints[!w], &tempnumpoints); + PolygonF_Divide(tempnumpoints, temppoints[w], plane2->normal[0], plane2->normal[1], plane2->normal[2], plane2->dist, 1.0/32.0, 0, NULL, NULL, 256, temppoints[!w], &tempnumpoints, NULL); w = !w; } if (tempnumpoints < 3)