OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-29 14:00:49 +03:00
Code Activity

0024322: TKOpenGl - light sources management inconsistency

Browse Source 
Fixed pipeline - accumulate all ambient light sources.

Fix clearing of all light sources.
This commit is contained in:
duv
2013-11-13 21:07:32 +04:00
committed by bugmaster
parent 79d580f2ea
commit 4fe9ad57df
9 changed files with 322 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/OpenGl/OpenGl_View_2.cxx
View File

@@ -74,7 +74,8 @@ struct OPENGL_CLIP_PLANE
* Set des lumieres
*/
static void bind_light (const OpenGl_Light& theLight,
GLenum& theLightGlId)
GLenum& theLightGlId,
Graphic3d_Vec4& theAmbientColor)
{
// Only 8 lights in OpenGL...
if (theLightGlId > GL_LIGHT7)
@@ -84,8 +85,8 @@ static void bind_light (const OpenGl_Light& theLight,
if (theLight.Type == Visual3d_TOLS_AMBIENT)
{
// setup RGBA intensity of the ambient light
glLightModelfv (GL_LIGHT_MODEL_AMBIENT, theLight.Color.GetData());
// add RGBA intensity of the ambient light
theAmbientColor += theLight.Color;
return;
}
@@ -933,13 +934,21 @@ D = -[Px,Py,Pz] dot |Nx|
// Apply Lights
{
// setup lights
glLightModelfv (GL_LIGHT_MODEL_AMBIENT, THE_DEFAULT_AMBIENT);
Graphic3d_Vec4 anAmbientColor (THE_DEFAULT_AMBIENT[0],
THE_DEFAULT_AMBIENT[1],
THE_DEFAULT_AMBIENT[2],
THE_DEFAULT_AMBIENT[3]);
GLenum aLightGlId = GL_LIGHT0;
for (OpenGl_ListOfLight::Iterator aLightIt (myLights);
aLightIt.More(); aLightIt.Next())
{
bind_light (aLightIt.Value(), aLightGlId);
bind_light (aLightIt.Value(), aLightGlId, anAmbientColor);
}
// apply accumulated ambient color
anAmbientColor.a() = 1.0f;
glLightModelfv (GL_LIGHT_MODEL_AMBIENT, anAmbientColor.GetData());
if (aLightGlId != GL_LIGHT0)
{
glEnable (GL_LIGHTING);