From 52989d522c6ce514408fe89a1dd3cb39dc2dc022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wilhelm=20Bj=C3=B6rkstr=C3=B6m?= <143391787+Grantallkotten@users.noreply.github.com> Date: Tue, 20 May 2025 11:13:23 +0200 Subject: [PATCH] Cleanup of code --- modules/blackhole/rendering/renderableblackhole.cpp | 10 +++++----- modules/blackhole/rendering/renderableblackhole.h | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/blackhole/rendering/renderableblackhole.cpp b/modules/blackhole/rendering/renderableblackhole.cpp index d9de57dd6c..8c58c05197 100644 --- a/modules/blackhole/rendering/renderableblackhole.cpp +++ b/modules/blackhole/rendering/renderableblackhole.cpp @@ -59,11 +59,11 @@ namespace { }; constexpr openspace::properties::Property::PropertyInfo ColorTextureInfo = { - "ColorMap", - "Color Texture", - "The path to the texture that is used to convert from the magnitude of the star " - "to its color. The texture is used as a one dimensional lookup function.", - openspace::properties::Property::Visibility::AdvancedUser + "ColorMap", + "Color Texture", + "The path to the texture that is used to convert from the magnitude of the star " + "to its color. The texture is used as a one dimensional lookup function.", + openspace::properties::Property::Visibility::AdvancedUser }; constexpr openspace::properties::Property::PropertyInfo BlackHoleTypeInfo = { diff --git a/modules/blackhole/rendering/renderableblackhole.h b/modules/blackhole/rendering/renderableblackhole.h index 1215bd60fc..bfb13dadc6 100644 --- a/modules/blackhole/rendering/renderableblackhole.h +++ b/modules/blackhole/rendering/renderableblackhole.h @@ -54,11 +54,11 @@ namespace openspace { std::unique_ptr _cullProgram = nullptr; glm::dvec3 _chachedTranslation{}; glm::dvec3 _chacedCameraPos{}; - static constexpr size_t _rayCount{ 250 }; - static constexpr size_t _rayCountHighRes{ 500 }; + static constexpr size_t _rayCount{ 300 }; + static constexpr size_t _rayCountHighRes{ 750 }; static constexpr size_t _stepsCount = 100000; static constexpr float _stepLength = 0.0001f; - static constexpr size_t _mapCount = 3; + static constexpr size_t _mapCount = 5; properties::FloatProperty _solarMass; properties::FloatProperty _kerrRotation; @@ -95,9 +95,9 @@ namespace openspace { { BlackHoleType::schwarzschild, { "schwarzschild", "BlackHoleProgram" } } }; - float _rs = 1.0f; - float _rEnvmap = 60.0f; - float _rCamera = 20.0f; + float _rs; + float _rEnvmap; + float _rCamera; ViewPort _viewport{};