added GLSL shader path for normal rendering stage, reworked a lot of things to do...

[xonotic/darkplaces.git] / model_brush.c

diff --git a/model_brush.c b/model_brush.c
index 79f4025ea1f0be2b1d68cf0cc14b1befe92efd39..47cf815d4dff80942a594ecc821c80bc13c743e6 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -1052,6 +1052,7 @@ middle sample (the one which was requested)
 void Mod_Q1BSP_LightPoint(model_t *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal)
 {
        Mod_Q1BSP_LightPoint_RecursiveBSPNode(model, ambientcolor, diffusecolor, diffusenormal, model->brush.data_nodes + model->brushq1.hulls[0].firstclipnode, p[0], p[1], p[2], p[2] - 65536);
 void Mod_Q1BSP_LightPoint(model_t *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal)
 {
        Mod_Q1BSP_LightPoint_RecursiveBSPNode(model, ambientcolor, diffusecolor, diffusenormal, model->brush.data_nodes + model->brushq1.hulls[0].firstclipnode, p[0], p[1], p[2], p[2] - 65536);

+       VectorSet(diffusenormal, 0, 0, -1);

 }
 
 static void Mod_Q1BSP_DecompressVis(const unsigned char *in, const unsigned char *inend, unsigned char *out, unsigned char *outend)
 }
 
 static void Mod_Q1BSP_DecompressVis(const unsigned char *in, const unsigned char *inend, unsigned char *out, unsigned char *outend)


@@ -1517,68 +1518,6 @@ static void Mod_Q1BSP_LoadLighting(lump_t *l)
        }
 }
 
        }
 }
 

-static void Mod_Q1BSP_LoadLightList(void)
-{
-       int a, n, numlights;
-       char tempchar, *s, *t, *lightsstring, lightsfilename[1024];
-       mlight_t *e;
-
-       strlcpy (lightsfilename, loadmodel->name, sizeof (lightsfilename));
-       FS_StripExtension (lightsfilename, lightsfilename, sizeof(lightsfilename));
-       strlcat (lightsfilename, ".lights", sizeof (lightsfilename));
-       s = lightsstring = (char *) FS_LoadFile(lightsfilename, tempmempool, false, NULL);
-       if (s)
-       {
-               numlights = 0;
-               while (*s)
-               {
-                       while (*s && *s != '\n' && *s != '\r')
-                               s++;
-                       if (!*s)
-                       {
-                               Mem_Free(lightsstring);
-                               Con_Printf("lights file must end with a newline\n");
-                               return;
-                       }
-                       s++;
-                       numlights++;
-               }
-               loadmodel->brushq1.lights = (mlight_t *)Mem_Alloc(loadmodel->mempool, numlights * sizeof(mlight_t));
-               s = lightsstring;
-               n = 0;
-               while (*s && n < numlights)
-               {
-                       t = s;
-                       while (*s && *s != '\n' && *s != '\r')
-                               s++;
-                       if (!*s)
-                       {
-                               Con_Printf("misparsed lights file!\n");
-                               break;
-                       }
-                       e = loadmodel->brushq1.lights + n;
-                       tempchar = *s;
-                       *s = 0;
-                       a = sscanf(t, "%f %f %f %f %f %f %f %f %f %f %f %f %f %d", &e->origin[0], &e->origin[1], &e->origin[2], &e->falloff, &e->light[0], &e->light[1], &e->light[2], &e->subtract, &e->spotdir[0], &e->spotdir[1], &e->spotdir[2], &e->spotcone, &e->distbias, &e->style);
-                       *s = tempchar;
-                       if (a != 14)
-                       {
-                               Con_Printf("invalid lights file, found %d parameters on line %i, should be 14 parameters (origin[0] origin[1] origin[2] falloff light[0] light[1] light[2] subtract spotdir[0] spotdir[1] spotdir[2] spotcone distancebias style)\n", a, n + 1);
-                               break;
-                       }
-                       if (*s == '\r')
-                               s++;
-                       if (*s == '\n')
-                               s++;
-                       n++;
-               }
-               if (*s)
-                       Con_Printf("misparsed lights file!\n");
-               loadmodel->brushq1.numlights = numlights;
-               Mem_Free(lightsstring);
-       }
-}
-

 static void Mod_Q1BSP_LoadVisibility(lump_t *l)
 {
        loadmodel->brushq1.num_compressedpvs = 0;
 static void Mod_Q1BSP_LoadVisibility(lump_t *l)
 {
        loadmodel->brushq1.num_compressedpvs = 0;


@@ -3200,8 +3139,6 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer, void *bufferend)
 
        mainmempool = mod->mempool;
 
 
        mainmempool = mod->mempool;
 

-       Mod_Q1BSP_LoadLightList();
-

        // make a single combined shadow mesh to allow optimized shadow volume creation
        numshadowmeshtriangles = 0;
        for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)
        // make a single combined shadow mesh to allow optimized shadow volume creation
        numshadowmeshtriangles = 0;
        for (j = 0, surface = loadmodel->data_surfaces;j < loadmodel->num_surfaces;j++, surface++)