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

Merge branch 'type-cleanup' of https://github.com/Paril/ericw-tools into type-cleanup

This commit is contained in:
Jonathan 2022-02-16 19:23:25 -05:00
parent b0ece93f83 ac3fb7801f
commit 000fa217d8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
light/bounce.cc
View File

@ -237,9 +237,9 @@ static void *MakeBounceLightsThread(void *arg)
styleColor.second /= 255.0f; styleColor.second /= 255.0f;
} }
// lerp between gray and the texture color according to `bouncecolorscale` // lerp between gray and the texture color according to `bouncecolorscale` (0 = use gray, 1 = use texture color)
qvec3f texturecolor = qvec3f(Face_LookupTextureColor(bsp, face)) / 255.0f; qvec3f texturecolor = qvec3f(Face_LookupTextureColor(bsp, face)) / 255.0f;
qvec3f blendedcolor = mix(texturecolor, { 127.f / 255.f }, cfg.bouncecolorscale.floatValue()); qvec3f blendedcolor = mix(qvec3f{127.f / 255.f}, texturecolor, cfg.bouncecolorscale.floatValue());
// final colors to emit // final colors to emit
map<int, qvec3f> emitcolors; map<int, qvec3f> emitcolors;

5
testmaps/automatated_tests.sh
View File

@ -14,7 +14,10 @@
set -x set -x
UPDATE_HASHES=0 UPDATE_HASHES=0
CONTINUE_ON_FAILURE=0
# FIXME: reset back to 0
CONTINUE_ON_FAILURE=1
if [[ "$1" == "--update-hashes" ]]; then if [[ "$1" == "--update-hashes" ]]; then
UPDATE_HASHES=1 UPDATE_HASHES=1
elif [[ "$1" == "--continue-on-failure" ]]; then elif [[ "$1" == "--continue-on-failure" ]]; then