From 06f02a276525b46b27a343a5bb3f89e2eb736473 Mon Sep 17 00:00:00 2001 From: Spoike Date: Thu, 20 Oct 2005 20:02:33 +0000 Subject: [PATCH] don't light alias models, and use shaders on md3s again. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1520 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/gl/gl_alias.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/engine/gl/gl_alias.c b/engine/gl/gl_alias.c index 854a4ceda..97b1eb2f1 100644 --- a/engine/gl/gl_alias.c +++ b/engine/gl/gl_alias.c @@ -2203,6 +2203,8 @@ void R_DrawMeshBumpmap(mesh_t *mesh, galiastexnum_t *skin, vec3_t lightdir) else qglCullFace ( GL_FRONT ); + qglEnable(GL_BLEND); + qglVertexPointer(3, GL_FLOAT, 0, mesh->xyz_array); qglEnableClientState( GL_VERTEX_ARRAY ); @@ -2294,7 +2296,7 @@ void R_DrawMeshBumpmap(mesh_t *mesh, galiastexnum_t *skin, vec3_t lightdir) void R_DrawGAliasModelLighting (entity_t *e, vec3_t lightpos, vec3_t colours, float radius) { -#if 1 +#if 0 //glitches, no attenuation... :( model_t *clmodel = e->model; vec3_t mins, maxs; @@ -2303,9 +2305,12 @@ void R_DrawGAliasModelLighting (entity_t *e, vec3_t lightpos, vec3_t colours, fl galiastexnum_t *tex; mesh_t mesh; int surfnum; + extern cvar_t r_nolightdir; if (e->flags & Q2RF_VIEWERMODEL) return; + if (r_nolightdir.value) //are you crazy? + return; //Total insanity with r_shadows 2... // if (!strcmp (clmodel->name, "progs/flame2.mdl")) @@ -4015,7 +4020,7 @@ void GL_LoadQ3Model(model_t *mod, void *buffer) #ifndef SERVERONLY if (LittleLong(surf->numShaders)+externalskins) { -#ifndef Q3SHADERS +#if 1//ndef Q3SHADERS char name[1024]; extern int gl_bumpmappingpossible; #endif