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

From Paul Martz, "The gist of this change is, if the OpenFlight version of the

Browse Source 
parent file is so old that it doesn't support Light Point palettes or Shader
palettes, then the parent file is not allowed to override those palettes in
the child."
This commit is contained in:
Robert Osfield
2006-08-14 07:59:28 +00:00
parent 85b39a7894
commit 7b53511251
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgPlugins/OpenFlight/PrimaryRecords.cpp
View File

@@ -672,12 +672,18 @@ protected:
if (document.version() == 1541)
mask = ~0;
// Only override light points and shader palettes if
// we are the correct version.
bool parentLightPoints( (document.version() >= VERSION_15_8) &&
((mask & LIGHT_POINT_PALETTE_OVERRIDE) == 0) );
bool parentShaders( (document.version() >= VERSION_16_0) &&
((mask & SHADER_PALETTE_OVERRIDE) == 0) );
_external->setUserData(new ParentPools(
((mask & COLOR_PALETTE_OVERRIDE) ? NULL : document.getColorPool()),
((mask & MATERIAL_PALETTE_OVERRIDE) ? NULL : document.getOrCreateMaterialPool()),
((mask & TEXTURE_PALETTE_OVERRIDE) ? NULL : document.getOrCreateTexturePool()),
((mask & LIGHT_POINT_PALETTE_OVERRIDE) ? NULL : document.getOrCreateLightPointAppearancePool()),
((mask & SHADER_PALETTE_OVERRIDE) ? NULL : document.getOrCreateShaderPool()) ));
((!parentLightPoints) ? NULL : document.getOrCreateLightPointAppearancePool()),
((!parentShaders) ? NULL : document.getOrCreateShaderPool()) ));
}
// Add this implementation to parent implementation.