wip

Author: Askaniy

src/celastro/astro.cpp

@@ -142,17 +142,17 @@ irradianceToMag(float irradiance)
 float
 faintestMagToExposure(float faintestMag)
 {
-    return std::exp(faintestMag / LN_MAG) * IRRADIATION_LIMIT;
+    return std::exp(faintestMag / LN_MAG) * LOWEST_IRRADIATION;
     // slower solution:
-    // return std::pow(10.0f, 0.4f * faintestMag) * IRRADIATION_LIMIT;
+    // return std::pow(10.0f, 0.4f * faintestMag) * LOWEST_IRRADIATION;
 }
 
 float
 exposureToFaintestMag(float exposure)
 {
-    return std::log(exposure / IRRADIATION_LIMIT) * LN_MAG;
+    return std::log(exposure / LOWEST_IRRADIATION) * LN_MAG;
     // equivalent solution:
-    // return 2.5f * std::log10(exposure / IRRADIATION_LIMIT);
+    // return 2.5f * std::log10(exposure / LOWEST_IRRADIATION);
 }
 
 

src/celastro/astro.h

@@ -29,7 +29,7 @@ constexpr inline float SOLAR_ABSMAG = 4.83f;
 constexpr inline float LN_MAG = 1.0857362f; // 5/ln(100)
 
 // Lowest screen brightness of a point to render
-constexpr inline float IRRADIATION_LIMIT = 1.0f / 255.0f;
+constexpr inline float LOWEST_IRRADIATION = 1.0f / 255.0f;
 //                                       = 1.0f / (255.0f * 12.92f); after implementing gamma correction
 
 namespace detail

src/celengine/dsorenderer.cpp

@@ -188,10 +188,10 @@ void DSORenderer::process(DeepSkyObject* const &dso,
         }
 
         float irradiationEff = astro::magToIrradiance(appMagEff) * exposure;
