handle funky ToAscii values (shift/ctrl/alt sometimes produce ascii values for no...

[xonotic/darkplaces.git] / gl_rsurf.c

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 16b77efb0e0f93b93bc193df8aac71421209bfe4..255a49b3640bfc7713a1fd97346a35096cc6d2d2 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -249,7 +249,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
 
        // set to full bright if no light data
                bl = intblocklights;
-               if ((ent->effects & EF_FULLBRIGHT) || !ent->model->brushq1.lightdata)
+               if (!ent->model->brushq1.lightdata)
                {
                        for (i = 0;i < size3;i++)
                                bl[i] = 255*256;
@@ -337,7 +337,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
 
        // set to full bright if no light data
                bl = floatblocklights;
-               if ((ent->effects & EF_FULLBRIGHT) || !ent->model->brushq1.lightdata)
+               if (!ent->model->brushq1.lightdata)
                        j = 255*256;
                else
                        j = r_ambient.value * 512.0f; // would be 128.0f logically, but using 512.0f to match winquake style
@@ -780,7 +780,7 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
        }
 
        R_Mesh_Matrix(&ent->matrix);
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
 
        memset(&m, 0, sizeof(m));
        texture = surf->texinfo->texture->currentframe;
@@ -892,7 +892,7 @@ static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const m
        float base, colorscale;
        rmeshstate_t m;
        float modelorg[3];
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
        memset(&m, 0, sizeof(m));
        if (rendertype == SURFRENDER_ADD)
        {
@@ -939,7 +939,7 @@ static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurfac
 {
        rmeshstate_t m;
        float modelorg[3];
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
        memset(&m, 0, sizeof(m));
        GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
        GL_DepthMask(false);
@@ -959,7 +959,7 @@ static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface
 {
        rmeshstate_t m;
        float modelorg[3];
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
        memset(&m, 0, sizeof(m));
        GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
        GL_DepthMask(false);
@@ -1099,7 +1099,7 @@ static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const te
        const msurface_t *surf;
        rmeshstate_t m;
        float modelorg[3];
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
        memset(&m, 0, sizeof(m));
        GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
        GL_DepthMask(false);
@@ -1232,6 +1232,16 @@ static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const texture_
                        }
                }
        }
+       else if (ent->effects & EF_FULLBRIGHT)
+       {
+               RSurfShader_OpaqueWall_Pass_BaseTexture(ent, texture, surfchain);
+               if (r_detailtextures.integer)
+                       RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain);
+               if (texture->skin.glow)
+                       RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain);
+               if (fogenabled)
+                       RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
+       }
        else if (r_shadow_realtime_world.integer)
        {
                // opaque base lighting
@@ -1326,7 +1336,7 @@ void R_PrepareSurfaces(entity_render_t *ent)
                return;
 
        model = ent->model;
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
        numsurfaces = model->brushq1.nummodelsurfaces;
        surfaces = model->brushq1.surfaces + model->brushq1.firstmodelsurface;
        surfacevisframes = model->brushq1.surfacevisframes + model->brushq1.firstmodelsurface;
@@ -1416,7 +1426,7 @@ static void R_DrawPortal_Callback(const void *calldata1, int calldata2)
                         ((i & 0x0038) >> 3) * (1.0f / 7.0f),
                         ((i & 0x01C0) >> 6) * (1.0f / 7.0f),
                         0.125f);
