From d30c970d8b968e70baadc28ac30450ada6454aaa Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Thu, 9 Feb 2017 14:58:19 -0700 Subject: [PATCH] light: always call MakeEdgeToFaceMap --- include/light/light.hh | 2 ++ light/light.cc | 3 +++ light/light2.cc | 2 -- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/light/light.hh b/include/light/light.hh index 35e5c11e..1bb6f174 100644 --- a/include/light/light.hh +++ b/include/light/light.hh @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -382,6 +383,7 @@ typedef enum { extern backend_t rtbackend; extern qboolean surflight_dump; extern char mapfilename[1024]; +extern edgeToFaceMap_t EdgeToFaceMap; // public functions diff --git a/light/light.cc b/light/light.cc index 5de11651..6eb28839 100644 --- a/light/light.cc +++ b/light/light.cc @@ -109,6 +109,8 @@ int dump_vertnum = -1; bool dump_vert; vec3_t dump_vert_point = {0,0,0}; +edgeToFaceMap_t EdgeToFaceMap; + lockable_setting_t *FindSetting(std::string name) { settingsdict_t sd = cfg_static.settings(); return sd.findSetting(name); @@ -415,6 +417,7 @@ LightWorld(bspdata_t *bspdata, qboolean forcedscale) } } + EdgeToFaceMap = MakeEdgeToFaceMap(bsp); CalcualateVertexNormals(bsp); /* ericw -- alloc memory */ diff --git a/light/light2.cc b/light/light2.cc index e6dab997..d7f12c16 100644 --- a/light/light2.cc +++ b/light/light2.cc @@ -107,8 +107,6 @@ glm::mat4x4 TexSpaceToWorld(const bsp2_t *bsp, const bsp2_dface_t *f) } edgeToFaceMap_t MakeEdgeToFaceMap(const bsp2_t *bsp) { - logprint("--- MakeEdgeToFaceMap ---\n"); - edgeToFaceMap_t result; for (int i = 0; i < bsp->numfaces; i++) {