olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

light: track interior verts for normal interpolation (not used currently)

This commit is contained in:
Eric Wasylishen 2016-04-14 15:13:01 -06:00
parent 665514ccbf
commit 32b48a443b
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
light/light.cc
View File

@ -337,6 +337,8 @@ public:
}; };
std::map<const bsp2_dface_t *, std::vector<vec3_struct_t>> vertex_normals; std::map<const bsp2_dface_t *, std::vector<vec3_struct_t>> vertex_normals;
std::set<int> interior_verts;
/* given a triangle, just adds the contribution from the triangle to the given vertexes normals, based upon angles at the verts. /* given a triangle, just adds the contribution from the triangle to the given vertexes normals, based upon angles at the verts.
* v1, v2, v3 are global vertex indices */ * v1, v2, v3 are global vertex indices */
@ -382,11 +384,27 @@ const vec_t *GetSurfaceVertexNormal(const bsp2_t *bsp, const bsp2_dface_t *f, co
return face_normals_vector[vertindex].v; return face_normals_vector[vertindex].v;
} }
static bool
FacesOnSamePlane(const std::vector<const bsp2_dface_t *> &faces)
{
if (faces.empty()) {
return false;
}
const int32_t planenum = faces.at(0)->planenum;
for (auto face : faces) {
if (face->planenum != planenum) {
return false;
}
}
return true;
}
static void static void
CalcualateVertexNormals(const bsp2_t *bsp) CalcualateVertexNormals(const bsp2_t *bsp)
{ {
// clear in case we are run twice // clear in case we are run twice
vertex_normals.clear(); vertex_normals.clear();
interior_verts.clear();
// read _phong and _phong_angle from entities for compatiblity with other qbsp's, at the expense of no // read _phong and _phong_angle from entities for compatiblity with other qbsp's, at the expense of no
// support on func_detail/func_group // support on func_detail/func_group
@ -415,6 +433,15 @@ CalcualateVertexNormals(const bsp2_t *bsp)
} }
} }
// track "interior" verts, these are in the middle of a face, and mess up normal interpolation
for (int i=0; i<bsp->numvertexes; i++) {
auto &faces = vertsToFaces[i];
if (faces.size() > 1 && FacesOnSamePlane(faces)) {
interior_verts.insert(i);
}
}
printf("CalcualateVertexNormals: %d interior verts\n", (int)interior_verts.size());
// build the "face -> faces to smooth with" map // build the "face -> faces to smooth with" map
std::map<const bsp2_dface_t *, std::set<const bsp2_dface_t *>> smoothFaces; std::map<const bsp2_dface_t *, std::set<const bsp2_dface_t *>> smoothFaces;
for (int i = 0; i < bsp->numfaces; i++) { for (int i = 0; i < bsp->numfaces; i++) {