spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Expanded preferences dialog box for Qt; added ability to turn off tinted illumination.

pull/110/head
Andrew Tribick 2012-05-23 21:28:37 +00:00
parent c01c112d16
commit 069a61b3af
5 changed files with 1743 additions and 1448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/celengine/render.cpp
View File

@ -2123,7 +2123,8 @@ static void
setupLightSources(const vector<const Star*>& nearStars,
const UniversalCoord& observerPos,
double t,
vector<LightSource>& lightSources)
vector<LightSource>& lightSources,
int renderFlags)
{
lightSources.clear();
@ -2138,26 +2139,33 @@ setupLightSources(const vector<const Star*>& nearStars,
ls.luminosity = (*iter)->getLuminosity();
ls.radius = (*iter)->getRadius();
// If the star is sufficiently cool, change the light color
// from white. Though our sun appears yellow, we still make
// it and all hotter stars emit white light, as this is the
// 'natural' light to which our eyes are accustomed. We also
// assign a slight bluish tint to light from O and B type stars,
// though these will almost never have planets for their light
// to shine upon.
float temp = (*iter)->getTemperature();
if (temp > 30000.0f)
ls.color = Color(0.8f, 0.8f, 1.0f);
else if (temp > 10000.0f)
ls.color = Color(0.9f, 0.9f, 1.0f);
else if (temp > 5400.0f)
ls.color = Color(1.0f, 1.0f, 1.0f);
else if (temp > 3900.0f)
ls.color = Color(1.0f, 0.9f, 0.8f);
else if (temp > 2000.0f)
ls.color = Color(1.0f, 0.7f, 0.7f);
if (renderFlags & Renderer::ShowTintedIllumination)
{
// If the star is sufficiently cool, change the light color
// from white. Though our sun appears yellow, we still make
// it and all hotter stars emit white light, as this is the
// 'natural' light to which our eyes are accustomed. We also
// assign a slight bluish tint to light from O and B type stars,
// though these will almost never have planets for their light
// to shine upon.
float temp = (*iter)->getTemperature();
if (temp > 30000.0f)
ls.color = Color(0.8f, 0.8f, 1.0f);
else if (temp > 10000.0f)
ls.color = Color(0.9f, 0.9f, 1.0f);
else if (temp > 5400.0f)
ls.color = Color(1.0f, 1.0f, 1.0f);
else if (temp > 3900.0f)
ls.color = Color(1.0f, 0.9f, 0.8f);
else if (temp > 2000.0f)
ls.color = Color(1.0f, 0.7f, 0.7f);
else
ls.color = Color(1.0f, 0.4f, 0.4f);
}
else
ls.color = Color(1.0f, 0.4f, 0.4f);
{
ls.color = Color(1.0f, 1.0f, 1.0f);
}
lightSources.push_back(ls);
}
@ -2867,7 +2875,7 @@ void Renderer::draw(const Observer& observer,
universe.getNearStars(observer.getPosition(), 1.0f, nearStars);
// Set up direct light sources (i.e. just stars at the moment)
setupLightSources(nearStars, observer.getPosition(), now, lightSourceList);
setupLightSources(nearStars, observer.getPosition(), now, lightSourceList, renderFlags);
// Traverse the frame trees of each nearby solar system and
// build the list of objects to be rendered.
@ -9209,8 +9217,6 @@ void PointStarRenderer::process(const Star& star, float distance, float appMag)
#else
Color starColor = colorTemp->lookupColor(star.getTemperature());
#endif
float renderDistance = distance;
/*float s = renderDistance * size; Unused*/
float discSizeInPixels = 0.0f;
float orbitSizeInPixels = 0.0f;
@ -9243,7 +9249,6 @@ void PointStarRenderer::process(const Star& star, float distance, float appMag)
appMag = astro::absToAppMag(star.getAbsoluteMagnitude(), distance);
float f = RenderDistance / distance;
renderDistance = RenderDistance;
starPos = obsPos.cast<float>() + relPos * f;
float radius = star.getRadius();

5
src/celengine/render.h
View File

@ -163,12 +163,13 @@ class Renderer
ShowPartialTrajectories = 0x20000,
ShowNebulae = 0x40000,
ShowOpenClusters = 0x80000,
ShowGlobulars = 0x100000,
ShowCloudShadows = 0x200000,
ShowGlobulars = 0x100000,
ShowCloudShadows = 0x200000,
ShowGalacticGrid = 0x400000,
ShowEclipticGrid = 0x800000,
ShowHorizonGrid = 0x1000000,
ShowEcliptic = 0x2000000,
ShowTintedIllumination = 0x4000000,
};
enum StarStyle

1167
src/celestia/qt/preferences.ui
View File

File diff suppressed because it is too large Load Diff

1802
src/celestia/qt/qtpreferencesdialog.cpp
View File

File diff suppressed because it is too large Load Diff

164
src/celestia/qt/qtpreferencesdialog.h
View File

@ -12,19 +12,11 @@
// of the License, or (at your option) any later version.
#include <QDialog>
#include "ui_preferences.h"
#include <celutil/basictypes.h>
class CelestiaCore;
class QLabel;
class QSpinBox;
class QComboBox;
class QCheckBox;
class KKeyChooser;
class CelestiaAppWindow;
class PreferencesDialog : public QDialog
{
Q_OBJECT
@ -33,83 +25,95 @@ public:
PreferencesDialog(QWidget* parent, CelestiaCore* core);
~PreferencesDialog();
public slots:
void slotOk();
void slotApply();
void slotCancel();
void setNow();
void ltSubstract();
void slotTimeHasChanged();
void slotAmbientLightLevel(int l);
void slotFaintestVisible(int m);
void slotRenderPath(int);
void slotDistanceToScreen(int);
void slotMinFeatureSize(int);
private slots:
void on_starsCheck_stateChanged(int state);
void on_planetsCheck_stateChanged(int state);
void on_galaxiesCheck_stateChanged(int state);
void on_nebulaeCheck_stateChanged(int state);
void on_openClustersCheck_stateChanged(int state);
void on_globularClustersCheck_stateChanged(int state);
// Objects
void slotShowStars(bool);
void slotShowPlanets(bool);
void slotShowGalaxies(bool);
void slotShowNebulae(bool);
void slotShowOpenClusters(bool);
void on_atmospheresCheck_stateChanged(int state);
void on_cloudsCheck_stateChanged(int state);
void on_cloudShadowsCheck_stateChanged(int state);
void on_eclipseShadowsCheck_stateChanged(int state);
void on_ringShadowsCheck_stateChanged(int state);
void on_nightsideLightsCheck_stateChanged(int state);
void on_cometTailsCheck_stateChanged(int state);
void on_limitOfKnowledgeCheck_stateChanged(int state);
// Features
void slotShowAtmospheres(bool);
void slotShowCloudMaps(bool);
void slotShowNightMaps(bool);
void slotShowEclipseShadows(bool);
void slotShowRingShadows(bool);
void slotShowCloudShadows(bool);
void slotShowCometTails(bool);
void on_orbitsCheck_stateChanged(int state);
void on_starOrbitsCheck_stateChanged(int state);
void on_planetOrbitsCheck_stateChanged(int state);
void on_dwarfPlanetOrbitsCheck_stateChanged(int state);
void on_moonOrbitsCheck_stateChanged(int state);
void on_minorMoonOrbitsCheck_stateChanged(int state);
void on_asteroidOrbitsCheck_stateChanged(int state);
void on_cometOrbitsCheck_stateChanged(int state);
void on_spacecraftOrbitsCheck_stateChanged(int state);
void on_partialTrajectoriesCheck_stateChanged(int state);
// Guides
void slotShowOrbits(bool);
void slotShowPartialTrajectories(bool);
void slotShowSmoothLines(bool);
void slotShowCelestialSphere(bool);
void slotShowMarkers(bool);
void slotShowDiagrams(bool);
void slotShowBoundaries(bool);
void on_equatorialGridCheck_stateChanged(int state);
void on_eclipticGridCheck_stateChanged(int state);
void on_galacticGridCheck_stateChanged(int state);
void on_horizontalGridCheck_stateChanged(int state);
// Date Format
void slotDateFormatChanged();
void on_diagramsCheck_stateChanged(int state);
void on_boundariesCheck_stateChanged(int state);
void on_latinNamesCheck_stateChanged(int state);
void on_markersCheck_stateChanged(int state);
void on_eclipticLineCheck_stateChanged(int state);
void on_starLabelsCheck_stateChanged(int state);
void on_planetLabelsCheck_stateChanged(int state);
void on_dwarfPlanetLabelsCheck_stateChanged(int state);
void on_moonLabelsCheck_stateChanged(int state);
void on_minorMoonLabelsCheck_stateChanged(int state);
void on_asteroidLabelsCheck_stateChanged(int state);
void on_cometLabelsCheck_stateChanged(int state);
void on_spacecraftLabelsCheck_stateChanged(int state);
void on_galaxyLabelsCheck_stateChanged(int state);
void on_nebulaLabelsCheck_stateChanged(int state);
void on_openClusterLabelsCheck_stateChanged(int state);
void on_globularClusterLabelsCheck_stateChanged(int state);
void on_constellationLabelsCheck_stateChanged(int state);
void on_locationsCheck_stateChanged(int state);
void on_citiesCheck_stateChanged(int state);
void on_observatoriesCheck_stateChanged(int state);
void on_landingSitesCheck_stateChanged(int state);
void on_montesCheck_stateChanged(int state);
void on_mariaCheck_stateChanged(int state);
void on_cratersCheck_stateChanged(int state);
void on_vallesCheck_stateChanged(int state);
void on_terraeCheck_stateChanged(int state);
void on_volcanoesCheck_stateChanged(int state);
void on_otherLocationsCheck_stateChanged(int state);
void on_featureSizeSlider_valueChanged(int value);
void on_featureSizeEdit_textEdited(const QString& text);
void on_renderPathBox_currentIndexChanged(int index);
void on_antialiasLinesCheck_stateChanged(int state);
void on_tintedIlluminationCheck_stateChanged(int state);
void on_lowResolutionButton_clicked();
void on_mediumResolutionButton_clicked();
void on_highResolutionButton_clicked();
void on_ambientLightSlider_valueChanged(int value);
void on_pointStarsButton_clicked();
void on_scaledDiscsButton_clicked();
void on_fuzzyPointStarsButton_clicked();
void on_autoMagnitudeCheck_stateChanged(int state);
void on_starColorBox_currentIndexChanged(int index);
void on_dateFormatBox_currentIndexChanged(int index);
protected:
CelestiaCore* appCore;
CelestiaAppWindow* parent;
QComboBox* dateFormatBox;
int savedRendererFlags;
int savedLabelMode;
int savedOrbitMask;
int savedAmbientLightLevel;
int savedFaintestVisible;
int savedHudDetail;
int savedDisplayLocalTime;
int savedRenderPath;
int savedDistanceToScreen;
uint32 savedLocationFilter;
int savedMinFeatureSize;
bool savedVideoSync;
bool timeHasChanged;
QComboBox* displayTimezoneCombo;
QComboBox* setTimezoneCombo;
QSpinBox *YSpin, *MSpin, *DSpin;
QSpinBox *hSpin, *mSpin, *sSpin;
QSpinBox *dtsSpin;
QComboBox *renderPathCombo;
QLabel* renderPathLabel;
QLabel* ambientLabel, *faintestLabel, *minFeatureSizeLabel;
void setTime(double d);
double getTime() const;
void setRenderPathLabel();
Ui_preferencesDialog ui;
};