From 5a3baacf8ba98a353ff334f7bf169293928b8d2a Mon Sep 17 00:00:00 2001
From: Lukas Werner <lks.werner@fau.de>
Date: Tue, 13 Mar 2018 11:32:56 +0100
Subject: [PATCH] Wrapped floating point constants in real_t()
---
apps/tutorials/pe/01_ConfinedGas.cpp | 4 +-
src/pe/raytracing/ShadingFunctions.h | 78 +++++++++++++--------------
src/pe/raytracing/ShadingParameters.h | 4 +-
3 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/apps/tutorials/pe/01_ConfinedGas.cpp b/apps/tutorials/pe/01_ConfinedGas.cpp
index 8a95fee60..25efa73e8 100644
--- a/apps/tutorials/pe/01_ConfinedGas.cpp
+++ b/apps/tutorials/pe/01_ConfinedGas.cpp
@@ -101,13 +101,13 @@ int main( int argc, char ** argv )
Lighting lighting(Vec3(-12, 12, 12),
Color(1, 1, 1),
Color(1, 1, 1),
- Color(0.4, 0.4, 0.4));
+ Color(real_t(0.4), real_t(0.4), real_t(0.4)));
Raytracer raytracer(forest, storageID, globalBodyStorage, ccdID,
640, 480,
real_t(49.13),
Vec3(-25, 10, 10), Vec3(-5, 10, 10), Vec3(0, 0, 1),
lighting,
- Color(0.1, 0.1, 0.1),
+ Color(real_t(0.1), real_t(0.1), real_t(0.1)),
radius);
WALBERLA_LOG_INFO_ON_ROOT("*** SETUP - START ***");
diff --git a/src/pe/raytracing/ShadingFunctions.h b/src/pe/raytracing/ShadingFunctions.h
index e8b440f24..664102544 100644
--- a/src/pe/raytracing/ShadingFunctions.h
+++ b/src/pe/raytracing/ShadingFunctions.h
@@ -62,91 +62,91 @@ inline ShadingParameters defaultShadingParams (const BodyID body) {
inline ShadingParameters whiteShadingParams (const BodyID body) {
WALBERLA_UNUSED(body);
- ShadingParameters s(Color(1, 1, 1),
- Color(0.9, 0.9, 0.9),
- Color(0, 0, 0),
- 0);
+ ShadingParameters s(Color(real_t(1), real_t(1), real_t(1)),
+ Color(real_t(0.9), real_t(0.9), real_t(0.9)),
+ Color(real_t(0), real_t(0), real_t(0)),
+ real_t(0));
return s;
}
inline ShadingParameters blackShadingParams (const BodyID body) {
WALBERLA_UNUSED(body);
- ShadingParameters s(Color(0, 0, 0),
- Color(0, 0, 0),
- Color(0.1, 0.1, 0.1),
- 0);
+ ShadingParameters s(Color(real_t(0), real_t(0), real_t(0)),
+ Color(real_t(0), real_t(0), real_t(0)),
+ Color(real_t(0.1), real_t(0.1), real_t(0.1)),
+ real_t(0));
return s;
}
inline ShadingParameters lightGreyShadingParams (const BodyID body) {
WALBERLA_UNUSED(body);
- ShadingParameters s(Color(0.82, 0.82, 0.82),
- Color(0.5, 0.5, 0.5),
- Color(0, 0, 0),
- 0);
+ ShadingParameters s(Color(real_t(0.82), real_t(0.82), real_t(0.82)),
+ Color(real_t(0.5), real_t(0.5), real_t(0.5)),
+ Color(real_t(0), real_t(0), real_t(0)),
+ real_t(0));
return s;
}
inline ShadingParameters greyShadingParams (const BodyID body) {
WALBERLA_UNUSED(body);
- ShadingParameters s(Color(0.5, 0.5, 0.5),
- Color(0.4, 0.4, 0.4),
- Color(0.1, 0.1, 0.1),
- 0);
+ ShadingParameters s(Color(real_t(0.5), real_t(0.5), real_t(0.5)),
+ Color(real_t(0.4), real_t(0.4), real_t(0.4)),
+ Color(real_t(0.1), real_t(0.1), real_t(0.1)),
+ real_t(0));
return s;
}
inline ShadingParameters darkGreyShadingParams (const BodyID body) {
WALBERLA_UNUSED(body);
- ShadingParameters s(Color(0.2, 0.2, 0.2),
- Color(0.06, 0.06, 0.06),
- Color(0.1, 0.1, 0.1),
- 0);
+ ShadingParameters s(Color(real_t(0.2), real_t(0.2), real_t(0.2)),
+ Color(real_t(0.06), real_t(0.06), real_t(0.06)),
+ Color(real_t(0.1), real_t(0.1), real_t(0.1)),
+ real_t(0));
return s;
}
inline ShadingParameters redShadingParams (const BodyID body) {
WALBERLA_UNUSED(body);
- ShadingParameters s(Color(1, 0, 0),
- Color(0.5, 0, 0),
- Color(0.1, 0.1, 0.1),
- 0);
+ ShadingParameters s(Color(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);
return s;
}
inline ShadingParameters greenShadingParams (const BodyID body) {
WALBERLA_UNUSED(body);
- ShadingParameters s(Color(0, 0.72, 0),
- Color(0, 0.41, 0),
- Color(0.1, 0.1, 0.1),
- 0);
+ ShadingParameters s(Color(real_t(0), real_t(0.72), real_t(0)),
+ Color(real_t(0), real_t(0.41), real_t(0)),
+ Color(real_t(0.1), real_t(0.1), real_t(0.1)),
+ real_t(0));
return s;
}
inline ShadingParameters blueShadingParams (const BodyID body) {
WALBERLA_UNUSED(body);
ShadingParameters s(Color(0.15, 0.44, 0.91),
- Color(0, 0, 0.4),
- Color(0.1, 0.1, 0.1),
- 0);
+ 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));
return s;
}
inline ShadingParameters yellowShadingParams (const BodyID body) {
WALBERLA_UNUSED(body);
- ShadingParameters s(Color(1, 0.96, 0),
- Color(0.5, 0.48, 0),
- Color(0, 0, 0),
- 0);
+ ShadingParameters s(Color(real_t(1), real_t(0.96), real_t(0)),
+ Color(real_t(0.5), real_t(0.48), real_t(0)),
+ Color(real_t(0), real_t(0), 0),
+ real_t(0));
return s;
}
inline ShadingParameters violetShadingParams (const BodyID body) {
WALBERLA_UNUSED(body);
- ShadingParameters s(Color(0.6, 0, 0.9),
- Color(0.5, 0, 0.8),
- Color(0, 0, 0),
- 0);
+ ShadingParameters s(Color(0.6, real_t(0), real_t(0.9)),
+ Color(0.5, real_t(0), real_t(0.8)),
+ Color(real_t(0), real_t(0), real_t(0)),
+ real_t(0));
return s;
}
}
diff --git a/src/pe/raytracing/ShadingParameters.h b/src/pe/raytracing/ShadingParameters.h
index c63ac6bcf..c833f5f92 100644
--- a/src/pe/raytracing/ShadingParameters.h
+++ b/src/pe/raytracing/ShadingParameters.h
@@ -65,13 +65,13 @@ struct ShadingParameters {
ShadingParameters& makeGlossy(real_t _shininess = 30) {
shininess = _shininess;
- specularColor.set(1, 1, 1);
+ specularColor.set(real_t(1), real_t(1), real_t(1));
return *this;
}
ShadingParameters& makeMatte() {
shininess = 0;
- specularColor.set(0.1, 0.1, 0.1);
+ specularColor.set(real_t(0.1), real_t(0.1), real_t(0.1));
return *this;
}
};
--
GitLab