R_BeginPolygon: if done in 3D stage, make sure depth test is done

[xonotic/darkplaces.git] / clvm_cmds.c

diff --git a/clvm_cmds.c b/clvm_cmds.c
index db6e5f190ebd5618752f6e0bfc45329cdbcc8133..c5b7e7e2dd81f3e32829f266e63707044bb771b2 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -887,22 +887,28 @@ void VM_CL_R_SetView (void)
        case VF_MIN:
                r_refdef.view.x = (int)(f[0]);
                r_refdef.view.y = (int)(f[1]);
+               DrawQ_RecalcView();
                break;
        case VF_MIN_X:
                r_refdef.view.x = (int)(k);
+               DrawQ_RecalcView();
                break;
        case VF_MIN_Y:
                r_refdef.view.y = (int)(k);
+               DrawQ_RecalcView();
                break;
        case VF_SIZE:
                r_refdef.view.width = (int)(f[0]);
                r_refdef.view.height = (int)(f[1]);
+               DrawQ_RecalcView();
                break;
        case VF_SIZE_X:
                r_refdef.view.width = (int)(k);
+               DrawQ_RecalcView();
                break;
        case VF_SIZE_Y:
                r_refdef.view.height = (int)(k);
+               DrawQ_RecalcView();
                break;
        case VF_VIEWPORT:
                r_refdef.view.x = (int)(f[0]);
@@ -910,6 +916,7 @@ void VM_CL_R_SetView (void)
                f = PRVM_G_VECTOR(OFS_PARM2);
                r_refdef.view.width = (int)(f[0]);
                r_refdef.view.height = (int)(f[1]);
+               DrawQ_RecalcView();
                break;
        case VF_FOV:
                r_refdef.view.frustum_x = tan(f[0] * M_PI / 360.0);r_refdef.view.ortho_x = f[0];
@@ -1051,12 +1058,12 @@ static void VM_CL_unproject (void)
 
        VM_SAFEPARMCOUNT(1, VM_CL_unproject);
        f = PRVM_G_VECTOR(OFS_PARM0);
-       if(v_flipped.integer)
-               f[0] = (2 * r_refdef.view.x + r_refdef.view.width) * (vid_conwidth.integer / (float) vid.width) - f[0];
        VectorSet(temp,
                f[2],
-               (-1.0 + 2.0 * (f[0] / (vid_conwidth.integer / (float) vid.width) - r_refdef.view.x) / r_refdef.view.width) * f[2] * -r_refdef.view.frustum_x,
-               (-1.0 + 2.0 * (f[1] / (vid_conheight.integer / (float) vid.height) - r_refdef.view.y) / r_refdef.view.height) * f[2] * -r_refdef.view.frustum_y);
+               (-1.0 + 2.0 * (f[0] / vid_conwidth.integer)) * f[2] * -r_refdef.view.frustum_x,
+               (-1.0 + 2.0 * (f[1] / vid_conheight.integer)) * f[2] * -r_refdef.view.frustum_y);
+       if(v_flipped.integer)
+               temp[1] = -temp[1];
        Matrix4x4_Transform(&r_refdef.view.matrix, temp, PRVM_G_VECTOR(OFS_RETURN));
 }
 
@@ -1074,9 +1081,12 @@ static void VM_CL_project (void)
        if(v_flipped.integer)
                v[1] = -v[1];
        VectorSet(PRVM_G_VECTOR(OFS_RETURN),
-               (vid_conwidth.integer / (float) vid.width) * (r_refdef.view.x + r_refdef.view.width*0.5*(1.0+v[1]/v[0]/-r_refdef.view.frustum_x)),
-               (vid_conheight.integer / (float) vid.height) * (r_refdef.view.y + r_refdef.view.height*0.5*(1.0+v[2]/v[0]/-r_refdef.view.frustum_y)),
+               vid_conwidth.integer * (0.5*(1.0+v[1]/v[0]/-r_refdef.view.frustum_x)),
+               vid_conheight.integer * (0.5*(1.0+v[2]/v[0]/-r_refdef.view.frustum_y)),
                v[0]);
+       // explanation:
+       // after transforming, relative position to viewport (0..1) = 0.5 * (1 + v[2]/v[0]/-frustum_{x \or y})
+       // as 2D drawing honors the viewport too, to get the same pixel, we simply multiply this by conwidth/height
 }
 
 //#330 float(float stnum) getstatf (EXT_CSQC)
