OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-18 14:27:39 +03:00
Code Activity

0025544: Visualization, TKOpenGl - support grayscale textures

Browse Source 
Image_PixMap::ImgFormat - extend enumeration by ImgAlpha and ImgAlphaF.
OpenGl_Workspace::setTextureParams() - specify GL_REPLACE for 1-component textures with disabled modulation.
OpenGl_Texture::GetDataFormat() - return GL_LUMINANCE format for ImgGray format and GL_ALPHA for ImgAlpha.

vmarkerstest - override pixel format for grayscale images to ImgAlpha.

Add test case bugs/vis/bug25544_graytexture.
This commit is contained in:
kgv
2014-12-04 15:31:31 +03:00
committed by bugmaster
parent a319f03ff9
commit 076ca35c3f
13 changed files with 186 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/OpenGl/OpenGl_Texture.cxx
View File

@@ -181,14 +181,37 @@ bool OpenGl_Texture::GetDataFormat (const Handle(OpenGl_Context)& theCtx,
{
case Image_PixMap::ImgGrayF:
{
theTextFormat = GL_ALPHA8; // GL_R8, GL_R32F
thePixelFormat = GL_ALPHA; // GL_RED
theDataType = GL_FLOAT;
if (theCtx->core11 == NULL)
{
theTextFormat = GL_R8; // GL_R32F
thePixelFormat = GL_RED;
}
else
{
theTextFormat = GL_LUMINANCE8;
thePixelFormat = GL_LUMINANCE;
}
theDataType = GL_FLOAT;
return true;
}
case Image_PixMap::ImgAlphaF:
{
if (theCtx->core11 == NULL)
{
theTextFormat = GL_R8; // GL_R32F
thePixelFormat = GL_RED;
}
else
{
theTextFormat = GL_ALPHA8;
thePixelFormat = GL_ALPHA;
}
theDataType = GL_FLOAT;
return true;
}
case Image_PixMap::ImgRGBAF:
{
theTextFormat = GL_RGBA8; // GL_RGBA32F
theTextFormat = GL_RGBA8; // GL_RGBA32F
thePixelFormat = GL_RGBA;
theDataType = GL_FLOAT;
return true;
@@ -206,7 +229,7 @@ bool OpenGl_Texture::GetDataFormat (const Handle(OpenGl_Context)& theCtx,
}
case Image_PixMap::ImgRGBF:
{
theTextFormat = GL_RGB8; // GL_RGB32F
theTextFormat = GL_RGB8; // GL_RGB32F
thePixelFormat = GL_RGB;
theDataType = GL_FLOAT;
return true;
@@ -282,16 +305,40 @@ bool OpenGl_Texture::GetDataFormat (const Handle(OpenGl_Context)& theCtx,
}
case Image_PixMap::ImgGray:
{
theTextFormat = GL_ALPHA8; // GL_R8
thePixelFormat = GL_ALPHA; // GL_RED
theDataType = GL_UNSIGNED_BYTE;
if (theCtx->core11 == NULL)
{
theTextFormat = GL_R8;
thePixelFormat = GL_RED;
}
else
{
theTextFormat = GL_LUMINANCE8;
thePixelFormat = GL_LUMINANCE;
}
theDataType = GL_UNSIGNED_BYTE;
return true;
}
default:
case Image_PixMap::ImgAlpha:
{
if (theCtx->core11 == NULL)
{
theTextFormat = GL_R8;
thePixelFormat = GL_RED;
}
else
{
theTextFormat = GL_ALPHA8;
thePixelFormat = GL_ALPHA;
}
theDataType = GL_UNSIGNED_BYTE;
return true;
}
case Image_PixMap::ImgUNKNOWN:
{
return false;
}
}
return false;
}
// =======================================================================