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

Fixed Glyph::TextureInfo assignment bug

Browse Source
This commit is contained in:
Robert Osfield
2017-10-24 11:36:00 +01:00
parent 55a1764712
commit 1cd0a5fe03
4 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/osgText/Glyph
View File

@@ -100,16 +100,9 @@ public:
float texelMargin;
};
void setTextureInfo(ShaderTechnique technique, TextureInfo* info)
{
if (technique>=_textureInfoList.size()) _textureInfoList.resize(technique+1);
_textureInfoList[technique] = info;
}
void setTextureInfo(ShaderTechnique technique, TextureInfo* info);
const TextureInfo* getTextureInfo(ShaderTechnique technique) const
{
return (technique<_textureInfoList.size()) ? _textureInfoList[technique].get() : 0;
}
const TextureInfo* getTextureInfo(ShaderTechnique technique) const;
TextureInfo* getOrCreateTextureInfo(ShaderTechnique technique);