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

light: always call MakeEdgeToFaceMap

This commit is contained in:
Eric Wasylishen 2017-02-09 14:58:19 -07:00
parent b9d0de0ec8
commit d30c970d8b
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/light/light.hh
View File

@ -30,6 +30,7 @@
#include <light/litfile.hh> #include <light/litfile.hh>
#include <light/trace.hh> #include <light/trace.hh>
#include <light/settings.hh> #include <light/settings.hh>
#include <light/light2.hh>
#include <vector> #include <vector>
#include <map> #include <map>
@ -382,6 +383,7 @@ typedef enum {
extern backend_t rtbackend; extern backend_t rtbackend;
extern qboolean surflight_dump; extern qboolean surflight_dump;
extern char mapfilename[1024]; extern char mapfilename[1024];
extern edgeToFaceMap_t EdgeToFaceMap;
// public functions // public functions

3
light/light.cc
View File

@ -109,6 +109,8 @@ int dump_vertnum = -1;
bool dump_vert; bool dump_vert;
vec3_t dump_vert_point = {0,0,0}; vec3_t dump_vert_point = {0,0,0};
edgeToFaceMap_t EdgeToFaceMap;
lockable_setting_t *FindSetting(std::string name) { lockable_setting_t *FindSetting(std::string name) {
settingsdict_t sd = cfg_static.settings(); settingsdict_t sd = cfg_static.settings();
return sd.findSetting(name); return sd.findSetting(name);
@ -415,6 +417,7 @@ LightWorld(bspdata_t *bspdata, qboolean forcedscale)
} }
} }
EdgeToFaceMap = MakeEdgeToFaceMap(bsp);
CalcualateVertexNormals(bsp); CalcualateVertexNormals(bsp);
/* ericw -- alloc memory */ /* ericw -- alloc memory */

2
light/light2.cc
View File

@ -107,8 +107,6 @@ glm::mat4x4 TexSpaceToWorld(const bsp2_t *bsp, const bsp2_dface_t *f)
} }
edgeToFaceMap_t MakeEdgeToFaceMap(const bsp2_t *bsp) { edgeToFaceMap_t MakeEdgeToFaceMap(const bsp2_t *bsp) {
logprint("--- MakeEdgeToFaceMap ---\n");
edgeToFaceMap_t result; edgeToFaceMap_t result;
for (int i = 0; i < bsp->numfaces; i++) { for (int i = 0; i < bsp->numfaces; i++) {