diff --git a/examples/osgviewerIPhone/iphoneViewerAppDelegate.mm b/examples/osgviewerIPhone/iphoneViewerAppDelegate.mm index 88a0267c6..551f2a3f1 100644 --- a/examples/osgviewerIPhone/iphoneViewerAppDelegate.mm +++ b/examples/osgviewerIPhone/iphoneViewerAppDelegate.mm @@ -18,7 +18,6 @@ // global programs osg::ref_ptr _vertColorProgram; -osg::ref_ptr _textProgram; @interface MyViewController : UIViewController @@ -85,10 +84,7 @@ osg::Camera* createHUD(unsigned int w, unsigned int h) text->setPosition(position); text->setText("A simple multi-touch-example\n1 touch = rotate, \n2 touches = drag + scale, \n3 touches = home"); text->setColor(osg::Vec4(0.9,0.1,0.1,1.0)); -#if defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE) - text->getOrCreateStateSet()->setAttributeAndModes(_textProgram, osg::StateAttribute::ON); - text->getOrCreateStateSet()->addUniform(new osg::Uniform("glyphTexture",0)); -#endif + geode->addDrawable( text ); } @@ -137,10 +133,6 @@ private: text->setPosition(osg::Vec3(110,0,0)); text->setDataVariance(osg::Object::DYNAMIC); text->setText(ss.str()); -#if defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE) - text->getOrCreateStateSet()->setAttributeAndModes(_textProgram, osg::StateAttribute::ON); - text->getOrCreateStateSet()->addUniform(new osg::Uniform("glyphTexture",0)); -#endif geode->addDrawable( text ); @@ -328,10 +320,6 @@ private: // create our default programs #if defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE) - _textProgram = new osg::Program(); - _textProgram->addShader( new osg::Shader(osg::Shader::VERTEX, TextShaderVert)); - _textProgram->addShader( new osg::Shader(osg::Shader::FRAGMENT, TextShaderFrag)); - _vertColorProgram = new osg::Program(); _vertColorProgram->addShader( new osg::Shader(osg::Shader::VERTEX, ColorShaderVert)); _vertColorProgram->addShader( new osg::Shader(osg::Shader::FRAGMENT, ColorShaderFrag)); diff --git a/examples/osgviewerIPhone/shaders.h b/examples/osgviewerIPhone/shaders.h index fda287d42..13d211b38 100644 --- a/examples/osgviewerIPhone/shaders.h +++ b/examples/osgviewerIPhone/shaders.h @@ -57,68 +57,3 @@ const char* ColorShaderFrag = NULL; #endif - -// -// text shader -// -#if OSG_GLES3_FEATURES - -const char* TextShaderVert = -"#version 300 es\n" -"in vec4 osg_Vertex;\n" -"in vec4 osg_Color;\n" -"in vec4 osg_MultiTexCoord0;\n" -"uniform mat4 osg_ModelViewProjectionMatrix;\n" -"out vec4 vertColor;\n" -"out vec4 texCoord;\n" -"void main()\n" -"{\n" -" gl_Position = osg_ModelViewProjectionMatrix * osg_Vertex;\n" -" vertColor = osg_Color;\n" -" texCoord = osg_MultiTexCoord0;\n" -"}\n"; - -const char* TextShaderFrag = -"#version 300 es\n" -"in lowp vec4 vertColor;\n" -"in lowp vec4 texCoord;\n" -"uniform sampler2D glyphTexture;\n" -"out lowp vec4 fragColor;\n" -"void main()\n" -"{\n" -" fragColor = vertColor * texture(glyphTexture, texCoord.xy).a;\n" -"}\n"; - -#elif OSG_GLES2_FEATURES - -const char* TextShaderVert = -"#version 100\n" -"attribute vec4 osg_Vertex;\n" -"attribute vec4 osg_Color;\n" -"attribute vec4 osg_MultiTexCoord0;\n" -"uniform mat4 osg_ModelViewProjectionMatrix;\n" -"varying vec4 vertColor;\n" -"varying vec4 texCoord;\n" -"void main()\n" -"{\n" -" gl_Position = osg_ModelViewProjectionMatrix * osg_Vertex;\n" -" vertColor = osg_Color;\n" -" texCoord = osg_MultiTexCoord0;\n" -"}\n"; - -const char* TextShaderFrag = -"#version 100\n" -"varying lowp vec4 vertColor;\n" -"varying lowp vec4 texCoord;\n" -"uniform sampler2D glyphTexture;\n" -"void main()\n" -"{\n" -" gl_FragColor = vertColor * texture2D(glyphTexture, texCoord.xy).a;\n" -"}\n"; - -#else - -const char* TextShaderVert = NULL; -const char* TextShaderFrag = NULL; - -#endif diff --git a/src/osgText/Font.cpp b/src/osgText/Font.cpp index 2a7415fdf..ffe63ac0d 100644 --- a/src/osgText/Font.cpp +++ b/src/osgText/Font.cpp @@ -35,13 +35,22 @@ using namespace std; static osg::ApplicationUsageProxy Font_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_TEXT_INCREMENTAL_SUBLOADING ","ON | OFF"); #define FIXED_FUNCTION defined(OSG_GL_FIXED_FUNCTION_AVAILABLE) -#define SHADERS_GL3 (defined(OSG_GL3_AVAILABLE)) +#define SHADERS_GL3 (defined(OSG_GL3_AVAILABLE) || defined(OSG_GLES3_AVAILABLE)) #define SHADERS_GL2 !FIXED_FUNCTION && !SHADERS_GL3 - +#define IS_ES (defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE)) #if SHADERS_GL3 + +#if !IS_ES + #define GLSL_VERSION_STR "330 core" + #define GLYPH_CMP "r" +#else + #define GLSL_VERSION_STR "300 es" + #define GLYPH_CMP "a" +#endif + static const char* gl3_TextVertexShader = { - "#version 330 core\n" + "#version " GLSL_VERSION_STR "\n" "// gl3_TextVertexShader\n" "#ifdef GL_ES\n" " precision highp float;\n" @@ -61,7 +70,7 @@ static const char* gl3_TextVertexShader = { }; static const char* gl3_TextFragmentShader = { - "#version 330 core\n" + "#version " GLSL_VERSION_STR "\n" "// gl3_TextFragmentShader\n" "#ifdef GL_ES\n" " precision highp float;\n" @@ -72,7 +81,7 @@ static const char* gl3_TextFragmentShader = { "out vec4 color;\n" "void main(void)\n" "{\n" - " if (texCoord.x>=0.0) color = vertexColor * vec4(1.0, 1.0, 1.0, texture(glyphTexture, texCoord).r);\n" + " if (texCoord.x>=0.0) color = vertexColor * vec4(1.0, 1.0, 1.0, texture(glyphTexture, texCoord)." GLYPH_CMP ");\n" " else color = vertexColor;\n" "}\n" }; diff --git a/src/osgText/Text.cpp b/src/osgText/Text.cpp index d51f0e1c9..5b5e12a11 100644 --- a/src/osgText/Text.cpp +++ b/src/osgText/Text.cpp @@ -1093,16 +1093,89 @@ void Text::drawImplementation(osg::RenderInfo& renderInfo) const drawImplementation(*renderInfo.getState(), osg::Vec4(1.0f,1.0f,1.0f,1.0f)); } +void Text::drawImplementationSinglePass(osg::State& state, const osg::Vec4& colorMultiplier) const +{ + osg::VertexArrayState* vas = state.getCurrentVertexArrayState(); + bool usingVertexBufferObjects = state.useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects); + bool usingVertexArrayObjects = usingVertexBufferObjects && state.useVertexArrayObject(_useVertexArrayObject); + bool requiresSetArrays = !usingVertexBufferObjects || !usingVertexArrayObjects || vas->getRequiresSetArrays(); + + if ((_drawMode&(~TEXT))!=0 && !_decorationPrimitives.empty()) + { + state.applyTextureMode(0,GL_TEXTURE_2D,osg::StateAttribute::OFF); + vas->disableColorArray(state); + for(Primitives::const_iterator itr = _decorationPrimitives.begin(); + itr != _decorationPrimitives.end(); + ++itr) + { + if ((*itr)->getMode()==GL_TRIANGLES) state.Color(colorMultiplier.r()*_textBBColor.r(), colorMultiplier.g()*_textBBColor.g(), colorMultiplier.b()*_textBBColor.b(), colorMultiplier.a()*_textBBColor.a()); + else state.Color(colorMultiplier.r(), colorMultiplier.g(), colorMultiplier.b(), colorMultiplier.a()); + + (*itr)->draw(state, usingVertexBufferObjects); + } + state.applyTextureMode(0,GL_TEXTURE_2D,osg::StateAttribute::ON); + } + + if (_drawMode & TEXT) +// if (false) + { + for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin(); + titr!=_textureGlyphQuadMap.end(); + ++titr) + { + // need to set the texture here... + state.applyTextureAttribute(0,titr->first.get()); + + const GlyphQuads& glyphquad = titr->second; + +#if 1 + if(_backdropType != NONE) + { + unsigned int backdrop_index; + unsigned int max_backdrop_index; + if(_backdropType == OUTLINE) + { + backdrop_index = 1; + max_backdrop_index = 8; + } + else + { + backdrop_index = _backdropType+1; + max_backdrop_index = backdrop_index+1; + } + + if (max_backdrop_index>glyphquad._primitives.size()) max_backdrop_index=glyphquad._primitives.size(); + + state.disableColorPointer(); + state.Color(_backdropColor.r(),_backdropColor.g(),_backdropColor.b(),_backdropColor.a()); + + for( ; backdrop_index < max_backdrop_index; backdrop_index++) + { + glyphquad._primitives[backdrop_index]->draw(state, usingVertexBufferObjects); + } + } +#endif + if(_colorGradientMode == SOLID) + { + vas->disableColorArray(state); + state.Color(colorMultiplier.r()*_color.r(),colorMultiplier.g()*_color.g(),colorMultiplier.b()*_color.b(),colorMultiplier.a()*_color.a()); + } + else + { + if (requiresSetArrays) + { + vas->setColorArray(state, _colorCoords.get()); + } + } + + glyphquad._primitives[0]->draw(state, usingVertexBufferObjects); + } + } +} + + void Text::drawImplementation(osg::State& state, const osg::Vec4& colorMultiplier) const { - bool usingVertexBufferObjects = state.useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects); - - state.applyMode(GL_BLEND,true); -#if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE) - state.applyTextureMode(0,GL_TEXTURE_2D,osg::StateAttribute::ON); - state.applyTextureAttribute(0,getActiveFont()->getTexEnv()); -#endif - // save the previous modelview matrix osg::Matrix previous_modelview = state.getModelViewMatrix(); @@ -1131,6 +1204,7 @@ void Text::drawImplementation(osg::State& state, const osg::Vec4& colorMultiplie state.Normal(_normal.x(), _normal.y(), _normal.z()); osg::VertexArrayState* vas = state.getCurrentVertexArrayState(); + bool usingVertexBufferObjects = state.useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects); bool usingVertexArrayObjects = usingVertexBufferObjects && state.useVertexArrayObject(_useVertexArrayObject); bool requiresSetArrays = !usingVertexBufferObjects || !usingVertexArrayObjects || vas->getRequiresSetArrays(); @@ -1142,107 +1216,28 @@ void Text::drawImplementation(osg::State& state, const osg::Vec4& colorMultiplie vas->applyDisablingOfVertexAttributes(state); } - if ((_drawMode&(~TEXT))!=0) +#if 0 + drawImplementationSinglePass(state, colorMultiplier); +#else + glDepthMask(GL_FALSE); + + drawImplementationSinglePass(state, colorMultiplier); + + if (_enableDepthWrites) { + glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); + glDepthMask(GL_TRUE); - if (!_decorationPrimitives.empty()) - { - osg::State::ApplyModeProxy applyMode(state, GL_LIGHTING, false); - osg::State::ApplyTextureModeProxy applyTextureMode(state, 0, GL_TEXTURE_2D, false); + drawImplementationSinglePass(state, colorMultiplier); - #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GLES3_AVAILABLE) && !defined(OSG_GL3_AVAILABLE) - switch(_backdropImplementation) - { - case NO_DEPTH_BUFFER: - // Do nothing. The bounding box will be rendered before the text and that's all that matters. - break; - case DEPTH_RANGE: - glPushAttrib(GL_DEPTH_BUFFER_BIT); - //unsigned int backdrop_index = 0; - //unsigned int max_backdrop_index = 8; - //const double offset = double(max_backdrop_index - backdrop_index) * 0.003; - glDepthRange(0.001, 1.001); - break; - /*case STENCIL_BUFFER: - break;*/ - default: - glPushAttrib(GL_POLYGON_OFFSET_FILL); - glEnable(GL_POLYGON_OFFSET_FILL); - glPolygonOffset(0.1f * osg::PolygonOffset::getFactorMultiplier(), 10.0f * osg::PolygonOffset::getUnitsMultiplier() ); - } - #endif - - for(Primitives::const_iterator itr = _decorationPrimitives.begin(); - itr != _decorationPrimitives.end(); - ++itr) - { - if ((*itr)->getMode()==GL_TRIANGLES) state.Color(colorMultiplier.r()*_textBBColor.r(), colorMultiplier.g()*_textBBColor.g(), colorMultiplier.b()*_textBBColor.b(), colorMultiplier.a()*_textBBColor.a()); - else state.Color(colorMultiplier.r(), colorMultiplier.g(), colorMultiplier.b(), colorMultiplier.a()); - - (*itr)->draw(state, usingVertexBufferObjects); - } - - #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GLES3_AVAILABLE) && !defined(OSG_GL3_AVAILABLE) - switch(_backdropImplementation) - { - case NO_DEPTH_BUFFER: - // Do nothing. - break; - case DEPTH_RANGE: - glDepthRange(0.0, 1.0); - glPopAttrib(); - break; - /*case STENCIL_BUFFER: - break;*/ - default: - glDisable(GL_POLYGON_OFFSET_FILL); - glPopAttrib(); - } - #endif - } + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + state.haveAppliedAttribute(osg::StateAttribute::COLORMASK); } -#if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE) - state.applyTextureMode(0,GL_TEXTURE_2D,osg::StateAttribute::ON); - state.applyTextureAttribute(0,getActiveFont()->getTexEnv()); + state.haveAppliedAttribute(osg::StateAttribute::DEPTH); #endif - if (_drawMode & TEXT) - { - - // Okay, since ATI's cards/drivers are not working correctly, - // we need alternative solutions to glPolygonOffset. - // So this is a pick your poison approach. Each alternative - // backend has trade-offs associated with it, but with luck, - // the user may find that works for them. - if(_backdropType != NONE && _backdropImplementation != DELAYED_DEPTH_WRITES) - { - switch(_backdropImplementation) - { - case POLYGON_OFFSET: - renderWithPolygonOffset(state,colorMultiplier); - break; - case NO_DEPTH_BUFFER: - renderWithNoDepthBuffer(state,colorMultiplier); - break; - case DEPTH_RANGE: - renderWithDepthRange(state,colorMultiplier); - break; - case STENCIL_BUFFER: - renderWithStencilBuffer(state,colorMultiplier); - break; - default: - renderWithPolygonOffset(state,colorMultiplier); - } - } - else - { - renderWithDelayedDepthWrites(state,colorMultiplier); - } - - } - - if (!usingVertexArrayObjects) + if (usingVertexBufferObjects && !usingVertexArrayObjects) { // unbind the VBO's if any are used. vas->unbindVertexBufferObject(); @@ -1252,12 +1247,15 @@ void Text::drawImplementation(osg::State& state, const osg::Vec4& colorMultiplie if (needToApplyMatrix) { // apply this new modelview matrix + state.applyModelViewMatrix(previous_modelview); // workaround for GL3/GL2 if (state.getUseModelViewAndProjectionUniforms()) state.applyModelViewAndProjectionUniformsIfRequired(); } } + + void Text::accept(osg::Drawable::ConstAttributeFunctor& af) const { if (_coords.valid() ) @@ -1371,445 +1369,6 @@ float Text::bilinearInterpolate(float x1, float x2, float y1, float y2, float x, ); } -void Text::drawForegroundText(osg::State& state, const GlyphQuads& glyphquad, const osg::Vec4& colorMultiplier) const -{ - if (glyphquad._primitives.empty()) return; - - const Coords& coords = _coords; - const ColorCoords& colors = _colorCoords; - - bool usingVertexBufferObjects = state.useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects); - - if (coords.valid() && !coords->empty()) - { - VertexArrayState* vas = state.getCurrentVertexArrayState(); - bool usingVertexArrayObjects = usingVertexBufferObjects && state.useVertexArrayObject(_useVertexArrayObject); - - if(_colorGradientMode == SOLID) - { - vas->disableColorArray(state); - state.Color(colorMultiplier.r()*_color.r(),colorMultiplier.g()*_color.g(),colorMultiplier.b()*_color.b(),colorMultiplier.a()*_color.a()); - } - else - { - bool requiresSetArrays = (_backdropType!=NONE) || !usingVertexBufferObjects || !usingVertexArrayObjects || vas->getRequiresSetArrays(); - if (requiresSetArrays) - { - vas->setColorArray(state, colors.get()); - } - } - - glyphquad._primitives[0]->draw(state, usingVertexBufferObjects); - } -} - -void Text::renderOnlyForegroundText(osg::State& state, const osg::Vec4& colorMultiplier) const -{ - for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin(); - titr!=_textureGlyphQuadMap.end(); - ++titr) - { - // need to set the texture here... - state.applyTextureAttribute(0,titr->first.get()); - - const GlyphQuads& glyphquad = titr->second; - - drawForegroundText(state, glyphquad, colorMultiplier); - } -} - -void Text::renderWithDelayedDepthWrites(osg::State& state, const osg::Vec4& colorMultiplier) const -{ - // If depth testing is disabled, then just render text as normal - if( !state.getLastAppliedMode(GL_DEPTH_TEST) ) { - drawTextWithBackdrop(state,colorMultiplier); - return; - } - - //glPushAttrib( _enableDepthWrites ? (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT) : GL_DEPTH_BUFFER_BIT); - // Render to color buffer without writing to depth buffer. - glDepthMask(GL_FALSE); - drawTextWithBackdrop(state,colorMultiplier); - - // Render to depth buffer if depth writes requested. - if( _enableDepthWrites ) - { - glDepthMask(GL_TRUE); - glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); - drawTextWithBackdrop(state,colorMultiplier); - } - - state.haveAppliedAttribute(osg::StateAttribute::DEPTH); - state.haveAppliedAttribute(osg::StateAttribute::COLORMASK); - - glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - //glPopAttrib(); -} - -void Text::drawTextWithBackdrop(osg::State& state, const osg::Vec4& colorMultiplier) const -{ - bool usingVertexBufferObjects = state.useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects); - - for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin(); - titr!=_textureGlyphQuadMap.end(); - ++titr) - { - // need to set the texture here... - state.applyTextureAttribute(0,titr->first.get()); - - const GlyphQuads& glyphquad = titr->second; - - if(_backdropType != NONE) - { - unsigned int backdrop_index; - unsigned int max_backdrop_index; - if(_backdropType == OUTLINE) - { - backdrop_index = 1; - max_backdrop_index = 8; - } - else - { - backdrop_index = _backdropType+1; - max_backdrop_index = backdrop_index+1; - } - - if (max_backdrop_index>glyphquad._primitives.size()) max_backdrop_index=glyphquad._primitives.size(); - - state.disableColorPointer(); - state.Color(_backdropColor.r(),_backdropColor.g(),_backdropColor.b(),_backdropColor.a()); - - for( ; backdrop_index < max_backdrop_index; backdrop_index++) - { - glyphquad._primitives[backdrop_index]->draw(state, usingVertexBufferObjects); - } - } - - drawForegroundText(state, glyphquad, colorMultiplier); - } -} - - -void Text::renderWithPolygonOffset(osg::State& state, const osg::Vec4& colorMultiplier) const -{ -#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GLES3_AVAILABLE) && !defined(OSG_GL3_AVAILABLE) - - bool usingVertexBufferObjects = state.useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects); - VertexArrayState* vas = state.getCurrentVertexArrayState(); - - if (!osg::PolygonOffset::areFactorAndUnitsMultipliersSet()) - { - osg::PolygonOffset::setFactorAndUnitsMultipliersUsingBestGuessForDriver(); - } - - // Do I really need to do this for glPolygonOffset? - glPushAttrib(GL_POLYGON_OFFSET_FILL); - glEnable(GL_POLYGON_OFFSET_FILL); - - for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin(); - titr!=_textureGlyphQuadMap.end(); - ++titr) - { - // need to set the texture here... - state.applyTextureAttribute(0,titr->first.get()); - - const GlyphQuads& glyphquad = titr->second; - - unsigned int backdrop_index; - unsigned int max_backdrop_index; - if(_backdropType == OUTLINE) - { - backdrop_index = 1; - max_backdrop_index = 8; - } - else - { - backdrop_index = _backdropType+1; - max_backdrop_index = backdrop_index+1; - } - - if (max_backdrop_index>glyphquad._primitives.size()) max_backdrop_index=glyphquad._primitives.size(); - - vas->disableColorArray(state); - state.Color(_backdropColor.r(),_backdropColor.g(),_backdropColor.b(),_backdropColor.a()); - - for( ; backdrop_index < max_backdrop_index; backdrop_index++) - { - float factor = 0.1f * osg::PolygonOffset::getFactorMultiplier(); - float units = 10.0f * float((max_backdrop_index-backdrop_index)) * osg::PolygonOffset::getUnitsMultiplier(); - glPolygonOffset(factor, units); - - glyphquad._primitives[backdrop_index]->draw(state, usingVertexBufferObjects); - } - - // Reset the polygon offset so the foreground text is on top - glPolygonOffset(0.0f,0.0f); - - drawForegroundText(state, glyphquad, colorMultiplier); - } - - glPopAttrib(); -#else - OSG_NOTICE<<"Warning: Text::renderWithPolygonOffset(..) not implemented."<first.get()); - - const GlyphQuads& glyphquad = titr->second; - - unsigned int backdrop_index; - unsigned int max_backdrop_index; - if(_backdropType == OUTLINE) - { - backdrop_index = 1; - max_backdrop_index = 8; - } - else - { - backdrop_index = _backdropType+1; - max_backdrop_index = backdrop_index+1; - } - - if (max_backdrop_index>glyphquad._primitives.size()) max_backdrop_index=glyphquad._primitives.size(); - - - state.disableColorPointer(); - state.Color(_backdropColor.r(),_backdropColor.g(),_backdropColor.b(),_backdropColor.a()); - - for( ; backdrop_index < max_backdrop_index; backdrop_index++) - { - glyphquad._primitives[backdrop_index]->draw(state, usingVertexBufferObjects); - } - - drawForegroundText(state, glyphquad, colorMultiplier); - } - - glPopAttrib(); -#else - OSG_NOTICE<<"Warning: Text::renderWithNoDepthBuffer(..) not implemented."<first.get()); - - const GlyphQuads& glyphquad = titr->second; - - unsigned int backdrop_index; - unsigned int max_backdrop_index; - if(_backdropType == OUTLINE) - { - backdrop_index = 1; - max_backdrop_index = 8; - } - else - { - backdrop_index = _backdropType+1; - max_backdrop_index = backdrop_index+1; - } - - if (max_backdrop_index>glyphquad._primitives.size()) max_backdrop_index=glyphquad._primitives.size(); - - state.disableColorPointer(); - state.Color(_backdropColor.r(),_backdropColor.g(),_backdropColor.b(),_backdropColor.a()); - - for( ; backdrop_index < max_backdrop_index; backdrop_index++) - { - double offset = double(max_backdrop_index-backdrop_index)*0.0001; - glDepthRange( offset, 1.0+offset); - glyphquad._primitives[backdrop_index]->draw(state, usingVertexBufferObjects); - } - - glDepthRange(0.0, 1.0); - - drawForegroundText(state, glyphquad, colorMultiplier); - } - - glPopAttrib(); -#else - OSG_NOTICE<<"Warning: Text::renderWithDepthRange(..) not implemented."<second; - if (glyphquad._primitives.empty()) continue; - - // need to set the texture here... - state.applyTextureAttribute(0, titr->first.get()); - - - unsigned int backdrop_index; - unsigned int max_backdrop_index; - if(_backdropType == OUTLINE) - { - backdrop_index = 1; - max_backdrop_index = 8; - } - else - { - backdrop_index = _backdropType+1; - max_backdrop_index = backdrop_index+1; - } - - if (max_backdrop_index>glyphquad._primitives.size()) max_backdrop_index=glyphquad._primitives.size(); - - for( ; backdrop_index < max_backdrop_index; backdrop_index++) - { - glyphquad._primitives[backdrop_index]->draw(state, usingVertexBufferObjects); - } - - // Draw the foreground text - glyphquad._primitives[0]->draw(state, usingVertexBufferObjects); - } - - - // disable the depth buffer -// glDisable(GL_DEPTH_TEST); -// glDepthMask(GL_FALSE); -// glDepthMask(GL_TRUE); -// glDepthFunc(GL_ALWAYS); - - // Set the stencil function to pass when the stencil is 1 - // Bug: This call seems to have no effect. Try changing to NOTEQUAL - // and see the exact same results. - glStencilFunc(GL_EQUAL, 1, 1); - - // disable writing to the stencil buffer - glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); - glStencilMask(GL_FALSE); - - // Re-enable writing to the color buffer so we can see the results - glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - - // Draw all the text again - - for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin(); - titr!=_textureGlyphQuadMap.end(); - ++titr) - { - // need to set the texture here... - state.applyTextureAttribute(0,titr->first.get()); - - const GlyphQuads& glyphquad = titr->second; - - unsigned int backdrop_index; - unsigned int max_backdrop_index; - if(_backdropType == OUTLINE) - { - backdrop_index = 1; - max_backdrop_index = 8; - } - else - { - backdrop_index = _backdropType+1; - max_backdrop_index = backdrop_index+1; - } - - if (max_backdrop_index>glyphquad._primitives.size()) max_backdrop_index=glyphquad._primitives.size(); - - state.disableColorPointer(); - state.Color(_backdropColor.r(),_backdropColor.g(),_backdropColor.b(),_backdropColor.a()); - - for( ; backdrop_index < max_backdrop_index; backdrop_index++) - { - glyphquad._primitives[backdrop_index]->draw(state, usingVertexBufferObjects); - } - - drawForegroundText(state, glyphquad, colorMultiplier); - } - - glPopAttrib(); -#else - OSG_NOTICE<<"Warning: Text::renderWithStencilBuffer(..) not implemented."<