-        if (irradiationEff > labelThresholdIrradiation)
+        if (irradiationEff > labelLowestIrradiation)
         {
             // TODO: the label transparency is not tested, most likely need fixes
-            float distr = std::min(1.0f, step * (irradiationEff - labelThresholdIrradiation) / labelThresholdIrradiation);
+            float distr = std::min(1.0f, step * (irradiationEff - labelLowestIrradiation) / labelLowestIrradiation);
             labelColor.alpha(distr * labelColor.alpha());
 
             renderer->addBackgroundAnnotation(rep,

src/celengine/objectrenderer.h

@@ -24,16 +24,16 @@ template <class OBJ, class PREC> class ObjectRenderer : public OctreeProcessor<O
     {
     };
 
-    const Observer* observer        { nullptr };
-    Renderer*  renderer             { nullptr };
+    const Observer* observer     { nullptr };
+    Renderer*  renderer          { nullptr };
 
-    float pixelSize                 { 0.0f };
-    float exposure                  { 0.0f };
-    float distanceLimit             { 0.0f };
+    float pixelSize              { 0.0f };
+    float exposure               { 0.0f };
+    float distanceLimit          { 0.0f };
 
-    // Objects with screen brightness higher than labelThresholdIrradiation will be labeled
-    float labelThresholdIrradiation { 0.0f };
+    // Objects with screen brightness higher than labelLowestIrradiation will be labeled
+    float labelLowestIrradiation { 0.0f };
 
-    uint64_t renderFlags            { 0 };
-    int labelMode                   { 0 };
+    uint64_t renderFlags         { 0 };
+    int labelMode                { 0 };
 };

src/celengine/pointstarrenderer.cpp

@@ -98,19 +98,19 @@ void PointStarRenderer::process(const Star& star, float distance, float irradian
         float irradiation = irradiance * exposure;
         if (distance > SolarSystemMaxDistance)
         {
-            if (irradiation > astro::IRRADIATION_LIMIT)
+            if (irradiation > astro::LOWEST_IRRADIATION)
             {
                 starVertexBuffer->addStar(relPos, starColor, irradiation);
             }
 
             // Place labels for stars brighter than the specified label threshold brightness
-            if (((labelMode & Renderer::StarLabels) != 0) && irradiation > labelThresholdIrradiation)
+            if (((labelMode & Renderer::StarLabels) != 0) && irradiation > labelLowestIrradiation)
             {
                 Vector3f starDir = relPos.normalized();
                 if (starDir.dot(viewNormal) > cosFOV)
                 {
                     // TODO: the label transparency is not tested, most likely need fixes
-                    float distr = min(1.0f, 3.5f * (irradiation - labelThresholdIrradiation)/labelThresholdIrradiation);
+                    float distr = min(1.0f, 3.5f * (irradiation - labelLowestIrradiation)/labelLowestIrradiation);
                     Color color = Color(Renderer::StarLabelColor, distr * Renderer::StarLabelColor.alpha());
                     renderer->addBackgroundAnnotation(nullptr,
                                                       starDB->getStarName(star, true),

src/celengine/render.cpp

@@ -3743,7 +3743,7 @@ void Renderer::renderPointStars(const StarDatabase& starDB,
     // Original function
     // float effDistanceToScreen = mmToInches((float) REF_DISTANCE_TO_SCREEN) * pixelSize * getScreenDpi(); // = 1.0 at startup
     // starRenderer.labelThresholdMag = 1.2f * max(1.0f, (faintestMag - 4.0f) * (1.0f - 0.5f * std::log10(effDistanceToScreen)));
-    starRenderer.labelThresholdIrradiation = 1.0f; // refinement is needed
+    starRenderer.labelLowestIrradiation = 1.0f; // refinement is needed
 
     starRenderer.colorTemp = &starColors;
 
@@ -3820,7 +3820,7 @@ void Renderer::renderDeepSkyObjects(const Universe& universe,
     // Original function
     // float effDistanceToScreen = mmToInches((float) REF_DISTANCE_TO_SCREEN) * pixelSize * getScreenDpi(); // = 1.0 at startup
     // dsoRenderer.labelThresholdMag = 2.0f * max(1.0f, (faintestMag - 4.0f) * (1.0f - 0.5f * log10(effDistanceToScreen)));
-    dsoRenderer.labelThresholdIrradiation = 1.0f; // refinement is needed
+    dsoRenderer.labelLowestIrradiation = 1.0f; // refinement is needed
 
     using namespace celestia;
     galaxyRep      = MarkerRepresentation(MarkerRepresentation::Triangle, 8.0f, GalaxyLabelColor);

src/celengine/render.h

@@ -572,13 +572,6 @@ class Renderer
                          float discSizeInPixels,
                          const Matrices&);
 
-    void calculatePointSize(float appMag,
-                            float size,
-                            float &discSize,
-                            float &alpha,
-                            float &glareSize,
-                            float &glareAlpha) const;
-
     void renderObjectAsPoint(const Eigen::Vector3f& center,
                              float radius,
                              float appMag,

src/celengine/renderlistentry.h

@@ -41,7 +41,7 @@ struct RenderListEntry
     float nearZ;
     float farZ;
     float discSizeInPixels;
-    float appMag;
+    float irradiation;
     RenderableType renderableType;
     bool isOpaque;
 };

src/celengine/star.cpp

@@ -1224,7 +1224,7 @@ Star::getIrradiance(float km) const
     // extinction seems to be in a strange units, mag/ly is not used in astronomy
     // it can be optimized later, with astro::absMagToIrradiance() that duplicates it, but with no extinction
 
-    float irradianceInSuns = std::exp((astro::SOLAR_ABSMAG - absMag - extinction * astro::kilometersToLightYears(km)) / astro::LN_MAG)
+    float irradianceInSuns = std::exp((astro::SOLAR_ABSMAG - absMag - extinction * astro::kilometersToLightYears(km)) / astro::LN_MAG);
     return irradianceInSuns * astro::SOLAR_POWER / (math::sphereArea(km * 1000) * astro::VEGAN_IRRADIANCE);
 }