// $Id$
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <simgear/compiler.h>
#include <stdio.h>
-#include <iostream>
+#include STL_IOSTREAM
+#include <plib/sg.h>
#include <plib/ssg.h>
-#include <simgear/constants.h>
-#include <simgear/math/fg_random.h>
#include <simgear/math/point3d.hxx>
#include <simgear/math/polar3d.hxx>
-
-#include <Objects/matlib.hxx>
+#include <simgear/math/sg_random.h>
+#include <simgear/debug/logstream.hxx>
#include "cloud.hxx"
}
-// build the moon object
-void SGCloudLayer::build( FGPath path, double s, double asl, double thickness,
- double transition, SGCloudType type )
+// build the cloud object
+void SGCloudLayer::build( double s, double asl, double thickness,
+ double transition, ssgSimpleState *state )
{
scale = 4000.0;
size = s;
last_lon = last_lat = -999.0f;
- // look up the appropriate cloud state
- FGNewMat *m;
-
- switch ( type ) {
- case SG_CLOUD_OVERCAST:
- m = material_lib.find( "CloudOvercast" );
- layer_state = m->get_state();
- break;
- case SG_CLOUD_MOSTLY_CLOUDY:
- m = material_lib.find( "CloudMostlyCloudy" );
- layer_state = m->get_state();
- break;
- case SG_CLOUD_MOSTLY_SUNNY:
- m = material_lib.find( "CloudMostlySunny" );
- layer_state = m->get_state();
- break;
- case SG_CLOUD_CIRRUS:
- m = material_lib.find( "CloudCirrus" );
- layer_state = m->get_state();
- break;
- }
+ layer_state = state;
cl = new ssgColourArray( 4 );
vl = new ssgVertexArray( 4 );
sgSetVec3( vertex, -size, -size, 0.0f );
sgVec2 base;
- sgSetVec2( base, fg_random(), fg_random() );
+ sgSetVec2( base, sg_random(), sg_random() );
sgSetVec2( tc, base[0], base[1] );
cl->add( color );
vl->add( vertex );
// zero_elev.x, zero_elev.y, zero_elev.z );
// Rotate to proper orientation
- // printf(" lon = %.2f lat = %.2f\n", FG_Longitude * RAD_TO_DEG,
- // FG_Latitude * RAD_TO_DEG);
- // xglRotatef( f->get_Longitude() * RAD_TO_DEG, 0.0, 0.0, 1.0 );
+ // printf(" lon = %.2f lat = %.2f\n",
+ // lon * SGD_RADIANS_TO_DEGREES,
+ // lat * SGD_RADIANS_TO_DEGREES);
+ // xglRotatef( lon * SGD_RADIANS_TO_DEGREES, 0.0, 0.0, 1.0 );
sgSetVec3( axis, 0.0, 0.0, 1.0 );
- sgMakeRotMat4( LON, lon * RAD_TO_DEG, axis );
+ sgMakeRotMat4( LON, lon * SGD_RADIANS_TO_DEGREES, axis );
- // xglRotatef( 90.0 - f->get_Latitude() * RAD_TO_DEG, 0.0, 1.0, 0.0 );
+ // xglRotatef( 90.0 - f->get_Latitude() * SGD_RADIANS_TO_DEGREES,
+ // 0.0, 1.0, 0.0 );
sgSetVec3( axis, 0.0, 1.0, 0.0 );
- sgMakeRotMat4( LAT, 90.0 - lat * RAD_TO_DEG, axis );
+ sgMakeRotMat4( LAT, 90.0 - lat * SGD_RADIANS_TO_DEGREES, axis );
sgMat4 TRANSFORM;
base = tl->get( 0 );
base[0] += xoff;
- while ( base[0] > 1.0 ) { base[0] -= 1.0; }
- while ( base[0] < 0.0 ) { base[0] += 1.0; }
+
+ // the while loops can lead to *long* pauses if base[0] comes
+ // with a bogus value.
+ // while ( base[0] > 1.0 ) { base[0] -= 1.0; }
+ // while ( base[0] < 0.0 ) { base[0] += 1.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_ALERT,
+ "Error: base = " << base[0] << "," << base[1]);
+ }
base[1] += yoff;
- while ( base[1] > 1.0 ) { base[1] -= 1.0; }
- while ( base[1] < 0.0 ) { base[1] += 1.0; }
+ // the while loops can lead to *long* pauses if base[0] comes
+ // with a bogus value.
+ // while ( base[1] > 1.0 ) { base[1] -= 1.0; }
+ // while ( base[1] < 0.0 ) { base[1] += 1.0; }
+ 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]);
+ }
// cout << "base = " << base[0] << "," << base[1] << endl;