Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New rendering for starfield #1952

Draft
wants to merge 48 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
3a112ab
wip
375gnu Oct 24, 2023
7e49d11
Update shaders/star_vert.glsl
375gnu Oct 27, 2023
791a109
[skip ci] Merge branch 'master' into askaniys-stars
375gnu Oct 27, 2023
6036e69
wip
375gnu Oct 24, 2023
11ed2a0
wip
375gnu Jan 28, 2024
6cbd344
use br in psf instead of br0, fix point size
375gnu Jan 29, 2024
70890c8
wip
375gnu Jan 29, 2024
60e7495
Merge branch 'master' into askaniys-stars
375gnu Jun 25, 2024
3d78893
Merge branch 'askaniys-stars' of github.com:CelestiaProject/Celestia …
375gnu Jun 25, 2024
b2d23fb
New code for dim stars, clean-up
Askaniy Jun 30, 2024
2ca7268
Update PSF core
Askaniy Jul 2, 2024
f2fd102
Remove AutoMag and replace faintest magnitude with exposure (wip)
Askaniy Jul 2, 2024
e92bc38
More transition to the exposure system (wip)
Askaniy Jul 2, 2024
3daa0ba
Added getFluxInVegas
Askaniy Jul 3, 2024
5d472cc
Continuing the transition to the exposure system
Askaniy Jul 3, 2024
da37d6f
fixes
375gnu Jul 4, 2024
dc57069
Clear irradiance-irradiation system, fixes
Askaniy Jul 4, 2024
f9bc0ed
missing declaration fix
Askaniy Jul 4, 2024
08f22f9
wip
Askaniy Jul 4, 2024
4474b4a
wip
Askaniy Jul 5, 2024
25052db
wip
Askaniy Jul 5, 2024
1b7a795
wip
Askaniy Jul 5, 2024
84e6b43
wip
Askaniy Jul 5, 2024
462c18d
wip
Askaniy Jul 5, 2024
7d9332a
wip
Askaniy Jul 5, 2024
66b7031
Controls update (all languages)
Askaniy Jul 5, 2024
f613993
Start deleting star styles
Askaniy Jul 5, 2024
32b64ce
Delete star styles and legacy star colors, set solar whitepoint by de…
Askaniy Jul 5, 2024
317f973
fixes
Askaniy Jul 5, 2024
85ee257
New label brightness formula
Askaniy Jul 6, 2024
be3cc07
wip
Askaniy Jul 6, 2024
197b77b
Simpler fragment shader for 9 px mode
Askaniy Jul 6, 2024
cbd67e6
Deleting as much legacy stellar code as possible
Askaniy Jul 6, 2024
be55064
Merge the limb-darkening branch
Askaniy Jul 6, 2024
cb13c27
Copyright updates
Askaniy Jul 6, 2024
98ee734
Update astro constants with actual standards
Askaniy Jul 6, 2024
34e8927
clarification
Askaniy Jul 6, 2024
73281f2
clarification
Askaniy Jul 6, 2024
2bd203f
fixes
Askaniy Jul 6, 2024
7719c66
(semi)fixes
375gnu Jul 7, 2024
e203600
labels fixing
Askaniy Jul 8, 2024
1050ea2
Revert the computation of LN_MAG
Askaniy Jul 16, 2024
264fc23
Merge branch 'master' into askaniys-stars
ajtribick Jul 23, 2024
345adf3
Some random fixes
375gnu Jul 24, 2024
ec70d89
Merge branch 'master' into askaniys-stars
375gnu Oct 9, 2024
7bf6254
Merge branch 'master' into askaniys-stars
375gnu Nov 13, 2024
d18896f
Merge branch 'master' into askaniys-stars
375gnu Dec 31, 2024
8430822
fix merge issues
375gnu Dec 31, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions celestia.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,12 @@ StarTextures


#------------------------------------------------------------------------
# FaintestVisibleMagnitude defines the lowest magnitude at which a star
# will be displayed in Celestia. This setting may be adjusted real-time
# via the '[' and ']' keys in Celestia. The default value is 6.0.
# Exposure defines the time of light accumulation. It affects the
# brightness and the number of visible point sources (e.g. stars).
# This setting may be adjusted real-time via the '[' and ']' keys.
# The default value is 1.0.
#------------------------------------------------------------------------
FaintestVisibleMagnitude 6.0
Exposure 1.0


