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

Ex02: Tweak use of mutex when threaded

Browse source
This commit is contained in:
Stephen Seo 2021-08-24 11:52:24 +09:00
parent 8596e85c85
commit e764ed3547
2 changed files with 57 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
example02_threaded_raytracing/src/rayTracer.cpp
View file

@ -4,7 +4,6 @@
#include <fstream>
#include <array>
#include <thread>
#include <mutex>
#include <glm/matrix.hpp>
#include <glm/gtc/matrix_transform.hpp>
@ -115,6 +114,57 @@ void Ex02::RT::Internal::LightSource::applyLight(
}
}
void Ex02::RT::Internal::LightSource::applyLight(
glm::vec3 pos, Pixel &pixelOut, std::mutex* mutex) const {
pos = this->pos - pos;
float dist = std::sqrt(
pos.x * pos.x
+ pos.y * pos.y
+ pos.z * pos.z);
if(dist < falloffStart) {
const auto applyColor = [] (auto *color, unsigned char *out) {
unsigned int temp = (unsigned int)*out
+ (unsigned int)(*color * 255.0f);
if(temp > 255) {
*out = 255;
} else {
*out = temp;
}
};
if(mutex) {
std::lock_guard<std::mutex> lock(*mutex);
applyColor(&color.x, &pixelOut.r);
applyColor(&color.y, &pixelOut.g);
applyColor(&color.z, &pixelOut.b);
} else {
applyColor(&color.x, &pixelOut.r);
applyColor(&color.y, &pixelOut.g);
applyColor(&color.z, &pixelOut.b);
}
} else if(dist >= falloffStart && dist <= falloffEnd) {
const auto applyFalloffColor = [] (auto *color, unsigned char *out, float f) {
unsigned int temp = (unsigned int)*out
+ (unsigned int)(*color * 255.0f * f);
if(temp > 255) {
*out = 255;
} else {
*out = temp;
}
};
float f = (1.0f - (dist - falloffStart) / (falloffEnd - falloffStart));
if(mutex) {
std::lock_guard<std::mutex> lock(*mutex);
applyFalloffColor(&color.x, &pixelOut.r, f);
applyFalloffColor(&color.y, &pixelOut.g, f);
applyFalloffColor(&color.z, &pixelOut.b, f);
} else {
applyFalloffColor(&color.x, &pixelOut.r, f);
applyFalloffColor(&color.y, &pixelOut.g, f);
applyFalloffColor(&color.z, &pixelOut.b, f);
}
}
}
Ex02::RT::Internal::Sphere::Sphere() :
pos{0.0f, 0.0f, 0.0f},
radius(2.5f)
@ -399,16 +449,10 @@ Ex02::RT::Image Ex02::RT::renderColorsWithSpheres(
// at this point, it is known that no spheres blocks ray
// to light
if(mutex) {
std::lock_guard<std::mutex> lock(*mutex);
light.applyLight(
std::get<0>(*closestResult),
image.getPixel(i, j));
} else {
light.applyLight(
std::get<0>(*closestResult),
image.getPixel(i, j));
}
image.getPixel(i, j),
mutex);
}
}
};

2
example02_threaded_raytracing/src/rayTracer.hpp
View file

@ -11,6 +11,7 @@
#include <optional>
#include <string>
#include <tuple>
#include <mutex>
#include <glm/vec3.hpp>
#include <glm/mat4x4.hpp>
@ -51,6 +52,7 @@ namespace Internal {
glm::vec3 color;
void applyLight(glm::vec3 pos, Pixel &pixelOut) const;
void applyLight(glm::vec3 pos, Pixel &pixelOut, std::mutex *mutex) const;
};
struct Sphere {