snap curve vertices to solve some finicky collision problems and probably also makes...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4662 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/model_brush.c b/model_brush.c
index 86d65ea4a59d4406ffbd40ab6621f048e87b58de..91dd5a04cbc612d836ea32a5a95e6ca03b588193 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -4302,6 +4302,9 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l)
                        Q3PatchTesselateFloat(3, sizeof(float[3]), out->data_collisionvertex3f, patchsize[0], patchsize[1], sizeof(float[3]), originalvertex3f, xtess, ytess);
                        Q3PatchTriangleElements(out->data_collisionelement3i, finalwidth, finalheight);
 
+                       Mod_SnapVertices(3, out->num_vertices, out->data_vertex3f, 0.25);
+                       Mod_SnapVertices(3, out->num_collisionvertices, out->data_collisionvertex3f, 1);
+
                        oldnumtriangles = out->num_triangles;
                        oldnumtriangles2 = out->num_collisiontriangles;
                        out->num_triangles = Mod_RemoveDegenerateTriangles(out->num_triangles, out->data_element3i, out->data_element3i, out->data_vertex3f);

diff --git a/model_shared.c b/model_shared.c
index 366a03f4088e04b3311e5a49c6dc2054065a09f7..20dc64f7453c87761ed3cf77d9a87d36a05506d5 100644 (file)
--- a/model_shared.c
+++ b/model_shared.c
@@ -1322,6 +1322,14 @@ int Mod_CountSkinFiles(skinfile_t *skinfile)
        return i;
 }
 
+void Mod_SnapVertices(int numcomponents, int numvertices, float *vertices, float snap)
+{
+       int i;
+       double isnap = 1.0 / snap;
+       for (i = 0;i < numvertices*numcomponents;i++)
+               vertices[i] = floor(vertices[i]*isnap)*snap;
+}
+
 int Mod_RemoveDegenerateTriangles(int numtriangles, const int *inelement3i, int *outelement3i, const float *vertex3f)
 {
        int i, outtriangles;

diff --git a/model_shared.h b/model_shared.h
index 830428d7f65adfcc01f1a923d475d960fe26a549..6f57d464c96a2c98ac08a2421ea93d785dff81b7 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -692,6 +692,7 @@ skinfile_t *Mod_LoadSkinFiles(void);
 void Mod_FreeSkinFiles(skinfile_t *skinfile);
 int Mod_CountSkinFiles(skinfile_t *skinfile);
 
+void Mod_SnapVertices(int numcomponents, int numvertices, float *vertices, float snap);
 int Mod_RemoveDegenerateTriangles(int numtriangles, const int *inelement3i, int *outelement3i, const float *vertex3f);
 
 #endif // MODEL_SHARED_H