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

0024350: TKOpenGl - non-physical materials are ignored by GLSL program manager

GLSL and Ray Tracing - take into account non-physical materials.
Move Ray Tracing test cases to v3d/raytrace grid.
This commit is contained in:
kgv
2013-11-13 21:44:24 +04:00
committed by bugmaster
parent f85399e5df
commit 64c759f898
11 changed files with 123 additions and 45 deletions

View File

@@ -4122,11 +4122,11 @@ static int VReadPixel (Draw_Interpretor& theDI,
{
if (aBufferType == Graphic3d_BT_RGBA)
{
theDI << Quantity_Color::StringName (aColor.Name()) << " " << anAlpha << "\n";
theDI << Quantity_Color::StringName (aColor.Name()) << " " << anAlpha;
}
else
{
theDI << Quantity_Color::StringName (aColor.Name()) << "\n";
theDI << Quantity_Color::StringName (aColor.Name());
}
}
else
@@ -4138,22 +4138,22 @@ static int VReadPixel (Draw_Interpretor& theDI,
{
if (toShowHls)
{
theDI << aColor.Hue() << " " << aColor.Light() << " " << aColor.Saturation() << "\n";
theDI << aColor.Hue() << " " << aColor.Light() << " " << aColor.Saturation();
}
else
{
theDI << aColor.Red() << " " << aColor.Green() << " " << aColor.Blue() << "\n";
theDI << aColor.Red() << " " << aColor.Green() << " " << aColor.Blue();
}
break;
}
case Graphic3d_BT_RGBA:
{
theDI << aColor.Red() << " " << aColor.Green() << " " << aColor.Blue() << " " << anAlpha << "\n";
theDI << aColor.Red() << " " << aColor.Green() << " " << aColor.Blue() << " " << anAlpha;
break;
}
case Graphic3d_BT_Depth:
{
theDI << aColor.Red() << "\n";
theDI << aColor.Red();
break;
}
}