#include <math.h>
+#include <simgear/structure/OSGVersion.hxx>
#include <osg/AlphaFunc>
#include <osg/BlendFunc>
+#include <osg/CullFace>
#include <osg/Geode>
#include <osg/Geometry>
#include <osg/Material>
#include <osg/TextureCubeMap>
#include <osg/TexMat>
#include <osg/Fog>
+#if SG_OSG_MIN_VERSION_REQUIRED(2,9,5)
+#include <osgDB/Options>
+#endif
#include <simgear/math/sg_random.h>
#include <simgear/misc/PathOptions.hxx>
#include "cloud.hxx"
using namespace simgear;
+using namespace osg;
+
#if defined(__MINGW32__)
#define isnan(x) _isnan(x)
#endif
StateAttributeFactory* attribFactory = StateAttributeFactory::instance();
stateSet->setAttributeAndModes(attribFactory->getSmoothShadeModel());
stateSet->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
- stateSet->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
stateSet->setAttributeAndModes(attribFactory->getStandardAlphaFunc());
stateSet->setAttributeAndModes(attribFactory->getStandardBlendFunc());
osg::StateSet *rootSet = layer_root->getOrCreateStateSet();
rootSet->setRenderBinDetails(CLOUDS_BIN, "DepthSortedBin");
rootSet->setTextureAttribute(0, new osg::TexMat);
+ rootSet->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
// Combiner for fog color and cloud alpha
osg::TexEnvCombine* combine0 = new osg::TexEnvCombine;
osg::TexEnvCombine* combine1 = new osg::TexEnvCombine;
rootSet->setDataVariance(osg::Object::DYNAMIC);
base = osg::Vec2(sg_random(), sg_random());
-
group_top->addChild(layer_transform.get());
group_bottom->addChild(layer_transform.get());
if (coverage != layer_coverage) {
layer_coverage = coverage;
rebuild();
+
+ double coverage_norm = 0.0;
+ if( coverage == SG_CLOUD_FEW)
+ coverage_norm = 2.0/8.0; // <1-2
+ else if( coverage == SG_CLOUD_SCATTERED )
+ coverage_norm = 4.0/8.0; // 3-4
+ else if( coverage == SG_CLOUD_BROKEN )
+ coverage_norm = 6.0/8.0; // 5-7
+ else if( coverage == SG_CLOUD_OVERCAST )
+ coverage_norm = 8.0/8.0; // 8
+
+ layer3D->setCoverage(coverage_norm);
+ layer3D->applyCoverage();
}
}
texMat->setMatrix(osg::Matrix::translate(offset[0], offset[1], 0.0));
}
+// colors for debugging the cloud layers
+#ifdef CLOUD_DEBUG
+Vec3 cloudColors[] = {Vec3(1.0f, 1.0f, 1.0f), Vec3(1.0f, 0.0f, 0.0f),
+ Vec3(0.0f, 1.0f, 0.0f), Vec3(0.0f, 0.0f, 1.0f)};
+#else
+Vec3 cloudColors[] = {Vec3(1.0f, 1.0f, 1.0f), Vec3(1.0f, 1.0f, 1.0f),
+ Vec3(1.0f, 1.0f, 1.0f), Vec3(1.0f, 1.0f, 1.0f)};
+#endif
+
// build the cloud object
void
SGCloudLayer::rebuild()
layer_states[SG_CLOUD_CLEAR] = 0;
layer_states2[SG_CLOUD_CLEAR] = 0;
+#if 1
+ // experimental optimization that may not make any difference
+ // at all :/
+ osg::CopyOp copyOp;
+ for (int i = 0; i < SG_MAX_CLOUD_COVERAGES; ++i) {
+ StateAttributeFactory *saf = StateAttributeFactory::instance();
+ if (layer_states[i].valid()) {
+ if (layer_states[i] == layer_states2[i])
+ layer_states2[i] = static_cast<osg::StateSet*>(layer_states[i]->clone(copyOp));
+ layer_states[i]->setAttribute(saf ->getCullFaceFront());
+ layer_states2[i]->setAttribute(saf ->getCullFaceBack());
+ }
+ }
+#endif
}
scale = 4000.0;
osg::Vec3 vertex(layer_span*(i-2)/2, -layer_span,
alt_diff * (sin(i*mpi) - 2));
osg::Vec2 tc(layer_scale * i/4, 0.0f);
- osg::Vec4 color(1.0f, 1.0f, 1.0f, (i == 0) ? 0.0f : 0.15f);
+ osg::Vec4 color(cloudColors[0], (i == 0) ? 0.0f : 0.15f);
cl[i]->push_back(color);
vl[i]->push_back(vertex);
vertex = osg::Vec3(layer_span*(i-1)/2, layer_span*(j-2)/2,
alt_diff * (sin((i+1)*mpi) + sin(j*mpi) - 2));
tc = osg::Vec2(layer_scale * (i+1)/4, layer_scale * j/4);
- color = osg::Vec4(1.0f, 1.0f, 1.0f,
+ color = osg::Vec4(cloudColors[0],
( (j == 0) || (i == 3)) ?
( (j == 0) && (i == 3)) ? 0.0f : 0.15f : 1.0f );
vertex = osg::Vec3(layer_span*(i-2)/2, layer_span*(j-1)/2,
alt_diff * (sin(i*mpi) + sin((j+1)*mpi) - 2) );
tc = osg::Vec2(layer_scale * i/4, layer_scale * (j+1)/4 );
- color = osg::Vec4(1.0f, 1.0f, 1.0f,
+ color = osg::Vec4(cloudColors[0],
((j == 3) || (i == 0)) ?
((j == 3) && (i == 0)) ? 0.0f : 0.15f : 1.0f );
cl[i]->push_back(color);
tc = osg::Vec2(layer_scale * (i+1)/4, layer_scale);
- color = osg::Vec4(1.0f, 1.0f, 1.0f, (i == 3) ? 0.0f : 0.15f );
+ color = osg::Vec4(cloudColors[0], (i == 3) ? 0.0f : 0.15f );
cl[i]->push_back( color );
vl[i]->push_back( vertex );
osg::StateSet* stateSet = static_cast<osg::StateSet*>(layer_states2[layer_coverage]->clone(copyOp));
stateSet->setDataVariance(osg::Object::DYNAMIC);
group_top->setStateSet(stateSet);
- stateSet = static_cast<osg::StateSet*>(layer_states2[layer_coverage]->clone(copyOp));
+ stateSet = static_cast<osg::StateSet*>(layer_states[layer_coverage]->clone(copyOp));
stateSet->setDataVariance(osg::Object::DYNAMIC);
group_bottom->setStateSet(stateSet);
}
// repaint the cloud layer colors
bool SGCloudLayer::repaint( const SGVec3f& fog_color ) {
- osg::Vec4f combineColor(fog_color.osg(), cloud_alpha);
+ osg::Vec4f combineColor(toOsg(fog_color), cloud_alpha);
osg::TexEnvCombine* combiner
= dynamic_cast<osg::TexEnvCombine*>(layer_root->getStateSet()
->getTextureAttribute(1, osg::StateAttribute::TEXENV));
double alt, double dt )
{
// combine p and asl (meters) to get translation offset
- osg::Vec3 asl_offset(up.osg());
+ osg::Vec3 asl_offset(toOsg(up));
asl_offset.normalize();
if ( alt <= layer_asl ) {
asl_offset *= layer_asl;
// cout << "asl_offset = " << asl_offset[0] << "," << asl_offset[1]
// << "," << asl_offset[2] << endl;
- asl_offset += p.osg();
+ asl_offset += toOsg(p);
// cout << " asl_offset = " << asl_offset[0] << "," << asl_offset[1]
// << "," << asl_offset[2] << endl;
double xoff = (ax + bx) / (2 * scale);
double yoff = (ay + by) / (2 * scale);
- const float layer_scale = layer_span / scale;
+// const float layer_scale = layer_span / scale;
// cout << "xoff = " << xoff << ", yoff = " << yoff << endl;
base[0] += xoff;
last_lat = lat;
}
- layer3D->reposition( p, up, lon, lat, dt);
+ layer3D->reposition( p, up, lon, lat, dt, layer_asl);
return true;
}
cloud_root->setChildValue(layer_root.get(), true);
}
}
-
-void SGCloudLayer::applyDensity() {
- layer3D->applyDensity();
-}
projects / simgear.git / blobdiff