@@ -1248,7 +1258,7 @@ static void VM_CL_pointparticles (void)
 static void VM_CL_boxparticles (void)
 {
        int effectnum;
-       prvm_edict_t *own;
+       // prvm_edict_t *own;
        float *origin_from, *origin_to, *dir_from, *dir_to;
        float count;
        int flags;
@@ -1257,7 +1267,7 @@ static void VM_CL_boxparticles (void)
        VM_SAFEPARMCOUNTRANGE(7, 8, VM_CL_boxparticles);
 
        effectnum = (int)PRVM_G_FLOAT(OFS_PARM0);
-       own = PRVM_G_EDICT(OFS_PARM1); // TODO find use for this
+       // own = PRVM_G_EDICT(OFS_PARM1); // TODO find use for this
        origin_from = PRVM_G_VECTOR(OFS_PARM2);
        origin_to = PRVM_G_VECTOR(OFS_PARM3);
        dir_from = PRVM_G_VECTOR(OFS_PARM4);
@@ -2954,6 +2964,7 @@ typedef struct vmpolygons_triangle_s
 {
        rtexture_t              *texture;
        int                             drawflag;
+       qboolean hasalpha;
        unsigned short  elements[3];
 }vmpolygons_triangle_t;
 
@@ -2981,6 +2992,7 @@ typedef struct vmpolygons_s
        float                   begin_vertex[VMPOLYGONS_MAXPOINTS][3];
        float                   begin_color[VMPOLYGONS_MAXPOINTS][4];
        float                   begin_texcoord[VMPOLYGONS_MAXPOINTS][2];
+       qboolean                begin_texture_hasalpha;
 } vmpolygons_t;
 
 // FIXME: make VM_CL_R_Polygon functions use Debug_Polygon functions?
@@ -3063,6 +3075,7 @@ static void VM_DrawPolygonCallback (const entity_render_t *ent, const rtlight_t
        R_Mesh_ResetTextureState();
        R_EntityMatrix(&identitymatrix);
        GL_CullFace(GL_NONE);
+       GL_DepthTest(true); // polys in 3D space shall always have depth test
        R_Mesh_PrepareVertices_Generic_Arrays(polys->num_vertices, polys->data_vertex3f, polys->data_color4f, polys->data_texcoord2f);
 
        for (surfacelistindex = 0;surfacelistindex < numsurfaces;)
@@ -3070,18 +3083,7 @@ static void VM_DrawPolygonCallback (const entity_render_t *ent, const rtlight_t
                int numtriangles = 0;
                rtexture_t *tex = polys->data_triangles[surfacelist[surfacelistindex]].texture;
                int drawflag = polys->data_triangles[surfacelist[surfacelistindex]].drawflag;
-               // this can't call _DrawQ_ProcessDrawFlag, but should be in sync with it
-               // FIXME factor this out
-               if(drawflag == DRAWFLAG_ADDITIVE)
-                       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
-               else if(drawflag == DRAWFLAG_MODULATE)
-                       GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
-               else if(drawflag == DRAWFLAG_2XMODULATE)
-                       GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
-               else if(drawflag == DRAWFLAG_SCREEN)
-                       GL_BlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
-               else
-                       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+               DrawQ_ProcessDrawFlag(drawflag, polys->data_triangles[surfacelist[surfacelistindex]].hasalpha);
                R_SetupShader_Generic(tex, NULL, GL_MODULATE, 1);
                numtriangles = 0;
                for (;surfacelistindex < numsurfaces;surfacelistindex++)
@@ -3097,6 +3099,15 @@ static void VM_DrawPolygonCallback (const entity_render_t *ent, const rtlight_t
 
 void VMPolygons_Store(vmpolygons_t *polys)
 {
+       qboolean hasalpha;
+       int i;
+
+       // detect if we have alpha
+       hasalpha = polys->begin_texture_hasalpha;
+       for(i = 0; !hasalpha && (i < polys->begin_vertices); ++i)
+               if(polys->begin_color[i][3] < 1)
+                       hasalpha = true;
+
        if (r_refdef.draw2dstage)
        {
                // draw the polygon as 2D immediately
@@ -3109,7 +3120,7 @@ void VMPolygons_Store(vmpolygons_t *polys)
                mesh.data_vertex3f = polys->begin_vertex[0];
                mesh.data_color4f = polys->begin_color[0];
                mesh.data_texcoord2f = polys->begin_texcoord[0];
-               DrawQ_Mesh(&mesh, polys->begin_drawflag);
+               DrawQ_Mesh(&mesh, polys->begin_drawflag, hasalpha);
        }
        else
        {
@@ -3136,6 +3147,7 @@ void VMPolygons_Store(vmpolygons_t *polys)
                                polys->data_triangles[polys->num_triangles].elements[0] = polys->num_vertices;
                                polys->data_triangles[polys->num_triangles].elements[1] = polys->num_vertices + i+1;
                                polys->data_triangles[polys->num_triangles].elements[2] = polys->num_vertices + i+2;
+                               polys->data_triangles[polys->num_triangles].hasalpha = hasalpha;
                                polys->num_triangles++;
                        }
                        polys->num_vertices += polys->begin_vertices;
@@ -3219,6 +3231,7 @@ void VM_CL_R_PolygonBegin (void)
        }
 
        polys->begin_texture = (sf && sf->base) ? sf->base : r_texture_white;
+       polys->begin_texture_hasalpha = (sf && sf->base) ? sf->hasalpha : false;
        polys->begin_drawflag = (int)PRVM_G_FLOAT(OFS_PARM1) & DRAWFLAG_MASK;
        polys->begin_vertices = 0;
        polys->begin_active = true;