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

Fix exactEmpty 

Simplify output_dir
This commit is contained in:
Jonathan 2021-09-27 21:03:24 -04:00
parent a6f6cc2d15
commit b205127e81
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common/qvec.hh
View File

@ -343,7 +343,7 @@ template<size_t N, class T>
bool emptyExact(const qvec<N, T> &v1)
{
for (size_t i = 0; i < N; i++) {
if (!v1[i])
if (v1[i])
return false;
}
return true;

10
light/ltface.cc
View File

@ -3153,9 +3153,11 @@ static void WriteSingleLightmap(const mbsp_t *bsp, const mface_t *face, const li
const std::vector<qvec4f> output_color =
IntegerDownsampleImage(fullres, oversampled_width, oversampled_height, oversample);
const std::vector<qvec4f> output_dir = (lux ? IntegerDownsampleImage(LightmapNormalsToGLMVector(lightsurf, lm),
oversampled_width, oversampled_height, oversample)
: std::vector<qvec4f>()); // mxd. Skip when lux isn't needed
std::optional<std::vector<qvec4f>> output_dir;
if (lux) {
output_dir = IntegerDownsampleImage(LightmapNormalsToGLMVector(lightsurf, lm), oversampled_width, oversampled_height, oversample);
}
// copy from the float buffers to byte buffers in .bsp / .lit / .lux
@ -3185,7 +3187,7 @@ static void WriteSingleLightmap(const mbsp_t *bsp, const mface_t *face, const li
if (lux) {
vec3_t temp;
int v;
const qvec4f &direction = output_dir.at(sampleindex);
const qvec4f &direction = output_dir->at(sampleindex);
temp[0] = qv::dot(qvec3f(direction), qvec3f(lightsurf->snormal));
temp[1] = qv::dot(qvec3f(direction), qvec3f(lightsurf->tnormal));
temp[2] = qv::dot(qvec3f(direction), qvec3f(lightsurf->plane.normal));