1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00

0025282: Visualization, OpenGl_PrimitiveArray - provide built-in GLSL programs as alternative to FFP

Enumerations Visual3d_TypeOfModel, V3d_TypeOfShadingModel.
- Remove unused values V3d_MULTICOLOR, V3d_HIDDEN, Visual3d_TOM_INTERP_COLOR.
- Add per-pixel shading mode - V3d_PHONG, Visual3d_TOM_FRAGMENT.

Draw Harness command vrenderparams.
Add option -shadingModel to setup Shading Model.

OpenGl_Caps::ffpEnable - new option to switch FFP/built-in GLSL programs.
OpenGl_ShaderManager - add built-in GLSL programs.

Draw Harness command vcaps.
- Fix command syntax to meet coding rules.
- Add option -ffp to activate/disable built-in GLSL programs.

GLSL API changes.
- Rename vertex attribute occColor -> occVertColor.
- Introduce vec4 occColor uniform variable for light-less shaders.
- Introduce float occPointSize uniform variable for marker programs.

OpenGl_VertexBuffer::bindAttribute() - activate normalization for non-GL_FLOAT types,
since color attribute is defined as 32-bit vector of 4 unsigned byte values.

OpenGl_Context - add methods SetColor4fv() and SetPointSize()
for parameters redirection to active GLSL program
(as alternative to glColor4fv() and glPointSize()).

OpenGl_ShaderProgram - define default precision for float types
in Fragment Shader within OpenGL ES 2.0+ context.

OpenGl_AspectMarker, initialize Aspect_TOM_O_POINT display list
in the same way as sprite texture.

OpenGl_Texture, do not use sized internal formats on OpenGL ES.
This commit is contained in:
kgv
2014-10-02 13:46:27 +04:00
committed by bugmaster
parent 25b97fac40
commit 8625ef7e94
40 changed files with 1261 additions and 445 deletions

View File

@@ -126,21 +126,15 @@ is
-- TOLS_SPOT spot light
enumeration TypeOfModel is TOM_NONE,
TOM_INTERP_COLOR,
TOM_FACET,
TOM_VERTEX
TOM_VERTEX,
TOM_FRAGMENT
end TypeOfModel;
---Purpose: Definition of the rendering (colour shading) model
-- TOM_NONE No interpolation, constant shading
-- (FLAT Shading)
-- TOM_INTERP_COLOR Linear interpolation of color
-- (Gouraud Shading)
-- TOM_FACET Interpolation of color based on
-- dot products
-- (Quick Phong Shading)
-- TOM_VERTEX Interpolation of color based on
-- normals
-- (Phong Shading)
-- Visual3d_TOM_NONE No lighting, only white ambient light
-- Visual3d_TOM_FACET No interpolation, constant shading (Flat Shading)
-- Visual3d_TOM_VERTEX Interpolation of color based on normals (Gouraud Shading)
-- Visual3d_TOM_FRAGMENT Interpolation of color based on normals (Phong Shading)
---Category: The enumerations
enumeration TypeOfOrder is TOO_TOPFIRST,

View File

@@ -180,14 +180,7 @@ is
AModel : TypeOfModel from Visual3d )
is static;
---Level: Public
---Purpose: Modifies the shading model when the type of
-- visualization is TOV_SHADING
--
-- TypeOfModel : TOM_NONE
-- TOM_INTERP_COLOR
-- TOM_FACET
-- TOM_VERTEX
--
---Purpose: Modifies the shading model when the type of visualization is TOV_SHADING
---Category: Methods to modify the class definition
SetVisualization ( me : in out;