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

Merge commit 'refs/merge-requests/17' of git://gitorious.org/fg/simgear into merge-requests/17

Browse Source
This commit is contained in:
ThorstenB 2011-11-19 15:25:22 +01:00
commit 338f2311d4
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
simgear/scene/tgdb/pt_lights.cxx
View File

@ -407,8 +407,21 @@ buildVasi(const SGDirectionalLightBin& lights, const SGVec3f& up,
drawable->addLight(lights.getLight(3).position, drawable->addLight(lights.getLight(3).position,
lights.getLight(3).normal, up, 2.5); lights.getLight(3).normal, up, 2.5);
return drawable; return drawable;
}
else if (count == 12) { } else if (count == 6) {
SGVasiDrawable* drawable = new SGVasiDrawable(red, white);
// probably vasi, first 3 are downwind bar (2.5 deg)
for (unsigned i = 0; i < 3; ++i)
drawable->addLight(lights.getLight(i).position,
lights.getLight(i).normal, up, 2.5);
// last 3 are upwind bar (3.0 deg)
for (unsigned i = 3; i < 6; ++i)
drawable->addLight(lights.getLight(i).position,
lights.getLight(i).normal, up, 3.0);
return drawable;
} else if (count == 12) {
SGVasiDrawable* drawable = new SGVasiDrawable(red, white); SGVasiDrawable* drawable = new SGVasiDrawable(red, white);
// probably vasi, first 6 are downwind bar (2.5 deg) // probably vasi, first 6 are downwind bar (2.5 deg)
@ -419,8 +432,8 @@ buildVasi(const SGDirectionalLightBin& lights, const SGVec3f& up,
for (unsigned i = 6; i < 12; ++i) for (unsigned i = 6; i < 12; ++i)
drawable->addLight(lights.getLight(i).position, drawable->addLight(lights.getLight(i).position,
lights.getLight(i).normal, up, 3.0); lights.getLight(i).normal, up, 3.0);
return drawable; return drawable;
} else { } else {
// fail safe // fail safe
SG_LOG(SG_TERRAIN, SG_ALERT, SG_LOG(SG_TERRAIN, SG_ALERT,