mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0026122: Visualization, TKOpenGl - clipping and capping is broken when ffp is disabled on Linux
OpenGl_Clipping - do not setup clipping planes using FFP when it is disabled. OpenGl_ShaderManager - apply 2d texture coordinates transformation in GLSL programs. OpenGl_Context::SetTextureMatrix() - move texture matrix assignment from OpenGl_Workspace::setTextureParams() to OpenGl_Context. Add test case demo/samples/dimensionsglsl with FFP turned OFF. Add test case v3d/glsl/texture_trsf applying texture transformation. Small correction of test case for issue CR26122
This commit is contained in:
@@ -107,6 +107,7 @@ uniform vec4 occColor; //!< color value (in case
|
||||
uniform THE_PREC_ENUM int occDistinguishingMode; //!< Are front and back faces distinguished?
|
||||
uniform THE_PREC_ENUM int occTextureEnable; //!< Is texture enabled?
|
||||
uniform sampler2D occActiveSampler; //!< Current active sampler
|
||||
uniform vec4 occTexTrsf2d[2]; //!< 2D texture transformation parameters
|
||||
uniform float occPointSize; //!< point size
|
||||
|
||||
// clipping planes state
|
||||
|
@@ -50,3 +50,9 @@ vec4 occBackMaterial_Specular(void) { return occBackMaterial[2]; }
|
||||
vec4 occBackMaterial_Emission(void) { return occBackMaterial[3]; }
|
||||
float occBackMaterial_Shininess(void) { return occBackMaterial[4].x; }
|
||||
float occBackMaterial_Transparency(void) { return occBackMaterial[4].y; }
|
||||
|
||||
// 2D texture coordinates transformation
|
||||
vec2 occTextureTrsf_Translation(void) { return occTexTrsf2d[0].xy; }
|
||||
vec2 occTextureTrsf_Scale(void) { return occTexTrsf2d[0].zw; }
|
||||
float occTextureTrsf_RotationSin(void) { return occTexTrsf2d[1].x; }
|
||||
float occTextureTrsf_RotationCos(void) { return occTexTrsf2d[1].y; }
|
||||
|
Reference in New Issue
Block a user