Rename screen dump to snap shot.
Updated view enums.
This commit is contained in:
parent
d707c00c13
commit
c9b58a1e44
4 changed files with 18 additions and 12 deletions
|
@ -582,8 +582,8 @@ void printScreen ( puObject *obj ) {
|
||||||
#endif // #ifdef WIN32
|
#endif // #ifdef WIN32
|
||||||
|
|
||||||
|
|
||||||
// do a screen dump
|
// do a screen snap shot
|
||||||
void dumpScreen ( puObject *obj ) {
|
void dumpSnapShot ( puObject *obj ) {
|
||||||
bool show_pu_cursor = false;
|
bool show_pu_cursor = false;
|
||||||
|
|
||||||
mainMenuBar->hide();
|
mainMenuBar->hide();
|
||||||
|
@ -606,7 +606,7 @@ void dumpScreen ( puObject *obj ) {
|
||||||
current_options.get_xsize(),
|
current_options.get_xsize(),
|
||||||
current_options.get_ysize() );
|
current_options.get_ysize() );
|
||||||
|
|
||||||
mkDialog ("Screen dump saved to fgfs-screen.ppm");
|
mkDialog ("Snap shot saved to fgfs-screen.ppm");
|
||||||
|
|
||||||
if ( show_pu_cursor ) {
|
if ( show_pu_cursor ) {
|
||||||
puShowCursor();
|
puShowCursor();
|
||||||
|
@ -835,7 +835,7 @@ char *fileSubmenu [] = {
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
"Print",
|
"Print",
|
||||||
#endif
|
#endif
|
||||||
"Screen Dump",
|
"Snap Shot",
|
||||||
/* "---------", "Save", */
|
/* "---------", "Save", */
|
||||||
"Reset", NULL
|
"Reset", NULL
|
||||||
};
|
};
|
||||||
|
@ -845,7 +845,7 @@ puCallback fileSubmenuCb [] = {
|
||||||
printScreen,
|
printScreen,
|
||||||
#endif
|
#endif
|
||||||
/* NULL, notCb, */
|
/* NULL, notCb, */
|
||||||
dumpScreen,
|
dumpSnapShot,
|
||||||
reInit, NULL
|
reInit, NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -384,7 +384,7 @@ void fgRenderFrame( void ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( current_options.get_view_mode() ==
|
if ( current_options.get_view_mode() ==
|
||||||
fgOPTIONS::FG_VIEW_FIRST_PERSON )
|
fgOPTIONS::FG_VIEW_PILOT )
|
||||||
{
|
{
|
||||||
// disable TuX
|
// disable TuX
|
||||||
penguin_sel->select(0);
|
penguin_sel->select(0);
|
||||||
|
@ -491,7 +491,7 @@ void fgUpdateTimeDepCalcs(int multi_loop, int remainder) {
|
||||||
fdm_list.pop_front();
|
fdm_list.pop_front();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( current_options.get_view_mode() == fgOPTIONS::FG_VIEW_FIRST_PERSON ) {
|
if ( current_options.get_view_mode() == fgOPTIONS::FG_VIEW_PILOT ) {
|
||||||
cur_view_fdm = *cur_fdm_state;
|
cur_view_fdm = *cur_fdm_state;
|
||||||
// do nothing
|
// do nothing
|
||||||
} else if ( current_options.get_view_mode() == fgOPTIONS::FG_VIEW_FOLLOW ) {
|
} else if ( current_options.get_view_mode() == fgOPTIONS::FG_VIEW_FOLLOW ) {
|
||||||
|
|
|
@ -175,7 +175,7 @@ fgOPTIONS::fgOPTIONS() :
|
||||||
wireframe(0),
|
wireframe(0),
|
||||||
xsize(640),
|
xsize(640),
|
||||||
ysize(480),
|
ysize(480),
|
||||||
view_mode(FG_VIEW_FIRST_PERSON),
|
view_mode(FG_VIEW_PILOT),
|
||||||
|
|
||||||
// Scenery options
|
// Scenery options
|
||||||
tile_diameter(5),
|
tile_diameter(5),
|
||||||
|
|
|
@ -106,8 +106,14 @@ public:
|
||||||
|
|
||||||
enum fgViewMode
|
enum fgViewMode
|
||||||
{
|
{
|
||||||
FG_VIEW_FIRST_PERSON = 0,
|
FG_VIEW_PILOT = 0, // Pilot perspective
|
||||||
FG_VIEW_FOLLOW = 1
|
FG_VIEW_FOLLOW = 1, // Following in the "foot steps" so to speak
|
||||||
|
FG_VIEW_CHASE = 2, // Chase
|
||||||
|
FG_VIEW_CIRCLING = 3, // Circling
|
||||||
|
FG_VIEW_SATELLITE = 4, // From high above
|
||||||
|
FG_VIEW_ANCHOR = 5, // Drop an anchor and watch from there
|
||||||
|
FG_VIEW_TOWER = 6, // From nearest tower?
|
||||||
|
FG_VIEW_SPOTTER = 7 // Fron a ground spotter
|
||||||
};
|
};
|
||||||
|
|
||||||
enum fgAutoCoordMode
|
enum fgAutoCoordMode
|
||||||
|
@ -287,10 +293,10 @@ public:
|
||||||
inline void set_xsize( int x ) { xsize = x; }
|
inline void set_xsize( int x ) { xsize = x; }
|
||||||
inline void set_ysize( int y ) { ysize = y; }
|
inline void set_ysize( int y ) { ysize = y; }
|
||||||
inline void cycle_view_mode() {
|
inline void cycle_view_mode() {
|
||||||
if ( view_mode == FG_VIEW_FIRST_PERSON ) {
|
if ( view_mode == FG_VIEW_PILOT ) {
|
||||||
view_mode = FG_VIEW_FOLLOW;
|
view_mode = FG_VIEW_FOLLOW;
|
||||||
} else if ( view_mode == FG_VIEW_FOLLOW ) {
|
} else if ( view_mode == FG_VIEW_FOLLOW ) {
|
||||||
view_mode = FG_VIEW_FIRST_PERSON;
|
view_mode = FG_VIEW_PILOT;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue