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

Merge branch 'ehofman/sky'

Browse Source
This commit is contained in:
Tim Moore
2009-11-26 23:28:34 +01:00
parent fefe87ed1e b66905c2f6
commit cb7ac404d9
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,15 +147,30 @@ bool SGSky::reposition( const SGSkyState &st, const SGEphemeris& eph, double dt
double angle = st.gst * 15; // degrees
double angleRad = SGMiscd::deg2rad(angle);
dome->reposition( st.zero_elev, st.alt, st.lon, st.lat, st.spin );
SGVec3f zero_elev, view_up;
double lon, lat, alt;
SGGeod geodZeroViewPos = SGGeod::fromGeodM(st.pos_geod, 0);
zero_elev = toVec3f( SGVec3d::fromGeod(geodZeroViewPos) );
// calculate the scenery up vector
SGQuatd hlOr = SGQuatd::fromLonLat(st.pos_geod);
view_up = toVec3f(hlOr.backTransform(-SGVec3d::e3()));
// viewer location
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(st.view_pos));
m.postMultTranslate(toOsg(st.pos));
_ephTransform->setMatrix(m);
double sun_ra = eph.getSunRightAscension();
double sun_dec = eph.getSunDeclination();
oursun->reposition( sun_ra, sun_dec, st.sun_dist, st.lat, st.alt, st.sun_angle );
oursun->reposition( sun_ra, sun_dec, st.sun_dist, lat, alt, st.sun_angle );
double moon_ra = eph.getMoonRightAscension();
double moon_dec = eph.getMoonDeclination();
@@ -163,8 +178,7 @@ bool SGSky::reposition( const SGSkyState &st, const SGEphemeris& eph, double dt
for ( unsigned i = 0; i < cloud_layers.size(); ++i ) {
if ( cloud_layers[i]->getCoverage() != SGCloudLayer::SG_CLOUD_CLEAR ) {
cloud_layers[i]->reposition( st.zero_elev, st.view_up,
st.lon, st.lat, st.alt, dt );
cloud_layers[i]->reposition( zero_elev, view_up, lon, lat, alt, dt);
} else
cloud_layers[i]->getNode()->setAllChildrenOff();
}

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

@@ -45,6 +45,7 @@
#include <osg/Switch>
#include <simgear/ephemeris/ephemeris.hxx>
#include <simgear/math/SGMath.hxx>
#include <simgear/scene/sky/cloud.hxx>
#include <simgear/scene/sky/dome.hxx>
@@ -56,8 +57,10 @@ using std::vector;
typedef struct {
SGVec3f view_pos, zero_elev, view_up;
double lon, lat, alt, spin;
SGVec3d pos;
SGGeod pos_geod;
SGQuatd ori;
double spin;
double gst;
double sun_dist;
double moon_dist;