OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0025328: Visualization, TKOpenGl - support text rendering within built-in GLSL programs

Browse Source
This commit is contained in:
dbp 2015-01-20 12:56:54 +03:00 committed by bugmaster
parent bcf50875e3
commit b990e5579a
2 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/OpenGl/OpenGl_ShaderManager.cxx
View File

@ -998,21 +998,24 @@ void OpenGl_ShaderManager::PushState (const Handle(OpenGl_ShaderProgram)& thePro
Standard_Boolean OpenGl_ShaderManager::prepareStdProgramFont() Standard_Boolean OpenGl_ShaderManager::prepareStdProgramFont()
{ {
Handle(Graphic3d_ShaderProgram) aProgramSrc = new Graphic3d_ShaderProgram(); Handle(Graphic3d_ShaderProgram) aProgramSrc = new Graphic3d_ShaderProgram();
TCollection_AsciiString aSrcVert = TCollection_AsciiString aSrcVert = TCollection_AsciiString()
EOL"void main()" + THE_VARY_TexCoord
EOL"{" + EOL"void main()"
EOL" gl_Position = occProjectionMatrix * occWorldViewMatrix * occModelWorldMatrix * occVertex;" EOL"{"
EOL"}"; EOL" TexCoord = occTexCoord.st;"
EOL" gl_Position = occProjectionMatrix * occWorldViewMatrix * occModelWorldMatrix * occVertex;"
EOL"}";
TCollection_AsciiString aSrcFrag = TCollection_AsciiString aSrcFrag = TCollection_AsciiString() +
EOL"float getAlpha(void) { return texture2D(occActiveSampler, gl_PointCoord).a; }" + THE_VARY_TexCoord
EOL"void main()" + EOL"float getAlpha(void) { return texture2D(occActiveSampler, TexCoord.st).a; }"
EOL"{" EOL"void main()"
EOL" vec4 aColor = occColor;" EOL"{"
EOL" aColor.a *= getAlpha();" EOL" vec4 aColor = occColor;"
EOL" if (aColor.a <= 0.285) discard;" EOL" aColor.a *= getAlpha();"
EOL" gl_FragColor = aColor;" EOL" if (aColor.a <= 0.285) discard;"
EOL"}"; EOL" gl_FragColor = aColor;"
EOL"}";
aProgramSrc->AttachShader (Graphic3d_ShaderObject::CreateFromSource (Graphic3d_TOS_VERTEX, aSrcVert)); aProgramSrc->AttachShader (Graphic3d_ShaderObject::CreateFromSource (Graphic3d_TOS_VERTEX, aSrcVert));
aProgramSrc->AttachShader (Graphic3d_ShaderObject::CreateFromSource (Graphic3d_TOS_FRAGMENT, aSrcFrag)); aProgramSrc->AttachShader (Graphic3d_ShaderObject::CreateFromSource (Graphic3d_TOS_FRAGMENT, aSrcFrag));

35
src/OpenGl/OpenGl_Text.cxx
View File

@ -382,21 +382,11 @@ void OpenGl_Text::Render (const Handle(OpenGl_Workspace)& theWorkspace) const
const Handle(OpenGl_Texture) aPrevTexture = theWorkspace->DisableTexture(); const Handle(OpenGl_Texture) aPrevTexture = theWorkspace->DisableTexture();
const Handle(OpenGl_Context)& aCtx = theWorkspace->GetGlContext(); const Handle(OpenGl_Context)& aCtx = theWorkspace->GetGlContext();
// Bind custom shader program or generate default version
if (aCtx->IsGlGreaterEqual (2, 0)) if (aCtx->IsGlGreaterEqual (2, 0))
{ {
const Handle(OpenGl_ShaderProgram)& aProgram = aTextAspect->ShaderProgramRes (aCtx); aCtx->ShaderManager()->BindProgram (
aCtx->BindProgram (aProgram); aTextAspect, aTextAspect->ShaderProgramRes (aCtx));
if (!aProgram.IsNull())
{
aProgram->ApplyVariables (aCtx);
const OpenGl_MaterialState* aMaterialState = aCtx->ShaderManager()->MaterialState (aProgram);
if (aMaterialState == NULL || aMaterialState->Aspect() != aTextAspect)
aCtx->ShaderManager()->UpdateMaterialStateTo (aProgram, aTextAspect);
aCtx->ShaderManager()->PushState (aProgram);
}
} }
// use highlight color or colors from aspect // use highlight color or colors from aspect
@ -444,9 +434,6 @@ void OpenGl_Text::setupMatrix (const Handle(OpenGl_PrinterContext)& thePrintCtx,
const OpenGl_AspectText& theTextAspect, const OpenGl_AspectText& theTextAspect,
const OpenGl_Vec3 theDVec) const const OpenGl_Vec3 theDVec) const
{ {
// setup matrix
#if !defined(GL_ES_VERSION_2_0)
OpenGl_Mat4d aModViewMat; OpenGl_Mat4d aModViewMat;
if (myIs2d) if (myIs2d)
@ -495,7 +482,12 @@ void OpenGl_Text::setupMatrix (const Handle(OpenGl_PrinterContext)& thePrintCtx,
theCtx->WorldViewState.SetCurrent<Standard_Real> (aModViewMat); theCtx->WorldViewState.SetCurrent<Standard_Real> (aModViewMat);
theCtx->ApplyWorldViewMatrix(); theCtx->ApplyWorldViewMatrix();
#endif
if (!theCtx->ActiveProgram().IsNull())
{
// Upload updated state to shader program
theCtx->ShaderManager()->PushState (theCtx->ActiveProgram());
}
} }
// ======================================================================= // =======================================================================
@ -538,7 +530,7 @@ void OpenGl_Text::drawText (const Handle(OpenGl_PrinterContext)& ,
glDrawArrays (GL_TRIANGLES, 0, GLsizei(aVerts->GetElemsNb())); glDrawArrays (GL_TRIANGLES, 0, GLsizei(aVerts->GetElemsNb()));
aVerts->UnbindAttribute (theCtx, Graphic3d_TOA_UV); aTCrds->UnbindAttribute (theCtx, Graphic3d_TOA_UV);
aVerts->UnbindAttribute (theCtx, Graphic3d_TOA_POS); aVerts->UnbindAttribute (theCtx, Graphic3d_TOA_POS);
} }
glBindTexture (GL_TEXTURE_2D, 0); glBindTexture (GL_TEXTURE_2D, 0);
@ -662,7 +654,6 @@ void OpenGl_Text::render (const Handle(OpenGl_PrinterContext)& thePrintCtx,
theCtx->WorldViewState.Push(); theCtx->WorldViewState.Push();
#if !defined(GL_ES_VERSION_2_0)
myModelMatrix.Convert (theCtx->WorldViewState.Current() * theCtx->ModelWorldState.Current()); myModelMatrix.Convert (theCtx->WorldViewState.Current() * theCtx->ModelWorldState.Current());
if (!myIs2d) if (!myIs2d)
@ -712,6 +703,8 @@ void OpenGl_Text::render (const Handle(OpenGl_PrinterContext)& thePrintCtx,
} }
myExportHeight = (float )myFont->FTFont()->PointSize() / myExportHeight; myExportHeight = (float )myFont->FTFont()->PointSize() / myExportHeight;
#if !defined(GL_ES_VERSION_2_0)
// push enabled flags to the stack // push enabled flags to the stack
glPushAttrib (GL_ENABLE_BIT); glPushAttrib (GL_ENABLE_BIT);
glDisable (GL_LIGHTING); glDisable (GL_LIGHTING);
@ -774,7 +767,7 @@ void OpenGl_Text::render (const Handle(OpenGl_PrinterContext)& thePrintCtx,
} }
case Aspect_TODT_DEKALE: case Aspect_TODT_DEKALE:
{ {
theCtx->core11->glColor3fv (theColorSubs.rgb); theCtx->SetColor4fv (*(const OpenGl_Vec4* )theColorSubs.rgb);
setupMatrix (thePrintCtx, theCtx, theTextAspect, OpenGl_Vec3 (+1.0f, +1.0f, 0.00001f)); setupMatrix (thePrintCtx, theCtx, theTextAspect, OpenGl_Vec3 (+1.0f, +1.0f, 0.00001f));
drawText (thePrintCtx, theCtx, theTextAspect); drawText (thePrintCtx, theCtx, theTextAspect);
setupMatrix (thePrintCtx, theCtx, theTextAspect, OpenGl_Vec3 (-1.0f, -1.0f, 0.00001f)); setupMatrix (thePrintCtx, theCtx, theTextAspect, OpenGl_Vec3 (-1.0f, -1.0f, 0.00001f));
@ -793,7 +786,7 @@ void OpenGl_Text::render (const Handle(OpenGl_PrinterContext)& thePrintCtx,
} }
// main draw call // main draw call
theCtx->core11->glColor3fv (theColorText.rgb); theCtx->SetColor4fv (*(const OpenGl_Vec4* )theColorText.rgb);
setupMatrix (thePrintCtx, theCtx, theTextAspect, OpenGl_Vec3 (0.0f, 0.0f, 0.0f)); setupMatrix (thePrintCtx, theCtx, theTextAspect, OpenGl_Vec3 (0.0f, 0.0f, 0.0f));
drawText (thePrintCtx, theCtx, theTextAspect); drawText (thePrintCtx, theCtx, theTextAspect);