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

0025474: Visualization, TKOpenGl - support lighting + colored vertices within built-in GLSL programs

Browse Source
This commit is contained in:
kgv 2014-11-23 17:29:38 +03:00 committed by bugmaster
parent b1d15f53b3
commit abdf0b107e
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/OpenGl/OpenGl_ShaderManager.cxx
View File

@ -1114,7 +1114,7 @@ Standard_Boolean OpenGl_ShaderManager::prepareStdProgramFlat (Handle(OpenGl_Shad
// function : stdComputeLighting // function : stdComputeLighting
// purpose : // purpose :
// ======================================================================= // =======================================================================
TCollection_AsciiString OpenGl_ShaderManager::stdComputeLighting() TCollection_AsciiString OpenGl_ShaderManager::stdComputeLighting (const Standard_Boolean theHasVertColor)
{ {
bool aLightsMap[Visual3d_TOLS_SPOT + 1] = { false, false, false, false }; bool aLightsMap[Visual3d_TOLS_SPOT + 1] = { false, false, false, false };
TCollection_AsciiString aLightsFunc, aLightsLoop; TCollection_AsciiString aLightsFunc, aLightsLoop;
@ -1157,6 +1157,14 @@ TCollection_AsciiString OpenGl_ShaderManager::stdComputeLighting()
} }
} }
TCollection_AsciiString aGetMatAmbient = "theIsFront ? occFrontMaterial_Ambient() : occBackMaterial_Ambient();";
TCollection_AsciiString aGetMatDiffuse = "theIsFront ? occFrontMaterial_Diffuse() : occBackMaterial_Diffuse();";
if (theHasVertColor)
{
aGetMatAmbient = "getVertColor();";
aGetMatDiffuse = "getVertColor();";
}
return TCollection_AsciiString() return TCollection_AsciiString()
+ THE_FUNC_lightDef + THE_FUNC_lightDef
+ aLightsFunc + aLightsFunc
@ -1171,9 +1179,9 @@ TCollection_AsciiString OpenGl_ShaderManager::stdComputeLighting()
EOL" Specular = vec3 (0.0);" EOL" Specular = vec3 (0.0);"
EOL" vec3 aPoint = thePoint.xyz / thePoint.w;" EOL" vec3 aPoint = thePoint.xyz / thePoint.w;"
+ aLightsLoop + aLightsLoop
+ EOL" vec4 aMaterialAmbient = theIsFront ? occFrontMaterial_Ambient() : occBackMaterial_Ambient();" + EOL" vec4 aMaterialAmbient = " + aGetMatAmbient
EOL" vec4 aMaterialDiffuse = theIsFront ? occFrontMaterial_Diffuse() : occBackMaterial_Diffuse();" + EOL" vec4 aMaterialDiffuse = " + aGetMatDiffuse
EOL" vec4 aMaterialSpecular = theIsFront ? occFrontMaterial_Specular() : occBackMaterial_Specular();" + EOL" vec4 aMaterialSpecular = theIsFront ? occFrontMaterial_Specular() : occBackMaterial_Specular();"
EOL" vec4 aMaterialEmission = theIsFront ? occFrontMaterial_Emission() : occBackMaterial_Emission();" EOL" vec4 aMaterialEmission = theIsFront ? occFrontMaterial_Emission() : occBackMaterial_Emission();"
EOL" return vec4 (Ambient, 1.0) * aMaterialAmbient" EOL" return vec4 (Ambient, 1.0) * aMaterialAmbient"
EOL" + vec4 (Diffuse, 1.0) * aMaterialDiffuse" EOL" + vec4 (Diffuse, 1.0) * aMaterialDiffuse"
@ -1190,13 +1198,17 @@ Standard_Boolean OpenGl_ShaderManager::prepareStdProgramGouraud (Handle(OpenGl_S
const Standard_Integer theBits) const Standard_Integer theBits)
{ {
Handle(Graphic3d_ShaderProgram) aProgramSrc = new Graphic3d_ShaderProgram(); Handle(Graphic3d_ShaderProgram) aProgramSrc = new Graphic3d_ShaderProgram();
TCollection_AsciiString aSrcVert, aSrcVertExtraOut, aSrcVertExtraMain, aSrcFrag, aSrcFragExtraOut, aSrcFragExtraMain; TCollection_AsciiString aSrcVert, aSrcVertColor, aSrcVertExtraOut, aSrcVertExtraMain, aSrcFrag, aSrcFragExtraOut, aSrcFragExtraMain;
if ((theBits & OpenGl_PO_Point) != 0) if ((theBits & OpenGl_PO_Point) != 0)
{ {
#if defined(GL_ES_VERSION_2_0) #if defined(GL_ES_VERSION_2_0)
aSrcVertExtraMain += EOL" gl_PointSize = occPointSize;"; aSrcVertExtraMain += EOL" gl_PointSize = occPointSize;";
#endif #endif
} }
if ((theBits & OpenGl_PO_VertColor) != 0)
{
aSrcVertColor = EOL"vec4 getVertColor(void) { return occVertColor; }";
}
if ((theBits & OpenGl_PO_ClipPlanes) != 0) if ((theBits & OpenGl_PO_ClipPlanes) != 0)
{ {
const char THE_POS_VARY[] = const char THE_POS_VARY[] =
@ -1211,10 +1223,11 @@ Standard_Boolean OpenGl_ShaderManager::prepareStdProgramGouraud (Handle(OpenGl_S
aSrcFragExtraMain += THE_FRAG_CLIP_PLANES; aSrcFragExtraMain += THE_FRAG_CLIP_PLANES;
} }
const TCollection_AsciiString aLights = stdComputeLighting(); const TCollection_AsciiString aLights = stdComputeLighting ((theBits & OpenGl_PO_VertColor) != 0);
aSrcVert = TCollection_AsciiString() aSrcVert = TCollection_AsciiString()
+ THE_FUNC_transformNormal + THE_FUNC_transformNormal
+ EOL + EOL
+ aSrcVertColor
+ aLights + aLights
+ EOL + EOL
EOL"varying vec4 FrontColor;" EOL"varying vec4 FrontColor;"
@ -1262,13 +1275,20 @@ Standard_Boolean OpenGl_ShaderManager::prepareStdProgramPhong (Handle(OpenGl_Sha
const Standard_Integer theBits) const Standard_Integer theBits)
{ {
Handle(Graphic3d_ShaderProgram) aProgramSrc = new Graphic3d_ShaderProgram(); Handle(Graphic3d_ShaderProgram) aProgramSrc = new Graphic3d_ShaderProgram();
TCollection_AsciiString aSrcVert, aSrcVertExtraOut, aSrcVertExtraMain, aSrcFrag, aSrcFragExtraMain; TCollection_AsciiString aSrcVert, aSrcVertExtraOut, aSrcVertExtraMain, aSrcFrag, aSrcFragGetColor, aSrcFragExtraMain;
if ((theBits & OpenGl_PO_Point) != 0) if ((theBits & OpenGl_PO_Point) != 0)
{ {
#if defined(GL_ES_VERSION_2_0) #if defined(GL_ES_VERSION_2_0)
aSrcVertExtraMain += EOL" gl_PointSize = occPointSize;"; aSrcVertExtraMain += EOL" gl_PointSize = occPointSize;";
#endif #endif
} }
if ((theBits & OpenGl_PO_VertColor) != 0)
{
aSrcVertExtraOut += EOL"varying vec4 VertColor;";
aSrcVertExtraMain += EOL" VertColor = occVertColor;";
aSrcFragGetColor = EOL"varying vec4 VertColor;"
EOL"vec4 getVertColor(void) { return VertColor; }";
}
if ((theBits & OpenGl_PO_ClipPlanes) != 0) if ((theBits & OpenGl_PO_ClipPlanes) != 0)
{ {
aSrcFragExtraMain += THE_FRAG_CLIP_PLANES; aSrcFragExtraMain += THE_FRAG_CLIP_PLANES;
@ -1293,13 +1313,14 @@ Standard_Boolean OpenGl_ShaderManager::prepareStdProgramPhong (Handle(OpenGl_Sha
+ EOL" gl_Position = occProjectionMatrix * occWorldViewMatrix * occModelWorldMatrix * occVertex;" + EOL" gl_Position = occProjectionMatrix * occWorldViewMatrix * occModelWorldMatrix * occVertex;"
EOL"}"; EOL"}";
const TCollection_AsciiString aLights = stdComputeLighting(); const TCollection_AsciiString aLights = stdComputeLighting ((theBits & OpenGl_PO_VertColor) != 0);
aSrcFrag = TCollection_AsciiString() aSrcFrag = TCollection_AsciiString()
+ EOL"varying vec4 PositionWorld;" + EOL"varying vec4 PositionWorld;"
EOL"varying vec4 Position;" EOL"varying vec4 Position;"
EOL"varying vec3 Normal;" EOL"varying vec3 Normal;"
EOL"varying vec3 View;" EOL"varying vec3 View;"
+ EOL + EOL
+ aSrcFragGetColor
+ aLights + aLights
+ EOL + EOL
EOL"void main()" EOL"void main()"

3
src/OpenGl/OpenGl_ShaderManager.hxx
View File

@ -314,7 +314,8 @@ protected:
const Standard_Integer theBits); const Standard_Integer theBits);
//! Define computeLighting GLSL function depending on current lights configuration //! Define computeLighting GLSL function depending on current lights configuration
Standard_EXPORT TCollection_AsciiString stdComputeLighting(); //! @param theHasVertColor flag to use getVertColor() instead of Ambient and Diffuse components of active material
Standard_EXPORT TCollection_AsciiString stdComputeLighting (const Standard_Boolean theHasVertColor);
//! Bind specified program to current context and apply state. //! Bind specified program to current context and apply state.
Standard_EXPORT Standard_Boolean bindProgramWithState (const Handle(OpenGl_ShaderProgram)& theProgram, Standard_EXPORT Standard_Boolean bindProgramWithState (const Handle(OpenGl_ShaderProgram)& theProgram,