Delete star styles and legacy star colors, set solar whitepoint by default

Author: Askaniy

help/CelestiaGuide.html

@@ -1506,14 +1506,6 @@ <h3 id="displayoptions">Render / Display Options</h3>
                                             Toggle star color table
                                         </td>
                                     </tr>
-                                    <tr>
-                                        <td class="leftcell">
-                                            Ctrl+S
-                                        </td>
-                                        <td class="rightcell">
-                                            Cycle the Star Style (points / fuzzy discs / scaled discs)
-                                        </td>
-                                    </tr>
                                     <tr>
                                         <td class="leftcell">
                                             V

src/celengine/render.cpp

@@ -235,7 +235,6 @@ Renderer::Renderer() :
 #endif
     labelMode(NoLabels),
     renderFlags(DefaultRenderFlags),
-    starStyle(FuzzyPointStars),
     pointStarVertexBuffer(nullptr),
     textureResolution(medres),
     frameCount(0),
@@ -4953,7 +4952,7 @@ Renderer::buildNearSystemsLists(const Universe &universe,
                           now,
                           lightSourceList,
                           tintSaturation,
-                          starColors.type() == ColorTableType::Enhanced ? nullptr : &tintColors);
+                          &tintColors);
 
     // Traverse the frame trees of each nearby solar system and
     // build the list of objects to be rendered.

src/celengine/render.h

@@ -228,14 +228,6 @@ class Renderer
                                   ShowSmoothLines
     };
 
-    enum StarStyle
-    {
-        FuzzyPointStars  = 0,
-        PointStars       = 1,
-        ScaledDiscStars  = 2,
-        StarStyleCount   = 3,
-    };
-
     uint64_t getRenderFlags() const;
     void setRenderFlags(uint64_t);
     int getLabelMode() const;
@@ -351,8 +343,6 @@ class Renderer
 
     void buildProjectionMatrix(Eigen::Matrix4f &mat, float nearZ, float farZ, float zoom) const;
 
-    void setStarStyle(StarStyle);
-    StarStyle getStarStyle() const;
     void setResolution(unsigned int resolution);
     unsigned int getResolution() const;
     void enableSelectionPointer();
@@ -687,7 +677,6 @@ class Renderer
 
     float exposure{ 1.0f };
     float faintestPlanetIrradiance{ 1.0f }; // default faintestPlanetIrradiance was 0; maybe remove it at all?
-    StarStyle starStyle;
 
     Color ambientColor;
     std::string displayedSurface;
@@ -736,7 +725,7 @@ class Renderer
     float minFeatureSize;
     uint64_t locationFilter;
 
-    ColorTemperatureTable starColors{ ColorTableType::Blackbody_D65 };
+    ColorTemperatureTable starColors{ ColorTableType::SunWhite };
     ColorTemperatureTable tintColors{ ColorTableType::SunWhite };
 
     Selection highlightObject;

src/celengine/starcolors.cpp

@@ -37,53 +37,6 @@ const Eigen::Vector2d SRGB_G_xy(0.30, 0.60);
 const Eigen::Vector2d SRGB_B_xy(0.15, 0.06);
 
 