#------------------------------------------------------------------------
Expand Down
10 changes: 2 additions & 8 deletions controls.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,8 @@ N ...................................... Spacecraft
} ....................................... Increase Ambient Light
( ....................................... Decrease Galaxy Light Gain
) ....................................... Increase Galaxy Light Gain
[ ....................................... Decrease Magnitude Limit :
- If AutoMag OFF: Decrease limiting magnitude (fewer stars)
- If AutoMag ON : Decrease limiting magnitude at 45 deg FOV
] ....................................... Increase Magnitude :
- If AutoMag OFF: Increase limiting magnitude (more stars)
- If AutoMag ON : Increase limiting magnitude at 45 deg FOV
Ctrl+Y ............................... Toggle Auto Magnitude (auto adaptation of star visibility to FOV
[ ....................................... Decrease Exposure Time
] ....................................... Increase Exposure Time
, ....................................... Narrow Field Of View [Shift+Left Drag]
. ....................................... Widen Field Of View [Shift+Left Drag]
Ctrl+X ............................... Toggle Antialias lines
Expand All @@ -113,7 +108,6 @@ N ...................................... Spacecraft
Ctrl+V ............................... Cycle among supported OpenGL render paths
+ ...................................... Toggle Planet Texture type (Artistic / Limit of Knowledge)
% ..................................... Star color table toggle
Ctrl+S ............................... Cycle the Star Style (points / fuzzy discs / scaled discs)
V ...................................... Cycle the Info text verbosity (None / Terse / Verbose)
Ctrl+W .............................. Toggle Wireframe mode

Expand Down
30 changes: 3 additions & 27 deletions help/CelestiaGuide.html
Original file line number Diff line number Diff line change
Expand Up @@ -1431,31 +1431,15 @@ <h3 id="displayoptions">Render / Display Options</h3>
[
</td>
<td class="rightcell">
Decrease Magnitude Limit:
<br>
&nbsp; - If AutoMag OFF: Decrease limiting magnitude (fewer stars)
<br>
&nbsp; - If AutoMag ON : Decrease limiting magnitude at 45 deg FOV
Decrease Exposure Time
</td>
</tr>
<tr>
<td class="leftcell">
]
</td>
<td class="rightcell">
Increase Magnitude Limit:
<br>
&nbsp; - If AutoMag OFF: Increase limiting magnitude (more stars)
<br>
&nbsp; - If AutoMag ON : Increase limiting magnitude at 45 deg FOV
</td>
</tr>
<tr>
<td class="leftcell">
Ctrl+Y
</td>
<td class="rightcell">
Toggle Auto Magnitude (auto adaptation of star visibility to FOV)
Increase Exposure Time
</td>
</tr>
<tr>
Expand Down Expand Up @@ -1522,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
Expand Down Expand Up @@ -2477,7 +2453,7 @@ <h3>Answer:</h3>
<li>reduce the screen refresh rate</li>
<li>reduce the size of the window</li>
<li>reduce the size of objects drawn in the window so fewer stars and galaxies are obscured</li>
<li>reduce the number of stars and galaxies being obscured by turning down the limiting magnitude (type a <B>[</B> several times) or by disabling them entirely</li>
<li>reduce the number of stars and galaxies being obscured by decreasing exposure (type a <B>[</B> several times) or by disabling them entirely</li>
<li>reduce the number of objects being drawn by loading fewer addons.</li>
</ul>
<br>
Expand Down
10 changes: 2 additions & 8 deletions locale/controls_be.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,8 @@ N ..................... Караблі
} .................... Павялічыць расьсеянае сьвятло
( .................... Зьменшыць узмацненьне сьвятла ґаляктык
) .................... Павялічыць узмацненьне сьвятла ґаляктык
[ .................... Зьменшыць гранічную яркасьць:
- АўтаЯрк-ць ВЫКЛ: зьменшыць гр-ю ярк-ць (меней зорак)
- АўтаЯрк-ць УКЛ: зьменшыць гр-ю ярк-ць пры ПЗ 45°
] .................... Павялічыць гранічную яркасьць:
- АўтаЯрк-ць ВЫКЛ: павялічыць гр-ю ярк-ць (болей зорак)
- АўтаЯрк-ць УКЛ: павялічыць гр-ю ярк-ць пры ПЗ 45°
Ctrl+Y ............... Укл./Выкл. аўтаяркасьць (адаптацыю бачнасьці зорак да ПЗ)
[ .................... Паменшыць час экспазіцыі
] .................... Павялічыць час экспазіцыі
, .................... Зьменшыць поле зроку [Shift+Перацягваньне правай]
. .................... Пашырыць поле зроку [Shift+Перацягваньне левай]
Ctrl+X ............... Укл./Выкл. згладжваньне ліній
Expand All @@ -113,7 +108,6 @@ N ..................... Караблі
Ctrl+V ............... Зьмяніць тып будаўніка OpenGL
+ .................... Паказваць тэкстуру плянэт: мастацкую ці з абмежаваньнем ведаў
% .................... Зьмяніць колер зорак
Ctrl+S ............... Зьмяніць стыль зорак (кропкі/размытыя/дыскі)
V .................... Зьмяніць тып зьвестак (няма/сьціслы/падрабязны)
Ctrl+W ............... Укл./Выкл. каркасны рэжым

Expand Down
10 changes: 2 additions & 8 deletions locale/controls_bg.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,8 @@ N ...................................... Космически апарати
} ....................................... Увеличаване на фонова светлина
( ....................................... Намаляване на галактическата осветеност
) ....................................... Увеличаване на галактическата осветеност
[ ....................................... Намаляване на лимита на звездната величина :
- Ако автоматичната е изключена: Намалява лимита (по-малко видими звезди)
- Ако автоматичната е включена : Намалява лимита с 45 градусово FOV
] ....................................... Увеличаване на лимита на звездната величина :
- Ако автоматичната е изключена: Увеличава лимита (повече видими звезди)
- Ако автоматичната е включена : Увеличава лимита с 45 градусово FOV
Ctrl+Y ............................... Включване на автоматичната звездна величина (автоматична адаптация към FOV)
[ ....................................... Намаляване на времето за експозиция
] ....................................... Увеличаване на времето за експониране
, ....................................... Тясно зрително поле [Shift+Влачене наляво]
. ....................................... Широко зрително поле [Shift+Влачене наляво]
Ctrl+X ............................... Включване на изглаждане на линии
Expand All @@ -113,7 +108,6 @@ N ...................................... Космически апарати
Ctrl+V ............................... Превъртане на поддържаното OpenGL рендериране
+ ...................................... Превключване на планетните текстури (Артистични / Ограничени)
% ..................................... Включване на списъка с цвета на звездите
Ctrl+S ............................... Превъртане на стила на звездите (точки / неясни дискове / мащабирани дискове)
V ...................................... Превъртане на обема на информационния текст (Нищо / Сбито / Подробно)
Ctrl+W .............................. Включване на режим wireframe

Expand Down
14 changes: 2 additions & 12 deletions locale/controls_de.txt
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,8 @@ AltGr+{ ............. Streulichtanteil verringern
AltGr+} ............. Streulichtanteil erhöhen
Umschalt+( ...... Galaxienhelligkeit verringern (unabhängig von Sternhelligkeit)
Umschalt+) ...... Galaxienhelligkeit erhöhen (unabhängig von Sternhelligkeit)
AltGr+[ ............. Grenzmagnitude verringern:
- Wenn autoMag AUS: Magnitude verringern (weniger Sterne
sichtbar)
- Wenn autoMag EIN: Magnitude verringern bei 45° Blickfeld
AltGr+] ............. Grenzmagnitude erhöhen:
- Wenn autoMag AUS: Magnitude vergrößern (mehr Sterne
sichtbar)
- Wenn autoMag EIN: Magnitude vergrößern bei 45° Blickfeld
Strg+Y ............. autoMag ein-/ausschalten (autoMag = Automatische Anpassung
der Sternensichtbarkeit an das Blickfeld)
AltGr+[ ............. Belichtungszeit verringern
AltGr+] ............. Belichtungszeit erhöhen
, ....................... Blickfeld verkleinern (oder Umschalt+Linke Maustaste (ziehen))
. ....................... Blickfeld vergrößern (oder Umschalt+Linke Maustaste (ziehen))
Strg+X ............. Kantenglättung (Antialiasing) ein-/ausschalten (z. B. für die
Expand All @@ -192,8 +184,6 @@ Strg+V .............. Unterstützte OpenGL-Methoden durchschalten
+ ....................... Zwischen 'Limit Of Knowledge'-Texturen und interpretierenden
Texturen umschalten
% ....................... Farben für die Sterndarstellung umschalten
Strg+S .............. Aussehen der Sterne ändern (verschwommene Punkte, Punkte,
skalierte Scheiben)
V ....................... Umfang des Informationstextes verändern (knapp/ ausführlich/
kein Text)
Strg+W ............. Drahtgitter-Modus ein-/ausschalten
Expand Down
8 changes: 2 additions & 6 deletions locale/controls_es.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,8 @@ O : Mostrar órbitas
^ : Mostrar nebulosas
% : Saturación de colores de las estrellas
; : Mostrar una esfera de coordenadas ecuatoriales terrestres
[ : Si autoMag OFF: Reducir la magnitud límite (menos estrellas visibles)
Si autoMag ON : Reducir la magnitud límite a 45 grados de campo visual
] : Si autoMag OFF: Aumentar la magnitud límite (más estrellas visibles)
Si autoMag ON : Aumentar la magnitud límite a 45 grados de campo visual
[ : Disminuir el tiempo de exposición
] : Aumentar el tiempo de exposición
{ : Reducir la luz ambiente
} : Increase ambient illumination
( : Reducir el brillo de las galaxias independientemente del de las estrellas
Expand All @@ -86,12 +84,10 @@ Ctrl+E : Mostrar sombras de eclipses
Ctrl+K : Mostrar marcadores
Ctrl+L : Mostrar el lado nocturno de los planetas (contaminación lumínica)
Ctrl+P : Marcar el objeto seleccionado
Ctrl+S : Cambiar el estilo de las estrellas entre discos difusos, puntos y discos a escala
Ctrl+T : Mostrar colas de cometas
Ctrl+V : Cambiar entre los procesos OpenGL soportados
Ctrl+W : Cambiar a modo alambres
Ctrl+X : Cambiar a suavizado de líneas
Ctrl+Y : Cambiar autoMag = adaptación automática de la visibilidad estelar al
campo visual
+ : Cambiar entre representación artística y límite del conocimiento en las
texturas planetarias
Expand Down
11 changes: 2 additions & 9 deletions locale/controls_fr.txt
Original file line number Diff line number Diff line change
Expand Up @@ -142,26 +142,19 @@ F1 ou S................... Arrête le mouvement
{ ........................... Diminue la lumière ambiante
} ........................... Augmente la lumière ambiante
Ctrl + X ................. Anticrénelage. Lisse les lignes affichées ( ex : orbites)
Ctrl + Y ................. Auto Magnitude (on/off). Adaptation automatique de la
visibilité des étoiles en fonction du CdV. Parfait avec l'addon
contenant une base de données de 2 millions d'étoiles.
Alt + Entrée .......... Bascule Plein écran / mode fenêtré
, (virgule) .............. Diminue le champ de vision (CdV). (aussi avec Maj + drag).
. (point) ................. Augmente le CdV. (également possible avec Maj + drag)
( ............................ Diminue l'éclat des galaxies - indépendant des étoiles
) ............................ Augmente l'éclat des galaxies - indépendant des étoiles
[ ............................ Diminue la magnitude limite d'affichage des étoiles.
- Si AutoMag=Off : Il s'agit de la magnitude apparente réelle
- Sinon il s'agit de la magnitude pour un CdV de 45 degrés.
] ........................... Augmente la magnitude limite (on voit plus d'étoiles)
[ ............................ Diminuer le temps d'exposition
] ........................... Augmenter le temps d'exposition
- Même fonctionnement que ci-dessus
Ctrl + P ................. Marque l'objet sélectionné. L'option d'activation des
marqueurs doit être active (Ctrl + K)
Ctrl + V ................ Cycle parmi les différents modes de rendu disponibles.
+ .......................... Bascule entre les textures de surface normales/ connues
% ......................... Bascule entre les différentes tables de couleur des étoiles
Ctrl + S ................. Cycle entre les styles d'étoiles :
points flous, points et échelle de disques.
V .......................... Contrôle du texte d'information (aucun, concis, complet).
Ctr + W ................. Affichage "fil de fer"

Expand Down
10 changes: 2 additions & 8 deletions locale/controls_gl.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,8 @@ N ....................................... Sondas Espaciais
} ....................................... Incrementa-la Luz Ambiental
( ....................................... Reduci-la Luz das Galaxias (non a das súas estrelas)
) ....................................... Incrementa-la Luz das Galaxias (non a das súas estrelas)
[ ....................................... Reduci-lo Límite de Magnitude :
- Se a AutoMag está OFF: Reduci-lo límite de magnitude (menos estrelas)
- Se a AutoMag está ON : Reducir limitando a magnitude ós 45 graos do campo visual
] ....................................... Incrementa-la Magnitude :
- Se a AutoMag está OFF: Incrementa-lo límite de magnitude (máis estrelas)
- Se a AutoMag está ON : Incrementa-lo límite de magnitude ós 45 graos do campo visual
Ctrl+Y .................................. Cambia-lo Auto Magnitude (adaptación automática da visibilidade estelar ó campo visual
[ ....................................... Diminuír o tempo de exposición
] ....................................... Aumenta o tempo de exposición
, ....................................... Estreita-lo campo visual [Maiús.+Bt. esquerdo e arrastrar]
. ....................................... Expandi-lo campo visual [Maiús.+Bt. esquerdo e arrastrar]
Ctrl+X .................................. Cambia-lo suavizado de liñas
Expand All @@ -112,7 +107,6 @@ N ....................................... Sondas Espaciais
Ctrl+V .................................. Cambiar entre as rutas dos motores de procesación de OpenGL
+ ....................................... Cambiar entre presentación artística e o límite no coñecemento das texturas planetarias
% ....................................... Cambia-las táboas de cores das estrelas
Ctrl+S .................................. Cambia-los estilos das estrelas entre puntos, discos difusos e discos a escala
V ....................................... Cambia-la información do texto entre ningunha, estilo seco e estilo amigable
Ctrl+W .................................. Cambiar a modo Wireframe

Expand Down
Loading
Loading