From ef8d6e6272ec2ebd06c1050af0b9dda781fa9b3b Mon Sep 17 00:00:00 2001
From: Lukas Werner <lks.werner@fau.de>
Date: Tue, 13 Mar 2018 14:07:37 +0100
Subject: [PATCH] More real_t wrapping
---
src/pe/raytracing/Raytracer.cpp | 4 ++--
src/pe/raytracing/Raytracer.h | 6 +++---
src/pe/raytracing/ShadingFunctions.h | 10 +++++-----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/pe/raytracing/Raytracer.cpp b/src/pe/raytracing/Raytracer.cpp
index 47b121468..cf01a8c41 100644
--- a/src/pe/raytracing/Raytracer.cpp
+++ b/src/pe/raytracing/Raytracer.cpp
@@ -156,7 +156,7 @@ Raytracer::Raytracer(const shared_ptr<BlockStorage> forest, const BlockDataID st
lookAtPoint_ = config.getParameter<Vec3>("lookAt");
upVector_ = config.getParameter<Vec3>("upVector");
lighting_ = Lighting(config.getBlock("Lighting"));
- backgroundColor_ = config.getParameter<Color>("backgroundColor", Vec3(0.1, 0.1, 0.1));
+ backgroundColor_ = config.getParameter<Color>("backgroundColor", Vec3(real_t(0.1), real_t(0.1), real_t(0.1)));
blockAABBIntersectionPadding_ = config.getParameter<real_t>("blockAABBIntersectionPadding", real_t(0.0));
@@ -192,7 +192,7 @@ void Raytracer::setupView_() {
// viewing plane setup
d_ = (cameraPosition_ - lookAtPoint_).length();
aspectRatio_ = real_t(pixelsHorizontal_) / real_t(pixelsVertical_);
- viewingPlaneHeight_ = tan(deg2rad(fov_vertical_)/real_t(2.)) * real_t(2.) * d_;
+ viewingPlaneHeight_ = real_c(tan(deg2rad(fov_vertical_)/real_t(2.))) * real_t(2.) * d_;
viewingPlaneWidth_ = viewingPlaneHeight_ * aspectRatio_;
viewingPlaneOrigin_ = lookAtPoint_ - u_*viewingPlaneWidth_/real_t(2.) - v_*viewingPlaneHeight_/real_t(2.);
diff --git a/src/pe/raytracing/Raytracer.h b/src/pe/raytracing/Raytracer.h
index 87632f2f7..907456f94 100644
--- a/src/pe/raytracing/Raytracer.h
+++ b/src/pe/raytracing/Raytracer.h
@@ -74,7 +74,7 @@ public:
real_t fov_vertical,
const Vec3& cameraPosition, const Vec3& lookAtPoint, const Vec3& upVector,
const Lighting& lighting,
- const Color& backgroundColor = Color(0.1, 0.1, 0.1),
+ const Color& backgroundColor = Color(real_t(0.1), real_t(0.1), real_t(0.1)),
real_t blockAABBIntersectionPadding = real_t(0.0),
std::function<ShadingParameters (const BodyID)> bodyToShadingParamsFunction = defaultBodyTypeDependentShadingParams);
explicit Raytracer(const shared_ptr<BlockStorage> forest, const BlockDataID storageID,
@@ -653,7 +653,7 @@ void Raytracer::generateImage(const size_t timestep, WcTimingTree* tt) {
std::vector<Color> fullImageBuffer(pixelsHorizontal_ * pixelsVertical_, backgroundColor_);
for (auto& info: intersectionsBuffer) {
- fullImageBuffer[coordinateToArrayIndex(info.imageX, info.imageY)] = Color(info.r, info.g, info.b);
+ fullImageBuffer[coordinateToArrayIndex(info.imageX, info.imageY)] = Color(double_c(info.r), double_c(info.g), double_c(info.b));
}
writeImageBufferToFile(fullImageBuffer, timestep, true);
@@ -666,7 +666,7 @@ void Raytracer::generateImage(const size_t timestep, WcTimingTree* tt) {
std::vector<real_t> fullTBuffer(pixelsHorizontal_ * pixelsVertical_, inf);
for (auto& info: intersectionsBuffer) {
- fullTBuffer[coordinateToArrayIndex(info.imageX, info.imageY)] = info.t;
+ fullTBuffer[coordinateToArrayIndex(info.imageX, info.imageY)] = double_c(info.t);
}
writeTBufferToFile(fullTBuffer, timestep, true);
diff --git a/src/pe/raytracing/ShadingFunctions.h b/src/pe/raytracing/ShadingFunctions.h
index 664102544..13594d5d1 100644
--- a/src/pe/raytracing/ShadingFunctions.h
+++ b/src/pe/raytracing/ShadingFunctions.h
@@ -107,10 +107,10 @@ inline ShadingParameters darkGreyShadingParams (const BodyID body) {
inline ShadingParameters redShadingParams (const BodyID body) {
WALBERLA_UNUSED(body);
- ShadingParameters s(Color(1, real_t(0), real_t(0)),
+ ShadingParameters s(Color(real_t(1), real_t(0), real_t(0)),
Color(real_t(0.5), real_t(0), real_t(0)),
Color(real_t(0.1), real_t(0.1), 0.1),
- 0);
+ real_t(0));
return s;
}
@@ -125,7 +125,7 @@ inline ShadingParameters greenShadingParams (const BodyID body) {
inline ShadingParameters blueShadingParams (const BodyID body) {
WALBERLA_UNUSED(body);
- ShadingParameters s(Color(0.15, 0.44, 0.91),
+ ShadingParameters s(Color(real_t(0.15), real_t(0.44), real_t(0.91)),
Color(real_t(0), real_t(0), 0.4),
Color(real_t(0.1), real_t(0.1), real_t(0.1)),
real_t(0));
@@ -143,8 +143,8 @@ inline ShadingParameters yellowShadingParams (const BodyID body) {
inline ShadingParameters violetShadingParams (const BodyID body) {
WALBERLA_UNUSED(body);
- ShadingParameters s(Color(0.6, real_t(0), real_t(0.9)),
- Color(0.5, real_t(0), real_t(0.8)),
+ ShadingParameters s(Color(real_t(0.6), real_t(0), real_t(0.9)),
+ Color(real_t(0.5), real_t(0), real_t(0.8)),
Color(real_t(0), real_t(0), real_t(0)),
real_t(0));
return s;
--
GitLab