EOL" aSpecl = pow (aNdotH, theIsFront ? occFrontMaterial_Shininess() : occBackMaterial_Shininess());"
EOL" }"
EOL
- EOL"Diffuse += occLight_Diffuse (theId).rgb * aNdotL * anAtten;"
- EOL"Specular += occLight_Specular (theId).rgb * aSpecl * anAtten;"
+ EOL" Diffuse += occLight_Diffuse (theId).rgb * aNdotL * anAtten;"
+ EOL" Specular += occLight_Specular (theId).rgb * aSpecl * anAtten;"
EOL"}";
//! Function computes contribution of spotlight source
EOL" return aMixColor;"
EOL"}";
+//! Compute gl_Position vertex shader output.
+const char THE_VERT_gl_Position[] =
+EOL" gl_Position = occProjectionMatrix * occWorldViewMatrix * occModelWorldMatrix * occVertex;";
+
+//! Displace gl_Position alongside vertex normal for outline rendering.
+//! This code adds silhouette only for smooth surfaces of closed primitive, and produces visual artifacts on sharp edges.
+const char THE_VERT_gl_Position_OUTLINE[] =
+EOL" float anOutlineDisp = occOrthoScale > 0.0 ? occOrthoScale : gl_Position.w;"
+EOL" vec4 anOutlinePos = occVertex + vec4 (occNormal * (occSilhouetteThickness * anOutlineDisp), 0.0);"
+EOL" gl_Position = occProjectionMatrix * occWorldViewMatrix * occModelWorldMatrix * anOutlinePos;";
+
#if !defined(GL_ES_VERSION_2_0)
static const GLfloat THE_DEFAULT_AMBIENT[4] = { 0.0f, 0.0f, 0.0f, 1.0f };
}
#endif
+ //! Generate map key for light sources configuration.
+ static TCollection_AsciiString genLightKey (const Handle(Graphic3d_LightSet)& theLights)
+ {
+ if (theLights->NbEnabled() <= THE_NB_UNROLLED_LIGHTS_MAX)
+ {
+ return TCollection_AsciiString ("l_") + theLights->KeyEnabledLong();
+ }
+
+ const Standard_Integer aMaxLimit = roundUpMaxLightSources (theLights->NbEnabled());
+ return TCollection_AsciiString ("l_") + theLights->KeyEnabledShort() + aMaxLimit;
+ }
}
// =======================================================================
OpenGl_ShaderManager::OpenGl_ShaderManager (OpenGl_Context* theContext)
: myFfpProgram (new OpenGl_ShaderProgramFFP()),
myShadingModel (Graphic3d_TOSM_VERTEX),
- myUnlitPrograms (new OpenGl_SetOfShaderPrograms()),
+ myUnlitPrograms (new OpenGl_SetOfPrograms()),
myContext (theContext),
myHasLocalOrigin (Standard_False),
myLastView (NULL)
{
myProgramList.Clear();
myLightPrograms.Nullify();
- myUnlitPrograms = new OpenGl_SetOfShaderPrograms();
+ myUnlitPrograms = new OpenGl_SetOfPrograms();
+ myOutlinePrograms.Nullify();
myMapOfLightPrograms.Clear();
myFontProgram.Nullify();
myBlitProgram.Nullify();
const Handle(Graphic3d_LightSet)& aLights = myLightSourceState.LightSources();
if (aLights.IsNull())
{
- myLightPrograms = myUnlitPrograms;
+ if (!myMapOfLightPrograms.Find ("unlit", myLightPrograms))
+ {
+ myLightPrograms = new OpenGl_SetOfShaderPrograms (myUnlitPrograms);
+ myMapOfLightPrograms.Bind ("unlit", myLightPrograms);
+ }
return;
}
- TCollection_AsciiString aKey ("l_");
- if (aLights->NbEnabled() <= THE_NB_UNROLLED_LIGHTS_MAX)
- {
- aKey += aLights->KeyEnabledLong();
- }
- else
- {
- const Standard_Integer aMaxLimit = roundUpMaxLightSources (aLights->NbEnabled());
- aKey += aLights->KeyEnabledShort();
- aKey += aMaxLimit;
- }
-
+ const TCollection_AsciiString aKey = genLightKey (aLights);
if (!myMapOfLightPrograms.Find (aKey, myLightPrograms))
{
myLightPrograms = new OpenGl_SetOfShaderPrograms();
OpenGl_ShaderObject::ShaderVariableList aUniforms, aStageInOuts;
aStageInOuts.Append (OpenGl_ShaderObject::ShaderVariable ("vec2 TexCoord", Graphic3d_TOS_VERTEX | Graphic3d_TOS_FRAGMENT));
- TCollection_AsciiString aSrcVert =
- EOL"void main()"
+ TCollection_AsciiString aSrcVert = TCollection_AsciiString()
+ + EOL"void main()"
EOL"{"
EOL" TexCoord = occTexCoord.st;"
- EOL" gl_Position = occProjectionMatrix * occWorldViewMatrix * occModelWorldMatrix * occVertex;"
- EOL"}";
+ + THE_VERT_gl_Position
+ + EOL"}";
TCollection_AsciiString
aSrcGetAlpha = EOL"float getAlpha(void) { return occTexture2D(occSamplerBaseColor, TexCoord.st).a; }";
EOL"}";
Handle(Graphic3d_ShaderProgram) aProgramSrc = new Graphic3d_ShaderProgram();
- defaultGlslVersion (aProgramSrc, 0);
+ defaultGlslVersion (aProgramSrc, "font", 0);
aProgramSrc->SetNbLightsMax (0);
aProgramSrc->SetNbClipPlanesMax (0);
aProgramSrc->AttachShader (OpenGl_ShaderObject::CreateFromSource (aSrcVert, Graphic3d_TOS_VERTEX, aUniforms, aStageInOuts));
aProgramSrc->SetHeader ("#version 150");
}
#endif
+ aProgramSrc->SetId ("occt_blit");
aProgramSrc->SetNbLightsMax (0);
aProgramSrc->SetNbClipPlanesMax (0);
aProgramSrc->AttachShader (OpenGl_ShaderObject::CreateFromSource (aSrcVert, Graphic3d_TOS_VERTEX, aUniforms, aStageInOuts));
#endif
}
+ aProgramSrc->SetId (theMsaa ? "occt_weight-oit-msaa" : "occt_weight-oit");
aProgramSrc->SetNbLightsMax (0);
aProgramSrc->SetNbClipPlanesMax (0);
aProgramSrc->AttachShader (OpenGl_ShaderObject::CreateFromSource (aSrcVert, Graphic3d_TOS_VERTEX, aUniforms, aStageInOuts));
TCollection_AsciiString aSrcGetAlpha = EOL"float getAlpha(void) { return occTexture2D(occSamplerBaseColor, " THE_VEC2_glPointCoord ").a; }";
#if !defined(GL_ES_VERSION_2_0)
if (myContext->core11 == NULL
- && (theBits & OpenGl_PO_TextureA) != 0)
+ && (theBits & OpenGl_PO_HasTextures) == OpenGl_PO_TextureA)
{
aSrcGetAlpha = EOL"float getAlpha(void) { return occTexture2D(occSamplerBaseColor, " THE_VEC2_glPointCoord ").r; }";
}
return aSrcGetAlpha;
}
-namespace
-{
-
- // =======================================================================
- // function : textureUsed
- // purpose :
- // =======================================================================
- static bool textureUsed (const Standard_Integer theBits)
- {
- return (theBits & OpenGl_PO_TextureA) != 0 || (theBits & OpenGl_PO_TextureRGB) != 0;
- }
-
-}
-
// =======================================================================
// function : defaultGlslVersion
// purpose :
// =======================================================================
int OpenGl_ShaderManager::defaultGlslVersion (const Handle(Graphic3d_ShaderProgram)& theProgram,
+ const TCollection_AsciiString& theName,
int theBits,
bool theUsesDerivates) const
{
}
}
#endif
+
+ // should fit OpenGl_PO_NB
+ char aBitsStr[64];
+ Sprintf (aBitsStr, "%04x", aBits);
+ theProgram->SetId (TCollection_AsciiString ("occt_") + theName + aBitsStr);
return aBits;
}
// purpose :
// =======================================================================
Standard_Boolean OpenGl_ShaderManager::prepareStdProgramUnlit (Handle(OpenGl_ShaderProgram)& theProgram,
- const Standard_Integer theBits)
+ Standard_Integer theBits,
+ Standard_Boolean theIsOutline)
{
Handle(Graphic3d_ShaderProgram) aProgramSrc = new Graphic3d_ShaderProgram();
TCollection_AsciiString aSrcVert, aSrcVertExtraMain, aSrcVertExtraFunc, aSrcGetAlpha, aSrcVertEndMain;
aSrcVertExtraMain += EOL" gl_PointSize = occPointSize;";
#endif
- if ((theBits & OpenGl_PO_TextureRGB) != 0)
+ if ((theBits & OpenGl_PO_HasTextures) != 0)
{
- aSrcFragGetColor =
- EOL"vec4 getColor(void) { return occTexture2D(occSamplerBaseColor, " THE_VEC2_glPointCoord "); }";
- }
+ if ((theBits & OpenGl_PO_HasTextures) == OpenGl_PO_TextureRGB)
+ {
+ aSrcFragGetColor =
+ EOL"vec4 getColor(void) { return occTexture2D(occSamplerBaseColor, " THE_VEC2_glPointCoord "); }";
+ }
- if (textureUsed (theBits))
- {
aSrcGetAlpha = pointSpriteAlphaSrc (theBits);
#if !defined(GL_ES_VERSION_2_0)
aStageInOuts.Append (OpenGl_ShaderObject::ShaderVariable ("vec4 TexCoord", Graphic3d_TOS_VERTEX | Graphic3d_TOS_FRAGMENT));
}
- if ((theBits & OpenGl_PO_TextureRGB) != 0)
+ if ((theBits & OpenGl_PO_HasTextures) == OpenGl_PO_TextureRGB)
{
aSrcVertExtraMain += THE_VARY_TexCoord_Trsf;
aProgramSrc->SetWeightOitOutput (true);
}
- if ((theBits & OpenGl_PO_StippleLine) != 0)
+ if (theIsOutline)
+ {
+ aUniforms.Append (OpenGl_ShaderObject::ShaderVariable ("float occOrthoScale", Graphic3d_TOS_VERTEX));
+ aUniforms.Append (OpenGl_ShaderObject::ShaderVariable ("float occSilhouetteThickness", Graphic3d_TOS_VERTEX));
+ aSrcVertEndMain = THE_VERT_gl_Position_OUTLINE;
+ }
+ else if ((theBits & OpenGl_PO_StippleLine) != 0)
{
- const Standard_Integer aBits = defaultGlslVersion (aProgramSrc, theBits);
+ const Standard_Integer aBits = defaultGlslVersion (aProgramSrc, "unlit", theBits);
if ((aBits & OpenGl_PO_StippleLine) != 0)
{
aUniforms.Append (OpenGl_ShaderObject::ShaderVariable ("int uPattern", Graphic3d_TOS_FRAGMENT));
+ EOL"void main()"
EOL"{"
+ aSrcVertExtraMain
- + EOL" gl_Position = occProjectionMatrix * occWorldViewMatrix * occModelWorldMatrix * occVertex;"
+ + THE_VERT_gl_Position
+ aSrcVertEndMain
+ EOL"}";
+ aSrcFragMainGetColor
+ EOL"}";
- defaultGlslVersion (aProgramSrc, theBits);
+ defaultGlslVersion (aProgramSrc, theIsOutline ? "outline" : "unlit", theBits);
aProgramSrc->SetNbLightsMax (0);
aProgramSrc->SetNbClipPlanesMax (aNbClipPlanes);
aProgramSrc->SetAlphaTest ((theBits & OpenGl_PO_AlphaTest) != 0);
const Standard_Integer theBits)
{
TCollection_AsciiString aSrcFragGetColor;
- if ((theBits & OpenGl_PO_TextureA) != 0)
+ if ((theBits & OpenGl_PO_HasTextures) == OpenGl_PO_TextureA)
{
aSrcFragGetColor = pointSpriteAlphaSrc (theBits) +
EOL"vec4 getColor(void)"
EOL" return aColor;"
EOL"}";
}
- else if ((theBits & OpenGl_PO_TextureRGB) != 0)
+ else if ((theBits & OpenGl_PO_HasTextures) == OpenGl_PO_TextureRGB)
{
aSrcFragGetColor = TCollection_AsciiString() +
EOL"vec4 getColor(void)"
aSrcVertExtraMain += EOL" gl_PointSize = occPointSize;";
#endif
- if (textureUsed (theBits))
+ if ((theBits & OpenGl_PO_HasTextures) != 0)
{
#if !defined(GL_ES_VERSION_2_0)
if (myContext->core11 != NULL
}
else
{
- if ((theBits & OpenGl_PO_TextureRGB) != 0)
+ if ((theBits & OpenGl_PO_HasTextures) == OpenGl_PO_TextureRGB)
{
aStageInOuts.Append (OpenGl_ShaderObject::ShaderVariable ("vec4 TexCoord", Graphic3d_TOS_VERTEX | Graphic3d_TOS_FRAGMENT));
aSrcVertExtraMain += THE_VARY_TexCoord_Trsf;
EOL" FrontColor = computeLighting (normalize (aNormal), normalize (aView), aPosition, true);"
EOL" BackColor = computeLighting (normalize (aNormal), normalize (aView), aPosition, false);"
+ aSrcVertExtraMain
- + EOL" gl_Position = occProjectionMatrix * occWorldViewMatrix * occModelWorldMatrix * occVertex;"
- EOL"}";
+ + THE_VERT_gl_Position
+ + EOL"}";
TCollection_AsciiString aSrcGeom = prepareGeomMainSrc (aUniforms, aStageInOuts, theBits);
aSrcFragGetColor += (theBits & OpenGl_PO_MeshEdges) != 0
+ EOL" occSetFragColor (getFinalColor());"
+ EOL"}";
- defaultGlslVersion (aProgramSrc, theBits);
+ const TCollection_AsciiString aProgId = TCollection_AsciiString ("gouraud-") + genLightKey (myLightSourceState.LightSources()) + "-";
+ defaultGlslVersion (aProgramSrc, aProgId, theBits);
aProgramSrc->SetNbLightsMax (aNbLights);
aProgramSrc->SetNbClipPlanesMax (aNbClipPlanes);
aProgramSrc->SetAlphaTest ((theBits & OpenGl_PO_AlphaTest) != 0);
aSrcVertExtraMain += EOL" gl_PointSize = occPointSize;";
#endif
- if (textureUsed (theBits))
+ if ((theBits & OpenGl_PO_HasTextures) != 0)
{
#if !defined(GL_ES_VERSION_2_0)
if (myContext->core11 != NULL
}
else
{
- if ((theBits & OpenGl_PO_TextureRGB) != 0)
+ if ((theBits & OpenGl_PO_HasTextures) == OpenGl_PO_TextureRGB)
{
aStageInOuts.Append (OpenGl_ShaderObject::ShaderVariable ("vec4 TexCoord", Graphic3d_TOS_VERTEX | Graphic3d_TOS_FRAGMENT));
aSrcVertExtraMain += THE_VARY_TexCoord_Trsf;
EOL" Position = occWorldViewMatrix * PositionWorld;"
+ EOL" View = vec3 (0.0, 0.0, 1.0);"
+ aSrcVertExtraMain
- + EOL" gl_Position = occProjectionMatrix * occWorldViewMatrix * occModelWorldMatrix * occVertex;"
- EOL"}";
+ + THE_VERT_gl_Position
+ + EOL"}";
TCollection_AsciiString aSrcGeom = prepareGeomMainSrc (aUniforms, aStageInOuts, theBits);
aSrcFragGetColor += (theBits & OpenGl_PO_MeshEdges) != 0
+ EOL" occSetFragColor (getFinalColor());"
+ EOL"}";
- defaultGlslVersion (aProgramSrc, theBits, isFlatNormal);
+ const TCollection_AsciiString aProgId = TCollection_AsciiString (theIsFlatNormal ? "flat-" : "phong-") + genLightKey (myLightSourceState.LightSources()) + "-";
+ defaultGlslVersion (aProgramSrc, aProgId, theBits, isFlatNormal);
aProgramSrc->SetNbLightsMax (aNbLights);
aProgramSrc->SetNbClipPlanesMax (aNbClipPlanes);
aProgramSrc->SetAlphaTest ((theBits & OpenGl_PO_AlphaTest) != 0);
TCollection_AsciiString aSrcFrag;
aUniforms.Append (OpenGl_ShaderObject::ShaderVariable ("sampler2D uLeftSampler", Graphic3d_TOS_FRAGMENT));
aUniforms.Append (OpenGl_ShaderObject::ShaderVariable ("sampler2D uRightSampler", Graphic3d_TOS_FRAGMENT));
+ const char* aName = "stereo";
switch (theStereoMode)
{
case Graphic3d_StereoMode_Anaglyph:
{
+ aName = "anaglyph";
aUniforms.Append (OpenGl_ShaderObject::ShaderVariable ("mat4 uMultL", Graphic3d_TOS_FRAGMENT));
aUniforms.Append (OpenGl_ShaderObject::ShaderVariable ("mat4 uMultR", Graphic3d_TOS_FRAGMENT));
aSrcFrag =
}
case Graphic3d_StereoMode_RowInterlaced:
{
+ aName = "row-interlaced";
aSrcFrag =
EOL"void main()"
EOL"{"
}
case Graphic3d_StereoMode_ColumnInterlaced:
{
+ aName = "column-interlaced";
aSrcFrag =
EOL"void main()"
EOL"{"
}
case Graphic3d_StereoMode_ChessBoard:
{
+ aName = "chessboard";
aSrcFrag =
EOL"void main()"
EOL"{"
}
case Graphic3d_StereoMode_SideBySide:
{
+ aName = "sidebyside";
aSrcFrag =
EOL"void main()"
EOL"{"
}
case Graphic3d_StereoMode_OverUnder:
{
+ aName = "overunder";
aSrcFrag =
EOL"void main()"
EOL"{"
}
}
- defaultGlslVersion (aProgramSrc, 0);
+ defaultGlslVersion (aProgramSrc, aName, 0);
aProgramSrc->SetNbLightsMax (0);
aProgramSrc->SetNbClipPlanesMax (0);
aProgramSrc->AttachShader (OpenGl_ShaderObject::CreateFromSource (aSrcVert, Graphic3d_TOS_VERTEX, aUniforms, aStageInOuts));
EOL" occSetFragColor (occColor);"
EOL"}";
- defaultGlslVersion (aProgramSrc, 0);
+ defaultGlslVersion (aProgramSrc, "bndbox", 0);
aProgramSrc->SetNbLightsMax (0);
aProgramSrc->SetNbClipPlanesMax (0);
aProgramSrc->AttachShader (OpenGl_ShaderObject::CreateFromSource (aSrcVert, Graphic3d_TOS_VERTEX, aUniforms, aStageInOuts));