FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compositor: Add another precomputed uniform for the skydome shader

Browse Source
This commit is contained in:
Fernando García Liñán 2021-08-19 13:08:14 +02:00
parent 6cea6b7fdf
commit ab1d7792bd
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
simgear/scene/viewer/Compositor.cxx
View File

@ -147,13 +147,14 @@ Compositor::Compositor(osg::View *view,
new osg::Uniform("fg_CameraPositionCart", osg::Vec3f()),
new osg::Uniform("fg_CameraPositionGeod", osg::Vec3f()),
new osg::Uniform("fg_CameraDistanceToEarthCenter", 0.0f),
new osg::Uniform("fg_CameraWorldUp", osg::Vec3f()),
new osg::Uniform("fg_CameraViewUp", osg::Vec3f()),
new osg::Uniform("fg_NearFar", osg::Vec2f()),
new osg::Uniform("fg_Planes", osg::Vec3f()),
new osg::Uniform("fg_SunDirection", osg::Vec3f()),
new osg::Uniform("fg_SunDirectionWorld", osg::Vec3f()),
new osg::Uniform("fg_SunZenithCosTheta", 0.0f),
new osg::Uniform("fg_EarthRadius", 0.0f),
new osg::Uniform("fg_WorldUp", osg::Vec3f()),
}
{
_uniforms[SG_UNIFORM_SUN_DIRECTION_WORLD]->setUpdateCallback(
@ -189,6 +190,8 @@ Compositor::update(const osg::Matrix &view_matrix,
osg::Vec3d world_up = camera_pos;
world_up.normalize();
osg::Vec3d view_up = world_up * view_inverse;
view_up.normalize();
double left = 0.0, right = 0.0, bottom = 0.0, top = 0.0,
zNear = 0.0, zFar = 0.0;
@ -241,6 +244,12 @@ Compositor::update(const osg::Matrix &view_matrix,
case SG_UNIFORM_CAMERA_DISTANCE_TO_EARTH_CENTER:
u->set(float(camera_pos.length()));
break;
case SG_UNIFORM_CAMERA_WORLD_UP:
u->set(osg::Vec3f(world_up));
break;
case SG_UNIFORM_CAMERA_VIEW_UP:
u->set(osg::Vec3f(view_up));
break;
case SG_UNIFORM_NEAR_FAR:
u->set(osg::Vec2f(zNear, zFar));
break;
@ -256,9 +265,6 @@ Compositor::update(const osg::Matrix &view_matrix,
case SG_UNIFORM_EARTH_RADIUS:
u->set(float(camera_pos.length() - camera_pos_geod.getElevationM()));
break;
case SG_UNIFORM_WORLD_UP:
u->set(osg::Vec3f(world_up));
break;
default:
// Unknown uniform
break;

3
simgear/scene/viewer/Compositor.hxx
View File

@ -58,13 +58,14 @@ public:
SG_UNIFORM_CAMERA_POSITION_CART,
SG_UNIFORM_CAMERA_POSITION_GEOD,
SG_UNIFORM_CAMERA_DISTANCE_TO_EARTH_CENTER,
SG_UNIFORM_CAMERA_WORLD_UP,
SG_UNIFORM_CAMERA_VIEW_UP,
SG_UNIFORM_NEAR_FAR,
SG_UNIFORM_PLANES,
SG_UNIFORM_SUN_DIRECTION,
SG_UNIFORM_SUN_DIRECTION_WORLD,
SG_UNIFORM_SUN_ZENITH_COSTHETA,
SG_UNIFORM_EARTH_RADIUS,
SG_UNIFORM_WORLD_UP,
SG_TOTAL_BUILTIN_UNIFORMS
};

3
simgear/scene/viewer/CompositorPass.cxx
View File

@ -769,11 +769,12 @@ public:
ss->addUniform(uniforms[Compositor::SG_UNIFORM_CAMERA_POSITION_CART]);
ss->addUniform(uniforms[Compositor::SG_UNIFORM_CAMERA_POSITION_GEOD]);
ss->addUniform(uniforms[Compositor::SG_UNIFORM_CAMERA_DISTANCE_TO_EARTH_CENTER]);
ss->addUniform(uniforms[Compositor::SG_UNIFORM_CAMERA_WORLD_UP]);
ss->addUniform(uniforms[Compositor::SG_UNIFORM_CAMERA_VIEW_UP]);
ss->addUniform(uniforms[Compositor::SG_UNIFORM_SUN_DIRECTION]);
ss->addUniform(uniforms[Compositor::SG_UNIFORM_SUN_DIRECTION_WORLD]);
ss->addUniform(uniforms[Compositor::SG_UNIFORM_SUN_ZENITH_COSTHETA]);
ss->addUniform(uniforms[Compositor::SG_UNIFORM_EARTH_RADIUS]);
ss->addUniform(uniforms[Compositor::SG_UNIFORM_WORLD_UP]);
osg::ref_ptr<osg::Uniform> clustered_shading_enabled =
new osg::Uniform("fg_ClusteredEnabled", clustered ? true : false);