fly/flightgear
1
0
Fork 0
Code Activity

Simplify, fix some comments.

Browse source 
Modified Files:
	src/Main/viewer.cxx
This commit is contained in:
frohlich 2009-09-05 11:01:06 +00:00 committed by Tim Moore
parent 93d2f8a963
commit 4e7b084568
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/Main/viewer.cxx
View file

@ -373,25 +373,30 @@ FGViewer::recalcLookFrom ()
} }
// The rotation rotating from the earth centerd frame to // The rotation rotating from the earth centerd frame to
// the horizontal local OpenGL frame // the horizontal local frame
SGQuatd hlOr = SGQuatd::viewHL(_position); SGQuatd hlOr = SGQuatd::fromLonLat(_position);
// the rotation from the horizontal local frame to the basic view orientation // The rotation from the horizontal local frame to the basic view orientation
SGQuatd hlToBody = SGQuatd::fromYawPitchRollDeg(head, pitch, roll); SGQuatd hlToBody = SGQuatd::fromYawPitchRollDeg(head, pitch, roll);
hlToBody = SGQuatd::simToView(hlToBody);
// The cartesian position of the basic view coordinate // The rotation offset, don't know why heading is negative here ...
SGVec3d position = SGVec3d::fromGeod(_position); SGQuatd viewOffsetOr
// the rotation offset, don't know why heading is negative here ... = SGQuatd::fromYawPitchRollDeg(-_heading_offset_deg, _pitch_offset_deg,
SGQuatd viewOffsetOr = SGQuatd::simToView( _roll_offset_deg);
SGQuatd::fromYawPitchRollDeg(-_heading_offset_deg, _pitch_offset_deg,
_roll_offset_deg));
// Compute the eyepoints orientation and position // Compute the eyepoints orientation and position
// wrt the earth centered frame - that is global coorinates // wrt the earth centered frame - that is global coorinates
SGQuatd ec2body = hlOr*hlToBody; SGQuatd ec2body = hlOr*hlToBody;
_absolute_view_pos = position + ec2body.backTransform(_offset_m);
mViewOrientation = ec2body*viewOffsetOr; // The cartesian position of the basic view coordinate
SGVec3d position = SGVec3d::fromGeod(_position);
// This is rotates the x-forward, y-right, z-down coordinate system the where
// simulation runs into the OpenGL camera system with x-right, y-up, z-back.
SGQuatd q(-0.5, -0.5, 0.5, 0.5);
_absolute_view_pos = position + (ec2body*q).backTransform(_offset_m);
mViewOrientation = ec2body*viewOffsetOr*q;
} }
void void
@ -459,8 +464,10 @@ FGViewer::recalcLookAt ()
SGVec3d dir = normalize(atCart - eyeCart); SGVec3d dir = normalize(atCart - eyeCart);
// the up directon // the up directon
SGVec3d up = ec2eye.backTransform(SGVec3d(0, 0, -1)); SGVec3d up = ec2eye.backTransform(SGVec3d(0, 0, -1));
// rotate dir to the 0-th unit vector // rotate -dir to the 2-th unit vector
// rotate up to 2-th unit vector // rotate up to 1-th unit vector
// Note that this matches the OpenGL camera coordinate system
// with x-right, y-up, z-back.
mViewOrientation = SGQuatd::fromRotateTo(-dir, 2, up, 1); mViewOrientation = SGQuatd::fromRotateTo(-dir, 2, up, 1);
} }