Tweak limits, to make this more like in Half-Life 2 :)

[xonotic/darkplaces.git] / model_brush.c

diff --git a/model_brush.c b/model_brush.c
index e62037231e962cd64e690c435958dbf261e30480..9a776cbd71b602f29b92ce5db351237c304dffda 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -3686,7 +3686,7 @@ void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
                                mod->DrawSky = R_Q1BSP_DrawSky;
 
                        for (j = 0, surface = &mod->data_surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surface++)
-                               if (surface->texture->basematerialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION))
+                               if (surface->texture->basematerialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION | MATERIALFLAG_CAMERA))
                                        break;
                        if (j < mod->nummodelsurfaces)
                                mod->DrawAddWaterPlanes = R_Q1BSP_DrawAddWaterPlanes;
@@ -4281,13 +4281,10 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l)
                strlcpy (out[i].name, in[i].name, sizeof (out[i].name));
                out[i].surfaceflags = LittleLong(in[i].surfaceflags);
                out[i].supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in[i].contents));
-               if (cls.state != ca_dedicated)
-               {
-                       Mod_LoadTextureFromQ3Shader(out + i, out[i].name, true, true, TEXF_MIPMAP | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS);
-                       // restore the surfaceflags and supercontents
-                       out[i].surfaceflags = LittleLong(in[i].surfaceflags);
-                       out[i].supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in[i].contents));
-               }
+               Mod_LoadTextureFromQ3Shader(out + i, out[i].name, true, true, TEXF_MIPMAP | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS);
+               // restore the surfaceflags and supercontents
+               out[i].surfaceflags = LittleLong(in[i].surfaceflags);
+               out[i].supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in[i].contents));
        }
 }
 
@@ -5761,7 +5758,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
        vec_t backdist1;
        vec_t backdist2;
        vec_t backfrac;
-       vec3_t clipped[2];
+       vec3_t clipped, newstart, newend;
 #endif
        vec3_t segmentmins;
        vec3_t segmentmaxs;
@@ -5826,8 +5823,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // START end START END
 #ifdef BIHLINECLIP
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[0]);
-                       start = clipped[0];
+                       VectorLerp(start, frontfrac, end, newstart); start = newstart;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5841,8 +5837,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
 #ifdef BIHLINECLIP
                        // start END START END
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[0]);
-                       end = clipped[0];
+                       VectorLerp(start, frontfrac, end, newend); end = newend;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5860,8 +5855,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, end, linestart, lineend);
 #ifdef BIHLINECLIP
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       end = clipped[0];
+                       VectorLerp(start, backfrac, end, newend); end = newend;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5875,11 +5869,10 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // START end start END
 #ifdef BIHLINECLIP
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[1]);
-                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped[1], end, linestart, lineend);
+                       VectorLerp(start, frontfrac, end, clipped);
+                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped, end, linestart, lineend);
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       end = clipped[0];
+                       VectorLerp(start, backfrac, end, newend); end = newend;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5895,11 +5888,10 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // start END start END
 #ifdef BIHLINECLIP
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[1]);
-                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped[1], linestart, lineend);
+                       VectorLerp(start, frontfrac, end, clipped);
+                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped, linestart, lineend);
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       end = clipped[0];
+                       VectorLerp(start, backfrac, end, newend); end = newend;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5915,8 +5907,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // START END start END
 #ifdef BIHLINECLIP
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       end = clipped[0];
+                       VectorLerp(start, backfrac, end, newend); end = newend;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5931,8 +5922,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, end, linestart, lineend);
 #ifdef BIHLINECLIP
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       start = clipped[0];
+                       VectorLerp(start, backfrac, end, newstart); start = newstart;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5946,11 +5936,10 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // START end START end
 #ifdef BIHLINECLIP
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[1]);
-                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped[1], end, linestart, lineend);
+                       VectorLerp(start, frontfrac, end, clipped);
+                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped, end, linestart, lineend);
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       start = clipped[0];
+                       VectorLerp(start, backfrac, end, newstart); start = newstart;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5966,11 +5955,10 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // start END START end
 #ifdef BIHLINECLIP
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[1]);
-                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped[1], linestart, lineend);
+                       VectorLerp(start, frontfrac, end, clipped);
+                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped, linestart, lineend);
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       start = clipped[0];
+                       VectorLerp(start, backfrac, end, newstart); start = newstart;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -5986,8 +5974,7 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // START END START end
 #ifdef BIHLINECLIP
                        backfrac = backdist1 / (backdist1 - backdist2);
-                       VectorLerp(start, backfrac, end, clipped[0]);
-                       start = clipped[0];
+                       VectorLerp(start, backfrac, end, newstart); start = newstart;
                        segmentmins[0] = min(start[0], end[0]);
                        segmentmins[1] = min(start[1], end[1]);
                        segmentmins[2] = min(start[2], end[2]);
@@ -6006,8 +5993,8 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // START end start end
 #ifdef BIHLINECLIP
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[1]);
-                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped[1], end, linestart, lineend);
+                       VectorLerp(start, frontfrac, end, clipped);
+                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, clipped, end, linestart, lineend);
 #else
                        Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, end, linestart, lineend);
 #endif
@@ -6017,8 +6004,8 @@ static void Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace_t *trace, dp_model
                        // start END start end
 #ifdef BIHLINECLIP
                        frontfrac = frontdist1 / (frontdist1 - frontdist2);
-                       VectorLerp(start, frontfrac, end, clipped[1]);
-                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped[1], linestart, lineend);
+                       VectorLerp(start, frontfrac, end, clipped);
+                       Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, clipped, linestart, lineend);
 #else
                        Mod_CollisionBIH_TraceLine_RecursiveBIHNode(trace, model, node->front, start, end, linestart, lineend);
 #endif
@@ -7040,7 +7027,7 @@ void Mod_Q3BSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
                        mod->DrawSky = R_Q1BSP_DrawSky;
 
                for (j = 0;j < mod->nummodelsurfaces;j++)
-                       if (mod->data_surfaces[j + mod->firstmodelsurface].texture->basematerialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION))
+                       if (mod->data_surfaces[j + mod->firstmodelsurface].texture->basematerialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION | MATERIALFLAG_CAMERA))
                                break;
                if (j < mod->nummodelsurfaces)
                        mod->DrawAddWaterPlanes = R_Q1BSP_DrawAddWaterPlanes;