Refactored GlyphTexture so that it utlizes standard osg::Texture2D/osg::Image combinations rather than locally implemented per glyph subloading.

2017-03-21 13:10:45 +00:00
parent 6670a6e070
commit a74872c6bf
3 changed files with 17 additions and 306 deletions
--- a/src/osgText/Font.cpp
+++ b/src/osgText/Font.cpp
@@ -32,13 +32,10 @@
 using namespace osgText;
 using namespace std;

-static osg::ApplicationUsageProxy Font_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_TEXT_INCREMENTAL_SUBLOADING <type>","ON | OFF");
-
 #define FIXED_FUNCTION defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
 #define SHADERS_GL3 (defined(OSG_GL3_AVAILABLE))
 #define SHADERS_GL2 !FIXED_FUNCTION && !SHADERS_GL3

-
 #if SHADERS_GL3
 static const char* gl3_TextVertexShader = {
    "#version 330 core\n"