#include <simgear/compiler.h>
-#include <stdio.h>
-#include STL_IOSTREAM
+// #include <stdio.h>
+#include <math.h>
+
+// #if defined (__APPLE__)
+// // any C++ header file undefines isinf and isnan
+// // so this should be included before <iostream>
+// inline int (isinf)(double r) { return isinf(r); }
+// inline int (isnan)(double r) { return isnan(r); }
+// #endif
+
+// #include STL_IOSTREAM
#include <plib/sg.h>
#include <plib/ssg.h>
#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;
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),
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;
}
const float layer_scale = layer_span / scale;
const float mpi = SG_PI/4;
- const float alt_diff = layer_asl * 0.8;
+
+ // 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_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
Point3D dest( lon, lat, 0.0 );
double course = 0.0, dist = 0.0;
- if (dest != start) {
- calc_gc_course_dist( dest, start, &course, &dist );
- }
+ calc_gc_course_dist( dest, start, &course, &dist );
// cout << "course = " << course << ", dist = " << dist << endl;
+ // 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 ( 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;
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++)
{
}
-void SGCloudLayer::draw() {
+void SGCloudLayer::draw( bool top ) {
if ( layer_coverage != SG_CLOUD_CLEAR ) {
+ state_sel->selectStep( top ? 1 : 0 );
ssgCullAndDraw( layer_root );
}
}
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 );
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;
}
projects / simgear.git / blobdiff