-       if (PlaneDiff(r_origin, (&portal->plane)) < 0)
+       if (PlaneDiff(r_vieworigin, (&portal->plane)) < 0)
        {
                for (i = portal->numpoints - 1, v = varray_vertex3f;i >= 0;i--, v += 3)
                        VectorCopy(portal->points[i].position, v);
@@ -1465,7 +1475,7 @@ void R_PrepareBrushModel(entity_render_t *ent)
        if (model == NULL)
                return;
 #if WORLDNODECULLBACKFACES
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
 #endif
        numsurfaces = model->brushq1.nummodelsurfaces;
        surf = model->brushq1.surfaces + model->brushq1.firstmodelsurface;
@@ -1504,7 +1514,7 @@ void R_SurfaceWorldNode (entity_render_t *ent)
                return;
        surfacevisframes = model->brushq1.surfacevisframes + model->brushq1.firstmodelsurface;
        surfacepvsframes = model->brushq1.surfacepvsframes + model->brushq1.firstmodelsurface;
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
 
        for (leaf = model->brushq1.pvsleafchain;leaf;leaf = leaf->pvschain)
        {
@@ -1556,7 +1566,7 @@ static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf)
        // RecursiveWorldNode
        surfaces = ent->model->brushq1.surfaces;
        surfacevisframes = ent->model->brushq1.surfacevisframes;
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
        viewleaf->worldnodeframe = r_framecount;
        leafstack[0] = viewleaf;
        leafstackpos = 1;
@@ -1652,7 +1662,7 @@ void R_WorldVisibility(entity_render_t *ent)
        vec3_t modelorg;
        mleaf_t *viewleaf;
 
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
        viewleaf = (ent->model && ent->model->brushq1.PointInLeaf) ? ent->model->brushq1.PointInLeaf(ent->model, modelorg) : NULL;
        R_PVSUpdate(ent, viewleaf);
 
@@ -1786,6 +1796,7 @@ void R_Q3BSP_DrawSkyFace(entity_render_t *ent, q3mface_t *face)
        rmeshstate_t m;
        if (!face->num_triangles)
                return;
+       c_faces++;
        if (skyrendernow)
        {
                skyrendernow = false;
@@ -1917,8 +1928,23 @@ void R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureVertex(entity_render_t *ent, q3mfac
        GL_DepthTest(true);
        m.tex[0] = R_GetTexture(face->texture->skin.base);
        m.pointer_texcoord[0] = face->data_texcoordtexture2f;
-       m.texrgbscale[0] = 2;
-       GL_ColorPointer(face->data_color4f);
+       if (gl_combine.integer)
+       {
+               m.texrgbscale[0] = 2;
+               GL_ColorPointer(face->data_color4f);
+       }
+       else
+       {
+               int i;
+               for (i = 0;i < face->num_vertices;i++)
+               {
+                       varray_color4f[i*4+0] = face->data_color4f[i*4+0] * 2.0f;
+                       varray_color4f[i*4+1] = face->data_color4f[i*4+1] * 2.0f;
+                       varray_color4f[i*4+2] = face->data_color4f[i*4+2] * 2.0f;
+                       varray_color4f[i*4+3] = face->data_color4f[i*4+3];
+               }
+               GL_ColorPointer(varray_color4f);
+       }
        R_Mesh_State_Texture(&m);
        GL_VertexPointer(face->data_vertex3f);
        R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
@@ -1939,21 +1965,90 @@ void R_Q3BSP_DrawFace_OpaqueWall_Pass_AddTextureAmbient(entity_render_t *ent, q3
        R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
 }
 
+void R_Q3BSP_DrawFace_TransparentCallback(const void *voident, int facenumber)
+{
+       const entity_render_t *ent = voident;
+       q3mface_t *face = ent->model->brushq3.data_faces + facenumber;
+       rmeshstate_t m;
+       R_Mesh_Matrix(&ent->matrix);
+       memset(&m, 0, sizeof(m));
+       if (ent->effects & EF_ADDITIVE)
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       else
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       GL_DepthMask(false);
+       GL_DepthTest(true);
+       m.tex[0] = R_GetTexture(face->texture->skin.base);
+       m.pointer_texcoord[0] = face->data_texcoordtexture2f;
+       // LordHavoc: quake3 was not able to do this; lit transparent surfaces
+       if (gl_combine.integer)
+       {
+               m.texrgbscale[0] = 2;
+               if (r_textureunits.integer >= 2)
+               {
+                       m.tex[1] = R_GetTexture(face->lightmaptexture);
+                       m.pointer_texcoord[1] = face->data_texcoordlightmap2f;
+                       GL_Color(1, 1, 1, ent->alpha);
+               }
+               else
+               {
+                       if (ent->alpha == 1)
+                               GL_ColorPointer(face->data_color4f);
+                       else
+                       {
+                               int i;
+                               for (i = 0;i < face->num_vertices;i++)
+                               {
+                                       varray_color4f[i*4+0] = face->data_color4f[i*4+0];
+                                       varray_color4f[i*4+1] = face->data_color4f[i*4+1];
+                                       varray_color4f[i*4+2] = face->data_color4f[i*4+2];
+                                       varray_color4f[i*4+3] = face->data_color4f[i*4+3] * ent->alpha;
+                               }
+                               GL_ColorPointer(varray_color4f);
+                       }
+               }
+       }
+       else
+       {
+               int i;
+               for (i = 0;i < face->num_vertices;i++)
+               {
+                       varray_color4f[i*4+0] = face->data_color4f[i*4+0] * 2.0f;
+                       varray_color4f[i*4+1] = face->data_color4f[i*4+1] * 2.0f;
+                       varray_color4f[i*4+2] = face->data_color4f[i*4+2] * 2.0f;
+                       varray_color4f[i*4+3] = face->data_color4f[i*4+3] * ent->alpha;
+               }
+               GL_ColorPointer(varray_color4f);
+       }
+       R_Mesh_State_Texture(&m);
+       GL_VertexPointer(face->data_vertex3f);
+       qglDisable(GL_CULL_FACE);
+       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
+       qglEnable(GL_CULL_FACE);
+}
+
 void R_Q3BSP_DrawFace(entity_render_t *ent, q3mface_t *face)
 {
        if (!face->num_triangles)
                return;
-       if (face->texture->renderflags)
+       if (face->texture->surfaceparms)
        {
-               if (face->texture->renderflags & Q3MTEXTURERENDERFLAGS_SKY)
-                       return;
-               if (face->texture->renderflags & Q3MTEXTURERENDERFLAGS_NODRAW)
+               if (face->texture->surfaceflags & (Q3SURFACEFLAG_SKY | Q3SURFACEFLAG_NODRAW))
                        return;
        }
-       if (face->texture->nativecontents & CONTENTSQ3_TRANSLUCENT)
-               qglDisable(GL_CULL_FACE);
-       R_Mesh_Matrix(&ent->matrix);
+       c_faces++;
        face->visframe = r_framecount;
+       if ((face->texture->surfaceparms & Q3SURFACEPARM_TRANS) || ent->alpha < 1 || (ent->effects & EF_ADDITIVE))
+       {
+               vec3_t facecenter, center;
+               facecenter[0] = (face->mins[0] + face->maxs[0]) * 0.5f;
+               facecenter[1] = (face->mins[1] + face->maxs[1]) * 0.5f;
+               facecenter[2] = (face->mins[2] + face->maxs[2]) * 0.5f;
+               Matrix4x4_Transform(&ent->matrix, facecenter, center);
+               R_MeshQueue_AddTransparent(center, R_Q3BSP_DrawFace_TransparentCallback, ent, face - ent->model->brushq3.data_faces);
+               return;
+       }
+       R_Mesh_Matrix(&ent->matrix);
        if (r_shadow_realtime_world.integer)
                R_Q3BSP_DrawFace_OpaqueWall_Pass_OpaqueGlow(ent, face);
        else if ((ent->effects & EF_FULLBRIGHT) || r_fullbright.integer)
@@ -1982,8 +2077,6 @@ void R_Q3BSP_DrawFace(entity_render_t *ent, q3mface_t *face)
        }
        if (r_ambient.value)
                R_Q3BSP_DrawFace_OpaqueWall_Pass_AddTextureAmbient(ent, face);
-       if (face->texture->nativecontents & CONTENTSQ3_TRANSLUCENT)
-               qglEnable(GL_CULL_FACE);
 }
 
 void R_Q3BSP_RecursiveWorldNode(entity_render_t *ent, q3mnode_t *node, const vec3_t modelorg, qbyte *pvs, int markframe)
@@ -1994,11 +2087,13 @@ void R_Q3BSP_RecursiveWorldNode(entity_render_t *ent, q3mnode_t *node, const vec
        {
                if (R_CullBox(node->mins, node->maxs))
                        return;
+               c_nodes++;
                R_Q3BSP_RecursiveWorldNode(ent, node->children[0], modelorg, pvs, markframe);
                node = node->children[1];
        }
        if (R_CullBox(node->mins, node->maxs))
                return;
+       c_leafs++;
        leaf = (q3mleaf_t *)node;
        if (pvs[leaf->clusterindex >> 3] & (1 << (leaf->clusterindex & 7)))
                for (i = 0;i < leaf->numleaffaces;i++)
@@ -2018,7 +2113,7 @@ void R_Q3BSP_DrawSky(entity_render_t *ent)
        model = ent->model;
        if (r_drawcollisionbrushes.integer < 2)
        {
-               Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+               Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
                if (ent == &cl_entities[0].render && model->brushq3.num_pvsclusters && !r_novis.integer && (pvs = model->brush.GetPVS(model, modelorg)))
                {
                        if (r_q3bsp_framecount != r_framecount)
@@ -2027,12 +2122,12 @@ void R_Q3BSP_DrawSky(entity_render_t *ent)
                                R_Q3BSP_RecursiveWorldNode(ent, model->brushq3.data_nodes, modelorg, pvs, r_framecount);
                        }
                        for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++)
-                               if (face->markframe == r_framecount && (face->texture->renderflags & Q3MTEXTURERENDERFLAGS_SKY) && !R_CullBox(face->mins, face->maxs))
+                               if (face->markframe == r_framecount && (face->texture->surfaceflags & Q3SURFACEFLAG_SKY) && !R_CullBox(face->mins, face->maxs))
                                        R_Q3BSP_DrawSkyFace(ent, face);
                }
                else
                        for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++)
-                               if ((face->texture->renderflags & Q3MTEXTURERENDERFLAGS_SKY))
+                               if ((face->texture->surfaceflags & Q3SURFACEFLAG_SKY))
                                        R_Q3BSP_DrawSkyFace(ent, face);
        }
 }
