X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscene%2Fsky%2Fcloud.cxx;h=7042c568c95b567be4ec8b025c729a429499640f;hb=ab29063a974b1262365112f68a1823d59d99e9b1;hp=7f52663fb491bd197d51ee03f6d332c1f492c23f;hpb=b6a683eb6e3a3a7e886aefa705fa4d18f128a523;p=simgear.git diff --git a/simgear/scene/sky/cloud.cxx b/simgear/scene/sky/cloud.cxx index 7f52663f..7042c568 100644 --- a/simgear/scene/sky/cloud.cxx +++ b/simgear/scene/sky/cloud.cxx @@ -18,8 +18,17 @@ #include -#include -#include STL_IOSTREAM +// #include +#include + +// #if defined (__APPLE__) +// // any C++ header file undefines isinf and isnan +// // so this should be included before +// inline int (isinf)(double r) { return isinf(r); } +// inline int (isnan)(double r) { return isnan(r); } +// #endif + +// #include STL_IOSTREAM #include #include @@ -33,7 +42,7 @@ #include "cloud.hxx" -static ssgSimpleState *layer_states[SGCloudLayer::SG_MAX_CLOUD_COVERAGES]; +static ssgStateSelector *layer_states[SGCloudLayer::SG_MAX_CLOUD_COVERAGES]; static bool state_initialized = false; @@ -41,6 +50,7 @@ static bool state_initialized = false; SGCloudLayer::SGCloudLayer( const string &tex_path ) : layer_root(new ssgRoot), layer_transform(new ssgTransform), + state_sel(0), texture_path(tex_path), layer_span(0.0), layer_asl(0.0), @@ -48,6 +58,8 @@ SGCloudLayer::SGCloudLayer( const string &tex_path ) : layer_transition(0.0), layer_coverage(SG_CLOUD_CLEAR), scale(4000.0), + speed(0.0), + direction(0.0), last_lon(0.0), last_lat(0.0) { @@ -88,9 +100,16 @@ SGCloudLayer::getElevation_m () const } void -SGCloudLayer::setElevation_m (float elevation_m) +SGCloudLayer::setElevation_m (float elevation_m, bool set_span) { layer_asl = elevation_m; + + if (set_span) { + if (elevation_m > 4000) + setSpan_m( elevation_m * 10 ); + else + setSpan_m( 40000 ); + } } float @@ -141,33 +160,57 @@ SGCloudLayer::rebuild() if ( !state_initialized ) { state_initialized = true; - cout << "initializing cloud layers" << endl; + SG_LOG(SG_ASTRO, SG_INFO, "initializing cloud layers"); SGPath cloud_path; + ssgStateSelector *state_sel; + ssgSimpleState *state; + state_sel = new ssgStateSelector( 2 ); + state_sel->ref(); cloud_path.set(texture_path.str()); cloud_path.append("overcast.rgb"); - layer_states[SG_CLOUD_OVERCAST] = sgCloudMakeState(cloud_path.str()); + state_sel->setStep( 0, sgCloudMakeState(cloud_path.str()) ); + cloud_path.set(texture_path.str()); + cloud_path.append("overcast_top.rgb"); + state_sel->setStep( 1, sgCloudMakeState(cloud_path.str()) ); + layer_states[SG_CLOUD_OVERCAST] = state_sel; + state_sel = new ssgStateSelector( 2 ); + state_sel->ref(); cloud_path.set(texture_path.str()); cloud_path.append("broken.rgba"); - layer_states[SG_CLOUD_BROKEN] - = sgCloudMakeState(cloud_path.str()); + state = sgCloudMakeState(cloud_path.str()); + state_sel->setStep( 0, state ); + state_sel->setStep( 1, state ); + layer_states[SG_CLOUD_BROKEN] = state_sel; + state_sel = new ssgStateSelector( 2 ); + state_sel->ref(); cloud_path.set(texture_path.str()); cloud_path.append("scattered.rgba"); - layer_states[SG_CLOUD_SCATTERED] - = sgCloudMakeState(cloud_path.str()); + state = sgCloudMakeState(cloud_path.str()); + state_sel->setStep( 0, state ); + state_sel->setStep( 1, state ); + layer_states[SG_CLOUD_SCATTERED] = state_sel; + state_sel = new ssgStateSelector( 2 ); + state_sel->ref(); cloud_path.set(texture_path.str()); cloud_path.append("few.rgba"); - layer_states[SG_CLOUD_FEW] - = sgCloudMakeState(cloud_path.str()); + state = sgCloudMakeState(cloud_path.str()); + state_sel->setStep( 0, state ); + state_sel->setStep( 1, state ); + layer_states[SG_CLOUD_FEW] = state_sel; + state_sel = new ssgStateSelector( 2 ); + state_sel->ref(); cloud_path.set(texture_path.str()); cloud_path.append("cirrus.rgba"); - layer_states[SG_CLOUD_CIRRUS] - = sgCloudMakeState(cloud_path.str()); + state = sgCloudMakeState(cloud_path.str()); + state_sel->setStep( 0, state ); + state_sel->setStep( 1, state ); + layer_states[SG_CLOUD_CIRRUS] = state_sel; layer_states[SG_CLOUD_CLEAR] = 0; } @@ -186,6 +229,16 @@ SGCloudLayer::rebuild() const float layer_scale = layer_span / scale; const float mpi = SG_PI/4; + // caclculate the difference between a flat-earth model and + // a round earth model given the span and altutude ASL of + // the cloud layer. This is the difference in altitude between + // the top of the inverted bowl and the edge of the bowl. + // const float alt_diff = layer_asl * 0.8; + const float layer_to_core = (SG_EARTH_RAD * 1000 + layer_asl); + const float layer_angle = acos( 0.5*layer_span / layer_to_core); + const float border_to_core = layer_to_core * sin(layer_angle); + const float alt_diff = layer_to_core - border_to_core; + for (int i = 0; i < 4; i++) { if ( layer[i] != NULL ) { @@ -198,7 +251,7 @@ SGCloudLayer::rebuild() sgSetVec3( vertex, layer_span*(i-2)/2, -layer_span, - 500 * (sin(i*mpi) - 2) ); + alt_diff * (sin(i*mpi) - 2) ); sgSetVec2( tc, base[0] + layer_scale * i/4, base[1] ); @@ -211,7 +264,7 @@ SGCloudLayer::rebuild() for (int j = 0; j < 4; j++) { sgSetVec3( vertex, layer_span*(i-1)/2, layer_span*(j-2)/2, - 500 * (sin((i+1)*mpi) + sin(j*mpi) - 2) ); + alt_diff * (sin((i+1)*mpi) + sin(j*mpi) - 2) ); sgSetVec2( tc, base[0] + layer_scale * (i+1)/4, base[1] + layer_scale * j/4 ); @@ -226,7 +279,7 @@ SGCloudLayer::rebuild() sgSetVec3( vertex, layer_span*(i-2)/2, layer_span*(j-1)/2, - 500 * (sin(i*mpi) + sin((j+1)*mpi) - 2) ); + alt_diff * (sin(i*mpi) + sin((j+1)*mpi) - 2) ); sgSetVec2( tc, base[0] + layer_scale * i/4, base[1] + layer_scale * (j+1)/4 ); @@ -240,7 +293,7 @@ SGCloudLayer::rebuild() } sgSetVec3( vertex, layer_span*(i-1)/2, layer_span, - 500 * (sin((i+1)*mpi) - 2) ); + alt_diff * (sin((i+1)*mpi) - 2) ); sgSetVec2( tc, base[0] + layer_scale * (i+1)/4, base[1] + layer_scale ); @@ -257,6 +310,7 @@ SGCloudLayer::rebuild() if ( layer_states[layer_coverage] != NULL ) { layer[i]->setState( layer_states[layer_coverage] ); } + state_sel = layer_states[layer_coverage]; } // force a repaint of the sky colors with arbitrary defaults @@ -285,7 +339,7 @@ bool SGCloudLayer::repaint( sgVec3 fog_color ) { // spin specifies a rotation about the new Z axis (and orients the // sunrise/set effects bool SGCloudLayer::reposition( sgVec3 p, sgVec3 up, double lon, double lat, - double alt ) + double alt, double dt ) { sgMat4 T1, LON, LAT; sgVec3 axis; @@ -343,15 +397,43 @@ bool SGCloudLayer::reposition( sgVec3 p, sgVec3 up, double lon, double lat, last_lat = lat; } - if ( lon != last_lon || lat != last_lat ) { + double sp_dist = speed*dt; + + if ( lon != last_lon || lat != last_lat || sp_dist != 0 ) { Point3D start( last_lon, last_lat, 0.0 ); Point3D dest( lon, lat, 0.0 ); - double course, dist; + double course = 0.0, dist = 0.0; + calc_gc_course_dist( dest, start, &course, &dist ); // cout << "course = " << course << ", dist = " << dist << endl; - double xoff = cos( course ) * dist / (2 * scale); - double yoff = sin( course ) * dist / (2 * scale); + // if start and dest are too close together, + // calc_gc_course_dist() can return a course of "nan". If + // this happens, lets just use the last known good course. + // This is a hack, and it would probably be better to make + // calc_gc_course_dist() more robust. + if ( isnan(course) ) { + course = last_course; + } else { + last_course = course; + } + + // calculate cloud movement due to external forces + double ax = 0.0, ay = 0.0, bx = 0.0, by = 0.0; + + if (dist > 0.0) { + ax = cos(course) * dist; + ay = sin(course) * dist; + } + + if (sp_dist > 0) { + bx = cos(-direction * SGD_DEGREES_TO_RADIANS) * sp_dist; + by = sin(-direction * SGD_DEGREES_TO_RADIANS) * sp_dist; + } + + + double xoff = (ax + bx) / (2 * scale); + double yoff = (ay + by) / (2 * scale); const float layer_scale = layer_span / scale; @@ -369,9 +451,10 @@ bool SGCloudLayer::reposition( sgVec3 p, sgVec3 up, double lon, double lat, if ( base[0] > -10.0 && base[0] < 10.0 ) { base[0] -= (int)base[0]; } else { - base[0] = 0.0; SG_LOG(SG_ASTRO, SG_DEBUG, - "Error: base = " << base[0] << "," << base[1]); + "Error: base = " << base[0] << "," << base[1] << + " course = " << course << " dist = " << dist ); + base[0] = 0.0; } base[1] += yoff; @@ -382,12 +465,13 @@ bool SGCloudLayer::reposition( sgVec3 p, sgVec3 up, double lon, double lat, if ( base[1] > -10.0 && base[1] < 10.0 ) { base[1] -= (int)base[1]; } else { - base[1] = 0.0; SG_LOG(SG_ASTRO, SG_ALERT, - "Error: base = " << base[0] << "," << base[1]); + "Error: base = " << base[0] << "," << base[1] << + " course = " << course << " dist = " << dist ); + base[1] = 0.0; } - // cout << "base = " << base[0] << "," << base[1] << endl; + // cout << "base = " << base[0] << "," << base[1] << endl; for (int i = 0; i < 4; i++) { @@ -418,8 +502,9 @@ bool SGCloudLayer::reposition( sgVec3 p, sgVec3 up, double lon, double lat, } -void SGCloudLayer::draw() { +void SGCloudLayer::draw( bool top ) { if ( layer_coverage != SG_CLOUD_CLEAR ) { + state_sel->selectStep( top ? 1 : 0 ); ssgCullAndDraw( layer_root ); } } @@ -429,7 +514,7 @@ void SGCloudLayer::draw() { ssgSimpleState *sgCloudMakeState( const string &path ) { ssgSimpleState *state = new ssgSimpleState(); - cout << " texture = " << path << endl; + SG_LOG(SG_ASTRO, SG_INFO, " texture = "); state->setTexture( (char *)path.c_str() ); state->setShadeModel( GL_SMOOTH ); @@ -438,15 +523,13 @@ ssgSimpleState *sgCloudMakeState( const string &path ) { state->enable( GL_TEXTURE_2D ); state->enable( GL_COLOR_MATERIAL ); state->setColourMaterial( GL_AMBIENT_AND_DIFFUSE ); - state->setMaterial( GL_EMISSION, 0, 0, 0, 1 ); - state->setMaterial( GL_SPECULAR, 0, 0, 0, 1 ); + state->setMaterial( GL_EMISSION, 0.05, 0.05, 0.05, 0.0 ); + state->setMaterial( GL_AMBIENT, 0.2, 0.2, 0.2, 0.0 ); + state->setMaterial( GL_DIFFUSE, 0.5, 0.5, 0.5, 0.0 ); + state->setMaterial( GL_SPECULAR, 0.0, 0.0, 0.0, 0.0 ); state->enable( GL_BLEND ); state->enable( GL_ALPHA_TEST ); state->setAlphaClamp( 0.01 ); - // ref() the state so it doesn't get deleted if the last layer of - // it's type is deleted. - state->ref(); - return state; }