From: James T. <ja...@fl...> - 2019-06-26 07:50:11
|
> On 26 Jun 2019, at 08:13, Andreas Mueller <alp...@gm...> wrote: > > > Am 25.06.2019 um 18:33 schrieb James Turner: >> The ‘fix’ is here: >> https://github.com/zakalawe/osg/commit/383c8271e3d262e5b73254a0a4ed1aa4ed1f67a3 <https://github.com/zakalawe/osg/commit/383c8271e3d262e5b73254a0a4ed1aa4ed1f67a3> >> … which is simply a revert of: >> https://github.com/zakalawe/osg/commit/e6ab01c7c652ab47c3d61980fb5b031c700b4427 <https://github.com/zakalawe/osg/commit/e6ab01c7c652ab47c3d61980fb5b031c700b4427> >> (Also in the upstream OSG repository of course) >> There is a revert for both the 3.4 branch and the mainline which became 3.6 > > Mmmh...couldn't find the revert patch for 3.6.2. What do I miss? We don’t (often) use OSG 3.6 here - looking at the code on master (which became 3.6), there isn’t a single commit we can revert - Robert evidently did a lot of incremental improvements to the text code, adding support for other features and improving the shader support. Then at some point he collected a subset of those changes and back-ported them to 3.4 branch, which is what we revert in the commit on my fork on GitHub. This means for OSG 3.6 we need to find a solution on our side, which likely means updating aircraft or making some guesses based on the <text> animation element in our XML files, because the set of colouring options supported by the new osgText implementation is more restrictive than what worked before. (The text animation assumes that setting all of emissive/ambient/diffuse/specular works on an osgText, and it no longer does - for some cases we could map the emissive color to the text color, but this would break some other cases…. and text still won’t receive normal lighting in that case) Kind regards, James |