FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save a costly SGVec3d::fromGeod() calculation

Browse Source
This commit is contained in:
ehofman
2009-11-05 13:46:15 +00:00
committed by Tim Moore
parent 85fba1325a
commit 39472e4d81
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
simgear/scene/sky/sky.cxx
View File

@@ -147,22 +147,20 @@ bool SGSky::reposition( const SGSkyState &st, const SGEphemeris& eph, double dt
double angle = st.gst * 15; // degrees
double angleRad = SGMiscd::deg2rad(angle);
SGVec3f view_pos, zero_elev, view_up;
SGVec3f zero_elev, view_up;
double lon, lat, alt;
view_pos = toVec3f( SGVec3d::fromGeod(st.pos) );
SGGeod geodZeroViewPos = SGGeod::fromGeodM(st.pos, 0);
SGGeod geodZeroViewPos = SGGeod::fromGeodM(st.pos_geod, 0);
zero_elev = toVec3f( SGVec3d::fromGeod(geodZeroViewPos) );
view_up = toVec3f( st.ori.backTransform(SGVec3d::e2()) );
lon = st.pos.getLongitudeRad();
lat = st.pos.getLatitudeRad();
alt = st.pos.getElevationM();
lon = st.pos_geod.getLongitudeRad();
lat = st.pos_geod.getLatitudeRad();
alt = st.pos_geod.getElevationM();
dome->reposition( zero_elev, alt, lon, lat, st.spin );
osg::Matrix m = osg::Matrix::rotate(angleRad, osg::Vec3(0, 0, -1));
m.postMultTranslate(toOsg(view_pos));
m.postMultTranslate(toOsg(st.pos));
_ephTransform->setMatrix(m);
double sun_ra = eph.getSunRightAscension();

3
simgear/scene/sky/sky.hxx
View File

@@ -57,7 +57,8 @@ using std::vector;
typedef struct {
SGGeod pos;
SGVec3d pos;
SGGeod pos_geod;
SGQuatd ori;
double spin;
double gst;