# include <signal.h>
#endif
-#ifdef SG_MATH_EXCEPTION_CLASH
-# include <math.h>
-#endif
-
-#ifdef HAVE_WINDOWS_H
-# include <windows.h>
-# include <float.h>
-#endif
-
#include <plib/netSocket.h>
-#include <simgear/props/props.hxx>
-#include <simgear/timing/sg_time.hxx>
-#include <simgear/math/sg_random.h>
+#include <osgDB/Registry>
// Class references
#include <simgear/ephemeris/ephemeris.hxx>
#include <simgear/scene/material/matlib.hxx>
#include <simgear/scene/model/animation.hxx>
#include <simgear/scene/sky/sky.hxx>
+#include <simgear/structure/event_mgr.hxx>
+#include <simgear/props/props.hxx>
+#include <simgear/timing/sg_time.hxx>
+#include <simgear/math/sg_random.h>
+
#include <Time/light.hxx>
#include <Include/general.hxx>
#include <Aircraft/replay.hxx>
#include <Sound/beacon.hxx>
#include <Sound/morse.hxx>
#include <FDM/flight.hxx>
-#include <ATC/ATCmgr.hxx>
-#include <ATC/AIMgr.hxx>
+#include <ATCDCL/ATCmgr.hxx>
+#include <ATCDCL/AIMgr.hxx>
#include <Time/tmp.hxx>
#include <Time/fg_timer.hxx>
#include <Environment/environment_mgr.hxx>
#include "renderer.hxx"
#include "splash.hxx"
#include "main.hxx"
-
-
+#include "util.hxx"
+#include "fg_init.hxx"
static double real_delta_time_sec = 0.0;
double delta_time_sec = 0.0;
extern float init_volume;
-
-#ifdef macintosh
-# include <console.h> // -dw- for command line dialog
-#endif
-
// This is a record containing a bit of global housekeeping information
FGGeneral general;
double lat = fgGetDouble("/sim/presets/latitude-deg");
// We require just to have 50 meter scenery availabe around
// the aircraft.
- double range = 50.0;
- if (globals->get_tile_mgr()->scenery_available(lat, lon, range)) {
- SG_LOG(SG_FLIGHT,SG_INFO, "Finally initializing fdm");
+ double range = 1000.0;
+ if (globals->get_scenery()->scenery_available(lat, lon, range)) {
+ //SG_LOG(SG_FLIGHT, SG_INFO, "Finally initializing fdm");
cur_fdm_state->init();
if ( cur_fdm_state->get_bound() ) {
cur_fdm_state->unbind();
static SGPropertyNode_ptr frame_signal
= fgGetNode("/sim/signals/frame", true);
- frame_signal->setBoolValue(true);
+ frame_signal->fireValueChanged();
SGCloudLayer::enable_bump_mapping = fgGetBool("/sim/rendering/bump-mapping");
bool scenery_loaded = fgGetBool("sim/sceneryloaded");
SG_LOG( SG_ALL, SG_DEBUG, "Running Main Loop");
SG_LOG( SG_ALL, SG_DEBUG, "======= ==== ====");
-#if defined( ENABLE_PLIB_JOYSTICK )
- // Read joystick and update control settings
- // if ( fgGetString("/sim/control-mode") == "joystick" )
- // {
- // fgJoystickRead();
- // }
-#endif
-
// Fix elevation. I'm just sticking this here for now, it should
// probably move eventually
"Elapsed time is zero ... we're zinging" );
}
- globals->get_event_mgr()->update(delta_time_sec);
-
- // update the view angle
- globals->get_viewmgr()->update(delta_time_sec);
-
- // Do any I/O channel work that might need to be done
- globals->get_io()->update( real_delta_time_sec );
-
- // see if we need to load any deferred-load textures
- globals->get_matlib()->load_next_deferred();
-
// Run audio scheduler
#ifdef ENABLE_AUDIO_SUPPORT
if ( globals->get_soundmgr()->is_working() ) {
}
}
+ // run Nasal's settimer() loops right before the view manager
+ globals->get_event_mgr()->update(delta_time_sec);
+
+ // update the view angle as late as possible, but before sound calculations
+ globals->get_viewmgr()->update(delta_time_sec);
+
+ // Do any I/O channel work that might need to be done (must come after viewmgr)
+ globals->get_io()->update(real_delta_time_sec);
+
#ifdef ENABLE_AUDIO_SUPPORT
// Right now we make a simplifying assumption that the primary
// aircraft is the source of all sounds and that all sounds are
// END Tile Manager udpates
- if (!scenery_loaded && globals->get_tile_mgr()->all_queues_empty() && cur_fdm_state->get_inited()) {
+ if (!scenery_loaded && globals->get_tile_mgr()->isSceneryLoaded()
+ && cur_fdm_state->get_inited()) {
fgSetBool("sim/sceneryloaded",true);
fgSetFloat("/sim/sound/volume", init_volume);
globals->get_soundmgr()->set_volume(init_volume);
// then on.
static void fgIdleFunction ( void ) {
- // Some intialization requires a valid graphics context, in
- // particular that of plib. Boo, hiss!
- fgMakeCurrent();
if ( idle_state == 0 ) {
idle_state++;
SG_LOG ( SG_GENERAL, SG_INFO, "Depth buffer bits = " << tmp );
// Initialize the user interface so that we can use fonts
- guiInit();
+ guiStartInit();
} else if ( idle_state == 1 ) {
+ if (!guiFinishInit())
+ return;
idle_state++;
fgSplashProgress("reading aircraft list");
idle_state++;
// Read the list of available aircraft
fgReadAircraft();
-
- // get the address of our OpenGL extensions
-// if (SGIsOpenGLExtensionSupported("GL_EXT_point_parameters") ) {
-// glPointParameterIsSupported = true;
-// glPointParameterfPtr = (glPointParameterfProc)
-// SGLookupFunction("glPointParameterfEXT");
-// glPointParameterfvPtr = (glPointParameterfvProc)
-// SGLookupFunction("glPointParameterfvEXT");
-// } else if ( SGIsOpenGLExtensionSupported("GL_ARB_point_parameters") ) {
-// glPointParameterIsSupported = true;
-// glPointParameterfPtr = (glPointParameterfProc)
-// SGLookupFunction("glPointParameterfARB");
-// glPointParameterfvPtr = (glPointParameterfvProc)
-// SGLookupFunction("glPointParameterfvARB");
-// } else {
-// glPointParameterIsSupported = false;
-// }
fgSplashProgress("reading airport & navigation data");
// Initialize the material manager
////////////////////////////////////////////////////////////////////
globals->set_matlib( new SGMaterialLib );
- globals->set_model_lib(new SGModelLib);
+ simgear::SGModelLib::init(globals->get_fg_root());
////////////////////////////////////////////////////////////////////
system ( command.c_str() );
}
#endif
-
- // These are a few miscellaneous things that aren't really
- // "subsystems" but still need to be initialized.
-
-#ifdef USE_GLIDE
- if ( strstr ( general.get_glRenderer(), "Glide" ) ) {
- grTexLodBiasValue ( GR_TMU0, 1.0 ) ;
- }
-#endif
-
// This is the top level init routine which calls all the
// other subsystem initialization routines. If you are adding
// a subsystem to flightgear, its initialization call should be
// Main top level initialization
bool fgMainInit( int argc, char **argv ) {
-#if defined( macintosh )
- freopen ("stdout.txt", "w", stdout );
- freopen ("stderr.txt", "w", stderr );
- argc = ccommand( &argv );
-#endif
-
// set default log levels
sglog().setLogLevels( SG_ALL, SG_ALERT );
string_list *col = new string_list;
globals->set_channel_options_list( col );
+ fgValidatePath("", false); // initialize static variables
upper_case_property("/sim/presets/airport-id");
upper_case_property("/sim/presets/runway");
upper_case_property("/sim/tower/airport-id");
+ upper_case_property("/autopilot/route-manager/input");
// Scan the config file(s) and command line options to see if
// fg_root was specified (ignore all other options for now)
fgInitFGRoot(argc, argv);
// Check for the correct base package version
- static char required_version[] = "0.9.11";
+ static char required_version[] = "1.0.0";
string base_version = fgBasePackageVersion();
if ( !(base_version == required_version) ) {
// tell the operator how to use this application
}
// Initialize the Window/Graphics environment.
-#if !defined(__APPLE__) || defined(OSX_BUNDLE)
- // Mac OS X command line ("non-bundle") applications call this
- // from main(), in bootstrap.cxx. Andy doesn't know why, someone
- // feel free to add comments...
fgOSInit(&argc, argv);
_bootstrap_OSInit++;
-#endif
fgRegisterWindowResizeHandler( &FGRenderer::resize );
fgRegisterIdleHandler( &fgIdleFunction );
// Clouds3D requires an alpha channel
// clouds may require stencil buffer
- fgOSOpenWindow( fgGetInt("/sim/startup/xsize"),
- fgGetInt("/sim/startup/ysize"),
- fgGetInt("/sim/rendering/bits-per-pixel"),
- fgGetBool("/sim/rendering/clouds3d-enable"),
- get_stencil_buffer,
- fgGetBool("/sim/startup/fullscreen") );
+ fgOSOpenWindow(get_stencil_buffer);
// Initialize the splash screen right away
fntInit();
projects / flightgear.git / blobdiff