-// Approximate colors used by older versions of Celestia
-constexpr std::array<Color, 41> StarColors_Enhanced
-{
-    Color(0.00f, 0.00f, 0.00f), // T = 0K
-    Color(0.75f, 0.20f, 0.20f), // T = 1000K
-    Color(1.00f, 0.40f, 0.40f), // T = 2000K
-    Color(1.00f, 0.70f, 0.70f), // T = 3000K
-    Color(1.00f, 0.90f, 0.70f), // T = 4000K
-    Color(1.00f, 1.00f, 0.75f), // T = 5000K
-    Color(1.00f, 1.00f, 0.88f), // T = 6000K
-    Color(1.00f, 1.00f, 0.95f), // T = 7000K
-    Color(1.00f, 1.00f, 1.00f), // T = 8000K
-    Color(0.95f, 0.98f, 1.00f), // T = 9000K
-    Color(0.90f, 0.95f, 1.00f), // T = 10000K
-    Color(0.85f, 0.93f, 1.00f), // T = 11000K
-    Color(0.80f, 0.90f, 1.00f), // T = 12000K
-    Color(0.79f, 0.89f, 1.00f), // T = 13000K
-    Color(0.78f, 0.88f, 1.00f), // T = 14000K
-    Color(0.77f, 0.87f, 1.00f), // T = 15000K
-    Color(0.76f, 0.86f, 1.00f), // T = 16000K
-    Color(0.75f, 0.85f, 1.00f), // T = 17000K
-    Color(0.74f, 0.84f, 1.00f), // T = 18000K
-    Color(0.73f, 0.83f, 1.00f), // T = 19000K
-    Color(0.72f, 0.82f, 1.00f), // T = 20000K
-    Color(0.71f, 0.81f, 1.00f), // T = 21000K
-    Color(0.70f, 0.80f, 1.00f), // T = 22000K
-    Color(0.69f, 0.79f, 1.00f), // T = 23000K
-    Color(0.68f, 0.78f, 1.00f), // T = 24000K
-    Color(0.67f, 0.77f, 1.00f), // T = 25000K
-    Color(0.66f, 0.76f, 1.00f), // T = 26000K
-    Color(0.65f, 0.75f, 1.00f), // T = 27000K
-    Color(0.65f, 0.75f, 1.00f), // T = 28000K
-    Color(0.64f, 0.74f, 1.00f), // T = 29000K
-    Color(0.64f, 0.74f, 1.00f), // T = 30000K
-    Color(0.63f, 0.73f, 1.00f), // T = 31000K
-    Color(0.63f, 0.73f, 1.00f), // T = 32000K
-    Color(0.62f, 0.72f, 1.00f), // T = 33000K
-    Color(0.62f, 0.72f, 1.00f), // T = 34000K
-    Color(0.61f, 0.71f, 1.00f), // T = 35000K
-    Color(0.61f, 0.71f, 1.00f), // T = 36000K
-    Color(0.60f, 0.70f, 1.00f), // T = 37000K
-    Color(0.60f, 0.70f, 1.00f), // T = 38000K
-    Color(0.60f, 0.70f, 1.00f), // T = 39000K
-    Color(0.60f, 0.70f, 1.00f), // T = 40000K
-};
-
-
 struct CIEPoint
 {
     int wavelength;
@@ -695,7 +648,7 @@ createBlackbodyTable(const Eigen::Vector3d& whitepoint,
 ColorTemperatureTable::ColorTemperatureTable(ColorTableType _type)
 {
     if (!setType(_type))
-        setType(ColorTableType::Enhanced);
+        setType(ColorTableType::SunWhite);
 }
 
 
@@ -705,13 +658,6 @@ ColorTemperatureTable::setType(ColorTableType _type)
     tableType = _type;
     switch (tableType)
     {
-    case ColorTableType::Enhanced:
-        colors.clear();
-        colors.reserve(StarColors_Enhanced.size());
-        std::copy(StarColors_Enhanced.cbegin(), StarColors_Enhanced.cend(), std::back_inserter(colors));
-        tempScale = static_cast<float>(StarColors_Enhanced.size() - 1) / MaxTemperature;
-        return true;
-
     case ColorTableType::Blackbody_D65:
         createBlackbodyTable(D65_XYZ, tempScale, colors);
         return true;

src/celengine/starcolors.h

@@ -22,10 +22,9 @@
 
 enum class ColorTableType
 {
-    Enhanced = 0,
-    Blackbody_D65 = 1,
-    SunWhite = 2,
-    VegaWhite = 3,
+    Blackbody_D65 = 0,
+    SunWhite = 1,
+    VegaWhite = 2,
 };
 
 class ColorTemperatureTable

src/celestia/celestiacore.cpp

@@ -1020,27 +1020,6 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
         singleView();
         break;
 
-    case '\023':  // Ctrl+S
-        renderer->setStarStyle((Renderer::StarStyle) (((int) renderer->getStarStyle() + 1) %
-                                                      (int) Renderer::StarStyleCount));
-        switch (renderer->getStarStyle())
-        {
-        case Renderer::FuzzyPointStars:
-            flash(_("Star style: fuzzy points"));
-            break;
-        case Renderer::PointStars:
-            flash(_("Star style: points"));
-            break;
-        case Renderer::ScaledDiscStars:
-            flash(_("Star style: scaled discs"));
-            break;
-        default:
-            break;
-        }
-
-        notifyWatchers(RenderFlagsChanged);
-        break;
-
     case '\024':  // Ctrl+T
         renderer->setRenderFlags(renderer->getRenderFlags() ^ Renderer::ShowCometTails);
         if (renderer->getRenderFlags() & Renderer::ShowCometTails)
@@ -1150,29 +1129,23 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
     case '%':
         switch (renderer->getStarColorTable())
         {
-        case ColorTableType::Enhanced:
+        case ColorTableType::Blackbody_D65:
             renderer->setStarColorTable(ColorTableType::Blackbody_D65);
             flash(_("Star color: Blackbody D65"));
             notifyWatchers(RenderFlagsChanged);
             break;
 
-        case ColorTableType::Blackbody_D65:
+        case ColorTableType::SunWhite:
             renderer->setStarColorTable(ColorTableType::SunWhite);
             flash(_("Star color: Blackbody (Solar Whitepoint)"));
             notifyWatchers(RenderFlagsChanged);
             break;
 
-        case ColorTableType::SunWhite:
+        case ColorTableType::VegaWhite:
             renderer->setStarColorTable(ColorTableType::VegaWhite);
             flash(_("Star color: Blackbody (Vega Whitepoint)"));
             notifyWatchers(RenderFlagsChanged);
             break;
-
-        case ColorTableType::VegaWhite:
-            renderer->setStarColorTable(ColorTableType::Enhanced);
-            flash(_("Star color: Classic"));
-            notifyWatchers(RenderFlagsChanged);
-            break;
         }
         break;
 

src/celestia/gtk/actions.cpp

@@ -871,13 +871,6 @@ actionVerbosity(GtkRadioAction* action, GtkRadioAction*, AppData* app)
     app->core->setHudDetail(value);
 }
 
-void
-actionStarStyle(GtkRadioAction* action, GtkRadioAction*, AppData* app)
-{
-    int value = gtk_radio_action_get_current_value(action);
-    app->renderer->setStarStyle((Renderer::StarStyle)value);
-}
-
 void
 actionAmbientLight(GtkRadioAction* action, GtkRadioAction*, AppData* app)
 {
@@ -1347,26 +1340,6 @@ resyncAmbientActions(AppData* app)
     gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), TRUE);
 }
 
-/* Synchronizes the Verbosity Actions with the state of the core */
-void
-resyncStarStyleActions(AppData* app)
-{
-    GtkAction* action;
-    const char* actionName;
-
-    switch (app->renderer->getStarStyle())
-    {
-        case Renderer::FuzzyPointStars: actionName = "StarsFuzzy"; break;
-        case Renderer::PointStars: actionName = "StarsPoints"; break;
-        case Renderer::ScaledDiscStars: actionName = "StarsDiscs"; break;
-        default: return;
-    }
-
-    /* Get the action, set the widget */
-    action = gtk_action_group_get_action(app->agStarStyle, actionName);
-    gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), TRUE);
-}
-
 /* Placeholder for when galaxy brightness is added as an action */
 void
 resyncGalaxyGainActions(AppData* app)

src/celestia/gtk/actions.h

@@ -66,7 +66,6 @@ void actionHelpAbout(GtkAction*, AppData*);
 
 /* Radio Button Actions */
 void actionVerbosity(GtkRadioAction*, GtkRadioAction*, AppData*);
-void actionStarStyle(GtkRadioAction*, GtkRadioAction*, AppData*);
 void actionAmbientLight(GtkRadioAction*, GtkRadioAction*, AppData*);
 
 /* Render-Flag Actions */
@@ -130,7 +129,6 @@ void resyncOrbitActions(AppData* app);
 void resyncVerbosityActions(AppData* app);
 void resyncTimeZoneAction(AppData* app);
 void resyncAmbientActions(AppData* app);
-void resyncStarStyleActions(AppData* app);
 void resyncGalaxyGainActions(AppData* app);
 void resyncTextureResolutionActions(AppData* app);
 

src/celestia/gtk/common.cpp

@@ -180,7 +180,7 @@ setSaneAmbientLight(AppData* app, float value)
 
 /* Sanitizes and sets Exposure */
 void
-setSaneVisualMagnitude(AppData* app, float value)
+setSaneExposure(AppData* app, float value)
 {
     if (value < 0.0 || value > 1000.0)
         value = 1.0f; /* Default */
@@ -218,16 +218,6 @@ setSaneVerbosity(AppData* app, int value)
     app->core->setHudDetail(value);
 }
 
-/* Sanitizes and sets Star Style */
-void
-setSaneStarStyle(AppData* app, Renderer::StarStyle value)
-{
-    if (value < Renderer::FuzzyPointStars || value > Renderer::ScaledDiscStars)
-        value = Renderer::FuzzyPointStars;
-
-    app->renderer->setStarStyle(value);
-}
-
 /* Sanitizes and sets Texture Resolution */
 void
 setSaneTextureResolution(AppData* app, int value)

src/celestia/gtk/common.h

@@ -43,7 +43,6 @@ struct _AppData {
     GtkActionGroup* agOrbit;
     GtkActionGroup* agLabel;
     GtkActionGroup* agVerbosity;
-    GtkActionGroup* agStarStyle;
     GtkActionGroup* agAmbient;
 
     /* Settings */
@@ -80,11 +79,10 @@ int getWinY(AppData* app);
 
 /* Functions to apply preferences with sanity checks */
 void setSaneAmbientLight(AppData* app, float value);
-void setSaneVisualMagnitude(AppData* app, float value);
+void setSaneExposure(AppData* app, float value);
 void setSaneGalaxyLightGain(float value);
 void setSaneDistanceLimit(AppData* app, int value);
 void setSaneVerbosity(AppData* app, int value);
-void setSaneStarStyle(AppData* app, Renderer::StarStyle value);
 void setSaneTextureResolution(AppData* app, int value);
 void setSaneAltSurface(AppData* app, char* value);
 void setSaneWinSize(AppData* app, int x, int y);