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

Fading orbits in Win32 and Gtk2 frontends

pull/317/head
Hleb Valoshka 2018-11-30 23:12:28 +03:00
parent c07c36e70c
commit e7aaee0ec8
7 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/celestia/gtk/actions.cpp
View File

@ -878,6 +878,11 @@ void actionRenderOrbits(GtkToggleAction* action, AppData* app)
setRenderFlag(app, Renderer::ShowOrbits, gtk_toggle_action_get_active(action));
}
void actionRenderFadingOrbits(GtkToggleAction* action, AppData* app)
{
setRenderFlag(app, Renderer::ShowFadingOrbits, gtk_toggle_action_get_active(action));
}
void actionRenderPlanets(GtkToggleAction* action, AppData* app)
{
@ -1360,6 +1365,7 @@ void resyncRenderActions(AppData* app)
case Renderer::ShowDiagrams: actionName = "RenderConstellations"; break;
case Renderer::ShowCloudMaps: actionName = "RenderClouds"; break;
case Renderer::ShowOrbits: actionName = "RenderOrbits"; break;
case Renderer::ShowFadingOrbits: actionName = "RenderFadingOrbits"; break;
case Renderer::ShowCelestialSphere: actionName = "RenderCelestialGrid"; break;
case Renderer::ShowNightMaps: actionName = "RenderNightLights"; break;
case Renderer::ShowAtmospheres: actionName = "RenderAtmospheres"; break;

1
src/celestia/gtk/actions.h
View File

@ -89,6 +89,7 @@ void actionRenderNebulae(GtkToggleAction*, AppData*);
void actionRenderNightLights(GtkToggleAction*, AppData*);
void actionRenderOpenClusters(GtkToggleAction*, AppData*);
void actionRenderOrbits(GtkToggleAction*, AppData*);
void actionRenderFadingOrbits(GtkToggleAction*, AppData*);
void actionRenderPlanets(GtkToggleAction*, AppData*);
void actionRenderDwarfPlanets(GtkToggleAction*, AppData*);
void actionRenderMoons(GtkToggleAction*, AppData*);

1
src/celestia/gtk/data/celestiaui.xml
View File

@ -85,6 +85,7 @@
</menu>
<menu action='ShowOrbitsMenu'>
<menuitem action='RenderOrbits'/>
<menuitem action='RenderFadingOrbits'/>
<separator/>
<menuitem action='OrbitAsteroids'/>
<menuitem action='OrbitComets'/>

2
src/celestia/gtk/settings-file.cpp
View File

@ -153,6 +153,7 @@ void applySettingsFileMain(AppData* app, GKeyFile* file)
getFlag64(file, &rf, Renderer::ShowDiagrams, "RenderFlags", "diagrams", &errors);
getFlag64(file, &rf, Renderer::ShowCloudMaps, "RenderFlags", "cloudMaps", &errors);
getFlag64(file, &rf, Renderer::ShowOrbits, "RenderFlags", "orbits", &errors);
getFlag64(file, &rf, Renderer::ShowFadingOrbits, "RenderFlags", "fadingorbits", &errors);
getFlag64(file, &rf, Renderer::ShowCelestialSphere, "RenderFlags", "celestialSphere", &errors);
getFlag64(file, &rf, Renderer::ShowNightMaps, "RenderFlags", "nightMaps", &errors);
getFlag64(file, &rf, Renderer::ShowAtmospheres, "RenderFlags", "atmospheres", &errors);
@ -266,6 +267,7 @@ void saveSettingsFile(AppData* app)
g_key_file_set_boolean(file, "RenderFlags", "diagrams", (rf & Renderer::ShowDiagrams) != 0);
g_key_file_set_boolean(file, "RenderFlags", "cloudMaps", (rf & Renderer::ShowCloudMaps) != 0);
g_key_file_set_boolean(file, "RenderFlags", "orbits", (rf & Renderer::ShowOrbits) != 0);
g_key_file_set_boolean(file, "RenderFlags", "fadingorbits", (rf & Renderer::ShowFadingOrbits) != 0);
g_key_file_set_boolean(file, "RenderFlags", "celestialSphere", (rf & Renderer::ShowCelestialSphere) != 0);
g_key_file_set_boolean(file, "RenderFlags", "nightMaps", (rf & Renderer::ShowNightMaps) != 0);
g_key_file_set_boolean(file, "RenderFlags", "atmospheres", (rf & Renderer::ShowAtmospheres) != 0);

1
src/celestia/gtk/ui.h
View File

@ -149,6 +149,7 @@ static const GtkToggleActionEntry actionsRenderFlags[] = {
{ "RenderNightLights", NULL, "Night Side Lights", "<control>L", NULL, G_CALLBACK(actionRenderNightLights), FALSE },
{ "RenderOpenClusters", NULL, "Open Clusters", NULL, NULL, G_CALLBACK(actionRenderOpenClusters), FALSE },
{ "RenderOrbits", NULL, "Orbits", "O", NULL, G_CALLBACK(actionRenderOrbits), FALSE },
{ "RenderFadingOrbits", NULL, "Fading Orbits", NULL, NULL, G_CALLBACK(actionRenderFadingOrbits), FALSE },
{ "RenderPlanets", NULL, "Planets", NULL, NULL, G_CALLBACK(actionRenderPlanets), FALSE },
{ "RenderDwarfPlanets", NULL, "Dwarf Planets", NULL, NULL, G_CALLBACK(actionRenderDwarfPlanets), FALSE },
{ "RenderMoons", NULL, "Moons", NULL, NULL, G_CALLBACK(actionRenderMoons), FALSE },

3
src/celestia/win32/res/resource.h
View File

@ -268,6 +268,7 @@
#define IDC_SHOWASTEROIDS 1160
#define IDC_SHOWCOMETS 1161
#define IDC_SHOWSPACECRAFTS 1162
#define IDC_SHOWFADINGORBITS 1163
// Next default values for new objects
@ -276,7 +277,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 142
#define _APS_NEXT_COMMAND_VALUE 40091
#define _APS_NEXT_CONTROL_VALUE 1163
#define _APS_NEXT_CONTROL_VALUE 1164
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

7
src/celestia/win32/winviewoptsdlg.cpp
View File

@ -107,6 +107,9 @@ static BOOL APIENTRY ViewOptionsProc(HWND hDlg,
case IDC_SHOWORBITS:
renderer->setRenderFlags(renderFlags ^ Renderer::ShowOrbits);
break;
case IDC_SHOWFADINGORBITS:
renderer->setRenderFlags(renderFlags ^ Renderer::ShowFadingOrbits);
break;
case IDC_PLANETORBITS:
renderer->setOrbitMask(orbitMask ^ Body::Planet);
break;
@ -348,8 +351,8 @@ void ViewOptionsDialog::SetControls(HWND hDlg)
(renderFlags & Renderer::ShowOpenClusters)? BST_CHECKED:BST_UNCHECKED, 0);
SendDlgItemMessage(hDlg, IDC_SHOWNIGHTSIDELIGHTS, BM_SETCHECK,
(renderFlags & Renderer::ShowNightMaps)? BST_CHECKED:BST_UNCHECKED, 0);
SendDlgItemMessage(hDlg, IDC_SHOWORBITS, BM_SETCHECK,
(renderFlags & Renderer::ShowOrbits) != 0 ? BST_CHECKED : BST_UNCHECKED, 0);
dlgCheck(hDlg, IDC_SHOWORBITS, renderFlags, Renderer::ShowOrbits);
dlgCheck(hDlg, IDC_SHOWFADINGORBITS, renderFlags, Renderer::ShowFadingOrbits);
dlgCheck(hDlg, IDC_PLANETORBITS, orbitMask, Body::Planet);
dlgCheck(hDlg, IDC_DWARFPLANETORBITS,orbitMask, Body::DwarfPlanet);
dlgCheck(hDlg, IDC_MOONORBITS, orbitMask, Body::Moon);