stephenseo/ThreadedExamples
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'sgitea/main'

Browse source
This commit is contained in:
Stephen Seo 2021-08-25 10:59:11 +09:00
commit bb6a05f191
5 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
example02_threaded_raytracing/.gitignore vendored
View file

@ -1,3 +1,4 @@
build*/ build*/
compile_commands.json compile_commands.json
.cache/ .cache/
src/*.o

13
example02_threaded_raytracing/buildWin/Makefile Normal file
View file

@ -0,0 +1,13 @@
CXX=x86_64-w64-mingw32-g++
CXXFLAGS=-O3 -DNDEBUG
all: Example02.exe
Example02.exe: ../src/main.o ../src/rayTracer.o ../src/argParse.o
$(CXX) -o Example02.exe -lpthread $^
.PHONY:
clean:
rm -f Example02.exe
rm -f ../src/*.o

4
example02_threaded_raytracing/src/main.cpp
View file

@ -125,11 +125,11 @@ int main(int argc, char **argv) {
} }
} }
// auto pixels = Ex02::RT::renderGraySphere(
// outputWidth, outputHeight, threadCount);
std::cout << "Rendering image of width " << outputWidth << " and height " std::cout << "Rendering image of width " << outputWidth << " and height "
<< outputHeight << " with " << threadCount << " thread(s)..." << outputHeight << " with " << threadCount << " thread(s)..."
<< std::endl; << std::endl;
// auto pixels = Ex02::RT::renderGraySphere(
// outputWidth, outputHeight, threadCount);
auto pixels = auto pixels =
Ex02::RT::renderColorsWithSpheres(outputWidth, outputHeight, threadCount); Ex02::RT::renderColorsWithSpheres(outputWidth, outputHeight, threadCount);

6
example02_threaded_raytracing/src/rayTracer.cpp
View file

@ -5,9 +5,15 @@
#include <fstream> #include <fstream>
#include <thread> #include <thread>
#ifdef __MINGW32__
# include "/usr/include/glm/ext/matrix_transform.hpp"
# include "/usr/include/glm/gtc/matrix_transform.hpp"
# include "/usr/include/glm/matrix.hpp"
#else
# include <glm/ext/matrix_transform.hpp> # include <glm/ext/matrix_transform.hpp>
# include <glm/gtc/matrix_transform.hpp> # include <glm/gtc/matrix_transform.hpp>
# include <glm/matrix.hpp> # include <glm/matrix.hpp>
#endif
const float PI = std::acos(-1.0F); const float PI = std::acos(-1.0F);

6
example02_threaded_raytracing/src/rayTracer.hpp
View file

@ -12,9 +12,15 @@ constexpr float EX02_RAY_TRACER_GRAY_SPHERE_RADIUS = 1.5F;
#include <tuple> #include <tuple>
#include <vector> #include <vector>
#ifdef __MINGW32__
# include "/usr/include/glm/mat4x4.hpp"
# include "/usr/include/glm/matrix.hpp"
# include "/usr/include/glm/vec3.hpp"
#else
# include <glm/mat4x4.hpp> # include <glm/mat4x4.hpp>
# include <glm/matrix.hpp> # include <glm/matrix.hpp>
# include <glm/vec3.hpp> # include <glm/vec3.hpp>
#endif
namespace Ex02::RT { namespace Ex02::RT {