zdoom/zdray
0
0
Fork 0
mirror of https://github.com/ZDoom/ZDRay.git synced 2024-11-22 12:01:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some more compile errors

Browse source
This commit is contained in:
Magnus Norddahl 2021-11-12 16:24:27 +01:00
parent e54477cb93
commit 2a91f530c9
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lightmap/cpuraytracer.cpp
View file

@ -257,7 +257,7 @@ void CPURaytracer::RunLightTrace(CPUTraceState& state)
for (uint32_t i = 0; i < state.SampleCount; i++) for (uint32_t i = 0; i < state.SampleCount; i++)
{ {
Vec2 offset = (Hammersley(i, state.SampleCount) - 0.5) * state.SampleDistance; Vec2 offset = (Hammersley(i, state.SampleCount) - 0.5f) * state.SampleDistance;
Vec3 origin2 = origin + e0 * offset.x + e1 * offset.y; Vec3 origin2 = origin + e0 * offset.x + e1 * offset.y;
Vec3 start = origin2; Vec3 start = origin2;
@ -313,7 +313,7 @@ void CPURaytracer::RunLightTrace(CPUTraceState& state)
e0 = Vec3::Cross(normal, e1); e0 = Vec3::Cross(normal, e1);
for (uint32_t i = 0; i < state.SampleCount; i++) for (uint32_t i = 0; i < state.SampleCount; i++)
{ {
Vec2 offset = (Hammersley(i, state.SampleCount) - 0.5) * state.SampleDistance; Vec2 offset = (Hammersley(i, state.SampleCount) - 0.5f) * state.SampleDistance;
Vec3 origin2 = origin + e0 * offset.x + e1 * offset.y; Vec3 origin2 = origin + e0 * offset.x + e1 * offset.y;
LevelTraceHit hit = Trace(origin2, light.Origin); LevelTraceHit hit = Trace(origin2, light.Origin);

1
src/lightmap/gpuraytracer.cpp
View file

@ -11,6 +11,7 @@
#include <map> #include <map>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <limits>
#include <zlib.h> #include <zlib.h>
#include "glsl_rgen_bounce.h" #include "glsl_rgen_bounce.h"
#include "glsl_rgen_light.h" #include "glsl_rgen_light.h"