diff --git a/src/AIModel/AIFlightPlanCreateCruise.cxx b/src/AIModel/AIFlightPlanCreateCruise.cxx index d7761b5d2..4f44ab1e2 100755 --- a/src/AIModel/AIFlightPlanCreateCruise.cxx +++ b/src/AIModel/AIFlightPlanCreateCruise.cxx @@ -65,7 +65,7 @@ void FGAIFlightPlan::evaluateRoutePart(double deplat, sgdVec3 newPos; sgdMat4 matrix; //cerr << "Angle = " << ang << endl; - sgdMakeRotMat4(matrix, ang, _cross.sg()); + sgdMakeRotMat4(matrix, ang, _cross.data()); for(int j = 0; j < 3; j++) { newPos[j] =0.0; diff --git a/src/Instrumentation/navradio.cxx b/src/Instrumentation/navradio.cxx index 916155efb..831f1b8f6 100644 --- a/src/Instrumentation/navradio.cxx +++ b/src/Instrumentation/navradio.cxx @@ -367,8 +367,8 @@ bool FGNavRadio::updateWithPower(double dt) if (_gs) { // find closest distance to the gs base line - double dist = sgdClosestPointToLineDistSquared(aircraft.sg(), _gs->cart().sg(), - gs_base_vec.sg()); + double dist = sgdClosestPointToLineDistSquared(aircraft.data(), _gs->cart().data(), + gs_base_vec.data()); gs_dist_node->setDoubleValue( sqrt( dist ) ); // cout << "gs_dist = " << gs_dist_node->getDoubleValue() // << endl; diff --git a/src/Main/main.cxx b/src/Main/main.cxx index 8c64afae1..89756f393 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -544,8 +544,8 @@ static void fgMainLoop( void ) { // 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()); + 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]))); @@ -560,9 +560,9 @@ static void fgMainLoop( void ) { // check for moving or stationary listener (view position) sgdSubVec3( sgdv3_help, - last_listener_pos, current_view->get_view_pos().sg()); + last_listener_pos, current_view->get_view_pos().data()); sgdAddVec3( last_listener_pos, - sgdv3_null, current_view->get_view_pos().sg()); + sgdv3_null, current_view->get_view_pos().data()); if ( sgdLengthVec3(sgdv3_help) > 0.2 ) { sgCopyVec3( listener_vel, model_vel ); @@ -575,8 +575,8 @@ static void fgMainLoop( void ) { // set positional offset for sources sgdVec3 dsource_pos_offset; sgdSubVec3( dsource_pos_offset, - current_view->get_view_pos().sg(), - model_pos.sg() ); + 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]))); diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx index 1774b3a63..cb78616e8 100644 --- a/src/Sound/fg_fx.cxx +++ b/src/Sound/fg_fx.cxx @@ -270,8 +270,8 @@ FGFX::update_pos_and_orientation(SGSoundMgr *smgr, double dt) )); sgSetVec3(listener_vel, SGV3d_help[0], SGV3d_help[1], SGV3d_help[2]); - sgdSubVec3(sgdv3_help, last_model_pos, absolute_view_pos.sg()); - sgdAddVec3(last_model_pos, sgdv3_null, absolute_view_pos.sg()); + sgdSubVec3(sgdv3_help, last_model_pos, absolute_view_pos.data()); + sgdAddVec3(last_model_pos, sgdv3_null, absolute_view_pos.data()); SGV3d_help = model_or.rotateBack( surf_or.rotateBack( @@ -303,7 +303,7 @@ FGFX::update_pos_and_orientation(SGSoundMgr *smgr, double dt) sgdVec3 dsource_pos_offset; sgdSubVec3( dsource_pos_offset, (double*) &observer->get_view_pos(), - absolute_view_pos.sg() ); + absolute_view_pos.data() ); SGVec3d sgv_dsource_pos_offset; sgv_dsource_pos_offset = model_or.rotateBack( surf_or.rotateBack( diff --git a/src/Traffic/Schedule.cxx b/src/Traffic/Schedule.cxx index fda2c8244..b5297301a 100644 --- a/src/Traffic/Schedule.cxx +++ b/src/Traffic/Schedule.cxx @@ -339,7 +339,7 @@ bool FGAISchedule::update(time_t now) //cout << "a = " << a[0] << " " << a[1] << " " << a[2] // << "b = " << b[0] << " " << b[1] << " " << b[2] << endl; sgdMat4 matrix; - sgdMakeRotMat4(matrix, angle, _cross.sg()); + sgdMakeRotMat4(matrix, angle, _cross.data()); SGVec3d newPos(0, 0, 0); for(int j = 0; j < 3; j++) {