Updates to cloud code to add different basic cloud types. This isn't the

[simgear.git] / simgear / sky / cloud.cxx

diff --git a/simgear/sky/cloud.cxx b/simgear/sky/cloud.cxx
index 20215a188877fd849b04ae20e5808759c7a974fd..f46db1c58d1c46c231f7b3de0677bd280a144759 100644 (file)
--- a/simgear/sky/cloud.cxx
+++ b/simgear/sky/cloud.cxx
@@ -26,9 +26,12 @@
 #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 "cloud.hxx"
 
 
@@ -43,27 +46,39 @@ SGCloudLayer::~SGCloudLayer( void ) {
 
 
 // build the moon object
-ssgBranch * SGCloudLayer::build( FGPath path, double s, double asl ) {
+void SGCloudLayer::build( FGPath path, double s, double asl, double thickness,
+                         double transition, SGCloudType type )
+{
+    scale = 4000.0;
 
     layer_asl = asl;
+    layer_thickness = thickness;
+    layer_transition = transition;
+
     size = s;
     last_lon = last_lat = -999.0f;
 
-    // set up the cloud state
-    path.append( "cloud.rgba" );
-    layer_state = new ssgSimpleState();
-    layer_state->setTexture( (char *)path.c_str() );
-    layer_state->setShadeModel( GL_SMOOTH );
-    layer_state->disable( GL_LIGHTING );
-    layer_state->disable( GL_CULL_FACE );
-    layer_state->enable( GL_TEXTURE_2D );
-    layer_state->enable( GL_COLOR_MATERIAL );
-    layer_state->setColourMaterial( GL_AMBIENT_AND_DIFFUSE );
-    layer_state->setMaterial( GL_EMISSION, 0, 0, 0, 1 );
-    layer_state->setMaterial( GL_SPECULAR, 0, 0, 0, 1 );
-    layer_state->enable( GL_BLEND );
-    layer_state->enable( GL_ALPHA_TEST );
-    layer_state->setAlphaClamp( 0.01 );
+    // 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;
+    }
 
     cl = new ssgColourArray( 4 );
     vl = new ssgVertexArray( 4 );
@@ -76,25 +91,27 @@ ssgBranch * SGCloudLayer::build( FGPath path, double s, double asl ) {
     sgSetVec4( color, 1.0f, 1.0f, 1.0f, 1.0f );
 
     sgSetVec3( vertex, -size, -size, 0.0f );
-    sgSetVec2( tc, 0.0f, 0.0f );
+    sgVec2 base;
+    sgSetVec2( base, fg_random(), fg_random() );
+    sgSetVec2( tc, base[0], base[1] );
     cl->add( color );
     vl->add( vertex );
     tl->add( tc );
 
     sgSetVec3( vertex, size, -size, 0.0f );
-    sgSetVec2( tc, size / 1000.0f, 0.0f );
+    sgSetVec2( tc, base[0] + size / scale, base[1] );
     cl->add( color );
     vl->add( vertex );
     tl->add( tc );
 
     sgSetVec3( vertex, -size, size, 0.0f );
-    sgSetVec2( tc, 0.0f, size / 1000.0f );
+    sgSetVec2( tc, base[0], base[1] + size / scale );
     cl->add( color );
     vl->add( vertex );
     tl->add( tc );
 
     sgSetVec3( vertex, size, size, 0.0f );
-    sgSetVec2( tc, size / 1000.0f, size / 1000.0f );
+    sgSetVec2( tc, base[0] + size / scale, base[1] + size / scale );
     cl->add( color );
     vl->add( vertex );
     tl->add( tc );
@@ -113,7 +130,8 @@ ssgBranch * SGCloudLayer::build( FGPath path, double s, double asl ) {
     // moon_transform->addKid( halo );
     layer_transform->addKid( layer );
 
-    return layer_transform;
+    layer_root = new ssgRoot;
+    layer_root->addKid( layer_transform );
 }
 
 
@@ -135,7 +153,9 @@ bool SGCloudLayer::repaint( sgVec3 fog_color ) {
 // lat specifies a rotation about the new Y axis
 // 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 ) {
+bool SGCloudLayer::reposition( sgVec3 p, sgVec3 up, double lon, double lat,
+                              double alt )
+{
     sgMat4 T1, LON, LAT;
     sgVec3 axis;
 
@@ -143,7 +163,11 @@ bool SGCloudLayer::reposition( sgVec3 p, sgVec3 up, double lon, double lat ) {
     sgVec3 asl_offset;
     sgCopyVec3( asl_offset, up );
     sgNormalizeVec3( asl_offset );
-    sgScaleVec3( asl_offset, layer_asl );
+    if ( alt <= layer_asl ) {
+       sgScaleVec3( asl_offset, layer_asl );
+    } else {
+       sgScaleVec3( asl_offset, layer_asl + layer_thickness );
+    }
     // cout << "asl_offset = " << asl_offset[0] << "," << asl_offset[1]
     //      << "," << asl_offset[2] << endl;
     sgAddVec3( asl_offset, p );
@@ -193,8 +217,8 @@ bool SGCloudLayer::reposition( sgVec3 p, sgVec3 up, double lon, double lat ) {
        calc_gc_course_dist( dest, start, &course, &dist );
        // cout << "course = " << course << ", dist = " << dist << endl;
 
-       double xoff = cos( course ) * dist / 500.0;
-       double yoff = sin( course ) * dist / 500.0;
+       double xoff = cos( course ) * dist / (2 * scale);
+       double yoff = sin( course ) * dist / (2 * scale);
 
        // cout << "xoff = " << xoff << ", yoff = " << yoff << endl;
 
@@ -212,13 +236,13 @@ bool SGCloudLayer::reposition( sgVec3 p, sgVec3 up, double lon, double lat ) {
        // cout << "base = " << base[0] << "," << base[1] << endl;
 
        tc = tl->get( 1 );
-       sgSetVec2( tc, base[0] + size / 1000.0f, base[1] );
+       sgSetVec2( tc, base[0] + size / scale, base[1] );
  
        tc = tl->get( 2 );
-       sgSetVec2( tc, base[0], base[1] + size / 1000.0f );
+       sgSetVec2( tc, base[0], base[1] + size / scale );
  
        tc = tl->get( 3 );
-       sgSetVec2( tc, base[0] + size / 1000.0f, base[1] + size / 1000.0f );
+       sgSetVec2( tc, base[0] + size / scale, base[1] + size / scale );
  
        last_lon = lon;
        last_lat = lat;
@@ -226,3 +250,29 @@ bool SGCloudLayer::reposition( sgVec3 p, sgVec3 up, double lon, double lat ) {
 
     return true;
 }
+
+
+void SGCloudLayer::draw() {
+    ssgCullAndDraw( layer_root );
+}
+
+
+// make an ssgSimpleState for a cloud layer given the named texture
+ssgSimpleState *SGCloudMakeState( const string &path ) {
+    ssgSimpleState *state = new ssgSimpleState();
+
+    state->setTexture( (char *)path.c_str() );
+    state->setShadeModel( GL_SMOOTH );
+    state->disable( GL_LIGHTING );
+    state->disable( GL_CULL_FACE );
+    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->enable( GL_BLEND );
+    state->enable( GL_ALPHA_TEST );
+    state->setAlphaClamp( 0.01 );
+
+    return state;
+}