Merge branch 'timoore/effects'

This commit is contained in:
Tim Moore
2010-01-11 07:14:23 +01:00
+1 -2
View File
@@ -69,7 +69,6 @@ EffectMap effectMap;
double SGNewCloud::sprite_density = 1.0; double SGNewCloud::sprite_density = 1.0;
SGNewCloud::SGNewCloud(string type, SGNewCloud::SGNewCloud(string type,
const SGPath &tex_path, const SGPath &tex_path,
string tex, string tex,
@@ -214,7 +213,7 @@ osg::ref_ptr<EffectGeode> SGNewCloud::genCloud() {
z = height * cos(elev) * 0.5f; z = height * cos(elev) * 0.5f;
} }
// Determine the height and width as scaling factors on the minimum size (used to create the quad) // Determine the height and width as scaling factors on the minimum size (used to create the quad).
float sprite_width = 1.0f + sg_random() * (max_sprite_width - min_sprite_width) / min_sprite_width; float sprite_width = 1.0f + sg_random() * (max_sprite_width - min_sprite_width) / min_sprite_width;
float sprite_height = 1.0f + sg_random() * (max_sprite_height - min_sprite_height) / min_sprite_height; float sprite_height = 1.0f + sg_random() * (max_sprite_height - min_sprite_height) / min_sprite_height;