@@ -2048,7 +2143,7 @@ void R_Q3BSP_Draw(entity_render_t *ent)
        model = ent->model;
        if (r_drawcollisionbrushes.integer < 2)
        {
-               Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+               Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
                if (ent == &cl_entities[0].render && model->brushq3.num_pvsclusters && !r_novis.integer && (pvs = model->brush.GetPVS(model, modelorg)))
                {
                        if (r_q3bsp_framecount != r_framecount)
@@ -2090,7 +2185,7 @@ void R_Q3BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin,
        {
                model = ent->model;
                R_Mesh_Matrix(&ent->matrix);
-               Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+               Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
                lightmins[0] = relativelightorigin[0] - lightradius;
                lightmins[1] = relativelightorigin[1] - lightradius;
                lightmins[2] = relativelightorigin[2] - lightradius;
@@ -2108,7 +2203,7 @@ void R_Q3BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin,
 
 void R_Q3BSP_DrawFaceLight(entity_render_t *ent, q3mface_t *face, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz)
 {
-       if ((face->texture->renderflags & Q3MTEXTURERENDERFLAGS_NODRAW) || !face->num_triangles)
+       if ((face->texture->surfaceflags & Q3SURFACEFLAG_NODRAW) || !face->num_triangles)
                return;
        R_Shadow_DiffuseLighting(face->num_vertices, face->num_triangles, face->data_element3i, face->data_vertex3f, face->data_svector3f, face->data_tvector3f, face->data_normal3f, face->data_texcoordtexture2f, relativelightorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, face->texture->skin.base, face->texture->skin.nmap, NULL);
        R_Shadow_SpecularLighting(face->num_vertices, face->num_triangles, face->data_element3i, face->data_vertex3f, face->data_svector3f, face->data_tvector3f, face->data_normal3f, face->data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, face->texture->skin.gloss, face->texture->skin.nmap, NULL);
@@ -2126,7 +2221,7 @@ void R_Q3BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t
        {
                model = ent->model;
                R_Mesh_Matrix(&ent->matrix);
-               Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+               Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
                lightmins[0] = relativelightorigin[0] - lightradius;
                lightmins[1] = relativelightorigin[1] - lightradius;
                lightmins[2] = relativelightorigin[2] - lightradius;