tjh.dev
1diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp"
2*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" 2010-11-13 22:32:44.000000000 -0500
3--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" 2018-06-24 14:23:30.794296776 -0400
4***************
5*** 1,5 ****
6 #include <QThread>
7!
8
9 #include "RayTracer.h"
10
11--- 1,5 ----
12 #include <QThread>
13! #include <GL/glu.h>
14
15 #include "RayTracer.h"
16
17diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp"
18*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" 2010-09-08 21:25:30.000000000 -0400
19--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" 2018-06-24 14:23:12.542868194 -0400
20***************
21*** 122,128 ****
22 currentT = p;
23
24 // We do not intersect grid.
25! if (!found) return false;
26 }
27
28 stepX = (dir.x() > 0) ? 1 : -1;
29--- 122,128 ----
30 currentT = p;
31
32 // We do not intersect grid.
33! if (!found) return NULL;
34 }
35
36 stepX = (dir.x() > 0) ? 1 : -1;
37Only in Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer: VoxelStepper.cpp.orig
38diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h"
39*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" 2010-08-11 15:12:22.000000000 -0400
40--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h" 2018-06-24 14:23:30.793296807 -0400
41***************
42*** 2,7 ****
43--- 2,8 ----
44
45 #include "SyntopiaCore/Math/Vector3.h"
46 #include "Object3D.h"
47+ #include <GL/glu.h>
48
49 namespace SyntopiaCore {
50 namespace GLEngine {