#include <ATCDCL/ATCmgr.hxx>
#include <ATCDCL/AIMgr.hxx>
#include <Time/tmp.hxx>
-#include <Time/fg_timer.hxx>
#include <Environment/environment_mgr.hxx>
#include <GUI/new_gui.hxx>
#include <MultiPlayer/multiplaymgr.hxx>
#include "main.hxx"
#include "util.hxx"
#include "fg_init.hxx"
+#include "fg_os.hxx"
#include "WindowSystemAdapter.hxx"
// round the real time down to a multiple of 1/model-hz.
// this way all systems are updated the _same_ amount of dt.
- {
- static double rem = 0.0;
- real_delta_time_sec += rem;
- double hz = model_hz;
- double nit = floor(real_delta_time_sec*hz);
- rem = real_delta_time_sec - nit/hz;
- real_delta_time_sec = nit/hz;
- }
-
+ static double reminder = 0.0;
+ real_delta_time_sec += reminder;
+ global_multi_loop = long(floor(real_delta_time_sec*model_hz));
+ global_multi_loop = SGMisc<long>::max(0, global_multi_loop);
+ reminder = real_delta_time_sec - double(global_multi_loop)/double(model_hz);
+ real_delta_time_sec = double(global_multi_loop)/double(model_hz);
if (clock_freeze->getBoolValue() || wait_for_scenery) {
delta_time_sec = 0;
fgSetDouble("/sim/time/delta-realtime-sec", real_delta_time_sec);
fgSetDouble("/sim/time/delta-sec", delta_time_sec);
- static long remainder = 0;
- long elapsed;
#ifdef FANCY_FRAME_COUNTER
int i;
double accum;
altitude->getDoubleValue() * SG_FEET_TO_METER,
globals->get_time_params()->getJD() );
- // Get elapsed time (in usec) for this past frame
- elapsed = fgGetTimeInterval();
- SG_LOG( SG_ALL, SG_DEBUG,
- "Elapsed time interval is = " << elapsed
- << ", previous remainder is = " << remainder );
-
// Calculate frame rate average
#ifdef FANCY_FRAME_COUNTER
/* old fps calculation */
globals->get_AI_mgr()->update(delta_time_sec);
// Run flight model
-
- // Calculate model iterations needed for next frame
- elapsed += remainder;
-
- global_multi_loop = (long)(((double)elapsed * 0.000001) * model_hz );
- remainder = elapsed - ( (global_multi_loop*1000000) / model_hz );
- SG_LOG( SG_ALL, SG_DEBUG,
- "Model iterations needed = " << global_multi_loop
- << ", new remainder = " << remainder );
-
- // chop max iterations to something reasonable if the sim was
- // delayed for an excessive amount of time
- if ( global_multi_loop > 2.0 * model_hz ) {
- global_multi_loop = (int)(2.0 * model_hz );
- remainder = 0;
- }
-
- // flight model
- if ( global_multi_loop > 0) {
+ if (0 < global_multi_loop) {
// first run the flight model each frame until it is initialized
- // then continue running each frame only after initial scenery load is complete.
+ // then continue running each frame only after initial scenery
+ // load is complete.
fgUpdateTimeDepCalcs();
} else {
SG_LOG( SG_ALL, SG_DEBUG,
globals->get_model_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);
+ globals->get_viewmgr()->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
- // positioned in the aircraft base
-
- static sgdVec3 last_listener_pos = {0, 0, 0};
- static sgdVec3 last_model_pos = {0, 0, 0};
-
- // get the orientation
- const SGQuatd view_or = current_view->getViewOrientation();
- SGQuatd surf_or = SGQuatd::fromLonLatDeg(
- current_view->getLongitude_deg(), current_view->getLatitude_deg());
- SGQuatd model_or = SGQuatd::fromYawPitchRollDeg(
- globals->get_aircraft_model()->get3DModel()->getHeadingDeg(),
- globals->get_aircraft_model()->get3DModel()->getPitchDeg(),
- globals->get_aircraft_model()->get3DModel()->getRollDeg());
-
- // get the up and at vector in the aircraft base
- // (ok, the up vector is a down vector, but the coordinates
- // are finally calculated in a left hand system and openal
- // lives in a right hand system. Therefore we need to pass
- // the down vector to get correct stereo sound.)
- SGVec3d sgv_up = model_or.rotateBack(
- surf_or.rotateBack(view_or.rotate(SGVec3d(0, 1, 0))));
- sgVec3 up;
- sgSetVec3(up, sgv_up[0], sgv_up[1], sgv_up[2]);
- SGVec3d sgv_at = model_or.rotateBack(
+ if ( globals->get_soundmgr()->is_working() ) {
+ // Right now we make a simplifying assumption that the primary
+ // aircraft is the source of all sounds and that all sounds are
+ // positioned in the aircraft base
+
+ static sgdVec3 last_listener_pos = {0, 0, 0};
+ static sgdVec3 last_model_pos = {0, 0, 0};
+
+ // get the orientation
+ const SGQuatd view_or = current_view->getViewOrientation();
+ SGQuatd surf_or = SGQuatd::fromLonLat(current_view->getPosition());
+ SGQuatd model_or = SGQuatd::fromYawPitchRollDeg(
+ globals->get_aircraft_model()->get3DModel()->getHeadingDeg(),
+ globals->get_aircraft_model()->get3DModel()->getPitchDeg(),
+ globals->get_aircraft_model()->get3DModel()->getRollDeg());
+
+ // get the up and at vector in the aircraft base
+ // (ok, the up vector is a down vector, but the coordinates
+ // are finally calculated in a left hand system and openal
+ // lives in a right hand system. Therefore we need to pass
+ // the down vector to get correct stereo sound.)
+ SGVec3d sgv_up = model_or.rotateBack(
+ surf_or.rotateBack(view_or.rotate(SGVec3d(0, 1, 0))));
+ sgVec3 up;
+ sgSetVec3(up, sgv_up[0], sgv_up[1], sgv_up[2]);
+ SGVec3d sgv_at = model_or.rotateBack(
surf_or.rotateBack(view_or.rotate(SGVec3d(0, 0, 1))));
- sgVec3 at;
- sgSetVec3(at, sgv_at[0], sgv_at[1], sgv_at[2]);
-
- // get the location data for the primary FDM (now hardcoded to ac model)...
- SGGeod geodPos = globals->get_aircraft_model()->get3DModel()->getPosition();
- SGVec3d model_pos = SGVec3d::fromGeod(geodPos);
-
- // Calculate speed of listener and model. This code assumes the
- // listener is either tracking the model at the same speed or
- // stationary.
-
- sgVec3 listener_vel, model_vel;
- SGVec3d SGV3d_help;
- sgdVec3 sgdv3_help;
- sgdVec3 sgdv3_null = {0, 0, 0};
-
- // the aircraft velocity as reported by the fdm (this will not
- // vary or be affected by frame rates or timing jitter.)
- sgVec3 fdm_vel_vec;
- sgSetVec3( fdm_vel_vec,
- vn_fps->getDoubleValue() * SG_FEET_TO_METER,
- ve_fps->getDoubleValue() * SG_FEET_TO_METER,
- vd_fps->getDoubleValue() * SG_FEET_TO_METER );
- double fdm_vel = sgLengthVec3(fdm_vel_vec);
-
- // compute the aircraft velocity vector and scale it to the length
- // of the fdm velocity vector. This gives us a vector in the
- // proper coordinate system, but also with the proper time
- // invariant magnitude.
- sgdSubVec3( sgdv3_help,
- last_model_pos, model_pos.sg());
- sgdAddVec3( last_model_pos, sgdv3_null, model_pos.sg());
- SGV3d_help = model_or.rotateBack(
+ sgVec3 at;
+ sgSetVec3(at, sgv_at[0], sgv_at[1], sgv_at[2]);
+
+ // get the location data for the primary FDM (now hardcoded to ac model)...
+ SGGeod geodPos = globals->get_aircraft_model()->get3DModel()->getPosition();
+ SGVec3d model_pos = SGVec3d::fromGeod(geodPos);
+
+ // Calculate speed of listener and model. This code assumes the
+ // listener is either tracking the model at the same speed or
+ // stationary.
+
+ sgVec3 listener_vel, model_vel;
+ SGVec3d SGV3d_help;
+ sgdVec3 sgdv3_help;
+ sgdVec3 sgdv3_null = {0, 0, 0};
+
+ // the aircraft velocity as reported by the fdm (this will not
+ // vary or be affected by frame rates or timing jitter.)
+ sgVec3 fdm_vel_vec;
+ sgSetVec3( fdm_vel_vec,
+ vn_fps->getDoubleValue() * SG_FEET_TO_METER,
+ ve_fps->getDoubleValue() * SG_FEET_TO_METER,
+ vd_fps->getDoubleValue() * SG_FEET_TO_METER );
+ double fdm_vel = sgLengthVec3(fdm_vel_vec);
+
+ // compute the aircraft velocity vector and scale it to the length
+ // of the fdm velocity vector. This gives us a vector in the
+ // proper coordinate system, but also with the proper time
+ // invariant magnitude.
+ sgdSubVec3( sgdv3_help,
+ last_model_pos, model_pos.data());
+ sgdAddVec3( last_model_pos, sgdv3_null, model_pos.data());
+ SGV3d_help = model_or.rotateBack(
surf_or.rotateBack(SGVec3d(sgdv3_help[0],
sgdv3_help[1], sgdv3_help[2])));
- sgSetVec3( model_vel, SGV3d_help[0], SGV3d_help[1], SGV3d_help[2]);
+ sgSetVec3( model_vel, SGV3d_help[0], SGV3d_help[1], SGV3d_help[2]);
- float vel = sgLengthVec3(model_vel);
- if ( fabs(vel) > 0.0001 ) {
- if ( fabs(fdm_vel / vel) > 0.0001 ) {
- sgScaleVec3( model_vel, fdm_vel / vel );
- }
- }
+ float vel = sgLengthVec3(model_vel);
+ if ( fabs(vel) > 0.0001 ) {
+ if ( fabs(fdm_vel / vel) > 0.0001 ) {
+ sgScaleVec3( model_vel, fdm_vel / vel );
+ }
+ }
- // check for moving or stationary listener (view position)
- sgdSubVec3( sgdv3_help,
- last_listener_pos, current_view->get_view_pos().sg());
- sgdAddVec3( last_listener_pos,
- sgdv3_null, current_view->get_view_pos().sg());
+ // check for moving or stationary listener (view position)
+ sgdSubVec3( sgdv3_help,
+ last_listener_pos, current_view->get_view_pos().data());
+ sgdAddVec3( last_listener_pos,
+ sgdv3_null, current_view->get_view_pos().data());
- if ( sgdLengthVec3(sgdv3_help) > 0.2 ) {
- sgCopyVec3( listener_vel, model_vel );
- } else {
- sgSetVec3( listener_vel, 0.0, 0.0, 0.0 );
- }
+ if ( sgdLengthVec3(sgdv3_help) > 0.2 ) {
+ sgCopyVec3( listener_vel, model_vel );
+ } else {
+ sgSetVec3( listener_vel, 0.0, 0.0, 0.0 );
+ }
- globals->get_soundmgr()->set_listener_vel( listener_vel );
+ globals->get_soundmgr()->set_listener_vel( listener_vel );
- // set positional offset for sources
- sgdVec3 dsource_pos_offset;
- sgdSubVec3( dsource_pos_offset,
- current_view->get_view_pos().sg(),
- model_pos.sg() );
- SGVec3d sgv_dsource_pos_offset = model_or.rotateBack(
+ // set positional offset for sources
+ sgdVec3 dsource_pos_offset;
+ sgdSubVec3( dsource_pos_offset,
+ current_view->get_view_pos().data(),
+ model_pos.data() );
+ SGVec3d sgv_dsource_pos_offset = model_or.rotateBack(
surf_or.rotateBack(SGVec3d(dsource_pos_offset[0],
dsource_pos_offset[1], dsource_pos_offset[2])));
- sgVec3 source_pos_offset;
- sgSetVec3(source_pos_offset, sgv_dsource_pos_offset[0],
+ sgVec3 source_pos_offset;
+ sgSetVec3(source_pos_offset, sgv_dsource_pos_offset[0],
sgv_dsource_pos_offset[1], sgv_dsource_pos_offset[2]);
- globals->get_soundmgr()->set_source_pos_all( source_pos_offset );
+ globals->get_soundmgr()->set_source_pos_all( source_pos_offset );
- float orient[6];
- for (int i = 0; i < 3; i++) {
- orient[i] = sgv_at[i];
- orient[i + 3] = sgv_up[i];
- }
- globals->get_soundmgr()->set_listener_orientation( orient );
+ float orient[6];
+ for (int i = 0; i < 3; i++) {
+ orient[i] = sgv_at[i];
+ orient[i + 3] = sgv_up[i];
+ }
+ globals->get_soundmgr()->set_listener_orientation( orient );
- // set the velocity
- // all sources are defined to be in the model
- globals->get_soundmgr()->set_source_vel_all( model_vel );
+ // set the velocity
+ // all sources are defined to be in the model
+ globals->get_soundmgr()->set_source_vel_all( model_vel );
- // The listener is always positioned at the origin.
- sgVec3 listener_pos;
- sgSetVec3( listener_pos, 0.0, 0.0, 0.0 );
- globals->get_soundmgr()->set_listener_pos( listener_pos );
+ // The listener is always positioned at the origin.
+ sgVec3 listener_pos;
+ sgSetVec3( listener_pos, 0.0, 0.0, 0.0 );
+ globals->get_soundmgr()->set_listener_pos( listener_pos );
+ }
#endif
// END Tile Manager udpates
// Sun diameter: 1,390,000 kilometers
thesky->build( 80000.0, 80000.0,
463.3, 361.8,
- globals->get_ephem()->getNumPlanets(),
- globals->get_ephem()->getPlanets(),
- globals->get_ephem()->getNumStars(),
- globals->get_ephem()->getStars(),
+ *globals->get_ephem(),
fgGetNode("/environment", true));
// Initialize MagVar model
static void upper_case_property(const char *name)
{
+ using namespace simgear;
SGPropertyNode *p = fgGetNode(name, false);
if (!p) {
p = fgGetNode(name, true);
p->setStringValue("");
} else {
- SGPropertyNode::Type t = p->getType();
- if (t == SGPropertyNode::NONE || t == SGPropertyNode::UNSPECIFIED)
+ props::Type t = p->getType();
+ if (t == props::NONE || t == props::UNSPECIFIED)
p->setStringValue("");
else
- assert(t == SGPropertyNode::STRING);
+ assert(t == props::STRING);
}
p->addChangeListener(new FGMakeUpperCase);
}
projects / flightgear.git / blobdiff