fly/flightgear
1
0
Fork 0
Code Activity

Replace the SGVec*::sg() methods with the equivalent SGVec*::data() calls.

Browse source 
Modified Files:
	src/Traffic/Schedule.cxx src/Sound/fg_fx.cxx src/Main/main.cxx
	src/Instrumentation/navradio.cxx
	src/AIModel/AIFlightPlanCreateCruise.cxx
This commit is contained in:
frohlich 2009-09-03 20:18:34 +00:00 committed by Tim Moore
parent a26ca9f3e3
commit 8676c2bbd8
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/AIModel/AIFlightPlanCreateCruise.cxx
View file

@ -65,7 +65,7 @@ void FGAIFlightPlan::evaluateRoutePart(double deplat,
sgdVec3 newPos; sgdVec3 newPos;
sgdMat4 matrix; sgdMat4 matrix;
//cerr << "Angle = " << ang << endl; //cerr << "Angle = " << ang << endl;
sgdMakeRotMat4(matrix, ang, _cross.sg()); sgdMakeRotMat4(matrix, ang, _cross.data());
for(int j = 0; j < 3; j++) for(int j = 0; j < 3; j++)
{ {
newPos[j] =0.0; newPos[j] =0.0;

4
src/Instrumentation/navradio.cxx
View file

@ -367,8 +367,8 @@ bool FGNavRadio::updateWithPower(double dt)
if (_gs) { if (_gs) {
// find closest distance to the gs base line // find closest distance to the gs base line
double dist = sgdClosestPointToLineDistSquared(aircraft.sg(), _gs->cart().sg(), double dist = sgdClosestPointToLineDistSquared(aircraft.data(), _gs->cart().data(),
gs_base_vec.sg()); gs_base_vec.data());
gs_dist_node->setDoubleValue( sqrt( dist ) ); gs_dist_node->setDoubleValue( sqrt( dist ) );
// cout << "gs_dist = " << gs_dist_node->getDoubleValue() // cout << "gs_dist = " << gs_dist_node->getDoubleValue()
// << endl; // << endl;

12
src/Main/main.cxx
View file

@ -544,8 +544,8 @@ static void fgMainLoop( void ) {
// proper coordinate system, but also with the proper time // proper coordinate system, but also with the proper time
// invariant magnitude. // invariant magnitude.
sgdSubVec3( sgdv3_help, sgdSubVec3( sgdv3_help,
last_model_pos, model_pos.sg()); last_model_pos, model_pos.data());
sgdAddVec3( last_model_pos, sgdv3_null, model_pos.sg()); sgdAddVec3( last_model_pos, sgdv3_null, model_pos.data());
SGV3d_help = model_or.rotateBack( SGV3d_help = model_or.rotateBack(
surf_or.rotateBack(SGVec3d(sgdv3_help[0], surf_or.rotateBack(SGVec3d(sgdv3_help[0],
sgdv3_help[1], sgdv3_help[2]))); sgdv3_help[1], sgdv3_help[2])));
@ -560,9 +560,9 @@ static void fgMainLoop( void ) {
// check for moving or stationary listener (view position) // check for moving or stationary listener (view position)
sgdSubVec3( sgdv3_help, 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, 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 ) { if ( sgdLengthVec3(sgdv3_help) > 0.2 ) {
sgCopyVec3( listener_vel, model_vel ); sgCopyVec3( listener_vel, model_vel );
@ -575,8 +575,8 @@ static void fgMainLoop( void ) {
// set positional offset for sources // set positional offset for sources
sgdVec3 dsource_pos_offset; sgdVec3 dsource_pos_offset;
sgdSubVec3( dsource_pos_offset, sgdSubVec3( dsource_pos_offset,
current_view->get_view_pos().sg(), current_view->get_view_pos().data(),
model_pos.sg() ); model_pos.data() );
SGVec3d sgv_dsource_pos_offset = model_or.rotateBack( SGVec3d sgv_dsource_pos_offset = model_or.rotateBack(
surf_or.rotateBack(SGVec3d(dsource_pos_offset[0], surf_or.rotateBack(SGVec3d(dsource_pos_offset[0],
dsource_pos_offset[1], dsource_pos_offset[2]))); dsource_pos_offset[1], dsource_pos_offset[2])));

6
src/Sound/fg_fx.cxx
View file

@ -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]); sgSetVec3(listener_vel, SGV3d_help[0], SGV3d_help[1], SGV3d_help[2]);
sgdSubVec3(sgdv3_help, last_model_pos, absolute_view_pos.sg()); sgdSubVec3(sgdv3_help, last_model_pos, absolute_view_pos.data());
sgdAddVec3(last_model_pos, sgdv3_null, absolute_view_pos.sg()); sgdAddVec3(last_model_pos, sgdv3_null, absolute_view_pos.data());
SGV3d_help = model_or.rotateBack( SGV3d_help = model_or.rotateBack(
surf_or.rotateBack( surf_or.rotateBack(
@ -303,7 +303,7 @@ FGFX::update_pos_and_orientation(SGSoundMgr *smgr, double dt)
sgdVec3 dsource_pos_offset; sgdVec3 dsource_pos_offset;
sgdSubVec3( dsource_pos_offset, sgdSubVec3( dsource_pos_offset,
(double*) &observer->get_view_pos(), (double*) &observer->get_view_pos(),
absolute_view_pos.sg() ); absolute_view_pos.data() );
SGVec3d sgv_dsource_pos_offset; SGVec3d sgv_dsource_pos_offset;
sgv_dsource_pos_offset = model_or.rotateBack( sgv_dsource_pos_offset = model_or.rotateBack(
surf_or.rotateBack( surf_or.rotateBack(

2
src/Traffic/Schedule.cxx
View file

@ -339,7 +339,7 @@ bool FGAISchedule::update(time_t now)
//cout << "a = " << a[0] << " " << a[1] << " " << a[2] //cout << "a = " << a[0] << " " << a[1] << " " << a[2]
// << "b = " << b[0] << " " << b[1] << " " << b[2] << endl; // << "b = " << b[0] << " " << b[1] << " " << b[2] << endl;
sgdMat4 matrix; sgdMat4 matrix;
sgdMakeRotMat4(matrix, angle, _cross.sg()); sgdMakeRotMat4(matrix, angle, _cross.data());
SGVec3d newPos(0, 0, 0); SGVec3d newPos(0, 0, 0);
for(int j = 0; j < 3; j++) for(int j = 0; j < 3; j++)
{ {