OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0028758: Visualization - Implement exporting generated image to HRD/EXR images

Browse Source 
OpenGl_View::BufferDump() - added support for dumping RayTracing HDR buffers.
Added new buffer type Graphic3d_BT_RGB_RayTraceHdrLeft.
This commit is contained in:
age 2017-05-16 13:37:50 +03:00 committed by bugmaster
parent 9e6cdbcad5
commit 38d90bb3d1
6 changed files with 65 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Graphic3d/Graphic3d_BufferType.hxx
View File

@ -19,7 +19,8 @@ typedef enum
{
Graphic3d_BT_RGB, //!< color buffer without alpha component
Graphic3d_BT_RGBA, //!< color buffer
Graphic3d_BT_Depth //!< depth buffer
Graphic3d_BT_Depth, //!< depth buffer
Graphic3d_BT_RGB_RayTraceHdrLeft //!< left view HDR color buffer for Ray-Tracing
} Graphic3d_BufferType;
#endif // _Graphic3d_BufferType_H__

1
src/Image/Image_AlienPixMap.cxx
View File

@ -461,6 +461,7 @@ bool Image_AlienPixMap::Save (const TCollection_AsciiString& theFileName)
}
break;
}
case FIF_HDR:
case FIF_EXR:
{
if (Format() == Image_Format_Gray

53
src/OpenGl/OpenGl_View.cxx
View File

@ -353,7 +353,58 @@ void OpenGl_View::GraduatedTrihedronMinMaxValues (const Graphic3d_Vec3 theMin, c
// =======================================================================
Standard_Boolean OpenGl_View::BufferDump (Image_PixMap& theImage, const Graphic3d_BufferType& theBufferType)
{
return myWorkspace->BufferDump (myFBO, theImage, theBufferType);
if (theBufferType != Graphic3d_BT_RGB_RayTraceHdrLeft)
{
return myWorkspace->BufferDump(myFBO, theImage, theBufferType);
}
if (!myRaytraceParameters.AdaptiveScreenSampling)
{
return myWorkspace->BufferDump(myAccumFrames % 2 ? myRaytraceFBO2[0] : myRaytraceFBO1[0], theImage, theBufferType);
}
#if defined(GL_ES_VERSION_2_0)
return false;
#else
if (theImage.Format() != Image_Format_RGBF)
{
return false;
}
const GLuint aW = myRaytraceOutputTexture[0]->SizeX();
const GLuint aH = myRaytraceOutputTexture[0]->SizeY();
if (aW / 3 != theImage.SizeX() || aH / 2 != theImage.SizeY())
{
return false;
}
std::vector<GLfloat> aValues;
try
{
aValues.resize (aW * aH);
}
catch (const std::bad_alloc&)
{
return false;
}
glBindTexture (GL_TEXTURE_RECTANGLE, myRaytraceOutputTexture[0]->TextureId());
glGetTexImage (GL_TEXTURE_RECTANGLE, 0, OpenGl_TextureFormat::Create<GLfloat, 1>().Format(), GL_FLOAT, &aValues[0]);
glBindTexture (GL_TEXTURE_RECTANGLE, 0);
for (unsigned int aRow = 0; aRow < aH; aRow += 2)
{
for (unsigned int aCol = 0; aCol < aW; aCol += 3)
{
float* anImageValue = theImage.ChangeValue<float[3]> ((aH - aRow) / 2 - 1, aCol / 3);
float aInvNbSamples = 1.f / aValues[aRow * aW + aCol + aW];
anImageValue[0] = aValues[aRow * aW + aCol] * aInvNbSamples;
anImageValue[1] = aValues[aRow * aW + aCol + 1] * aInvNbSamples;
anImageValue[2] = aValues[aRow * aW + aCol + 1 + aW] * aInvNbSamples;
}
}
return true;
#endif
}
// =======================================================================

2
src/OpenGl/OpenGl_View.hxx
View File

@ -143,6 +143,8 @@ public:
Standard_EXPORT virtual void GraduatedTrihedronMinMaxValues (const Graphic3d_Vec3 theMin, const Graphic3d_Vec3 theMax) Standard_OVERRIDE;
//! Dump active rendering buffer into specified memory buffer.
//! In Ray-Tracing allow to get a raw HDR buffer using Graphic3d_BT_RGB_RayTraceHdrLeft buffer type,
//! only Left view will be dumped ignoring stereoscopic parameter.
Standard_EXPORT virtual Standard_Boolean BufferDump (Image_PixMap& theImage,
const Graphic3d_BufferType& theBufferType) Standard_OVERRIDE;

7
src/V3d/V3d_View.cxx
View File

@ -2831,9 +2831,10 @@ Standard_Boolean V3d_View::ToPixMap (Image_PixMap& theImage,
Image_Format aFormat = Image_Format_UNKNOWN;
switch (theParams.BufferType)
{
case Graphic3d_BT_RGB: aFormat = Image_Format_RGB; break;
case Graphic3d_BT_RGBA: aFormat = Image_Format_RGBA; break;
case Graphic3d_BT_Depth: aFormat = Image_Format_GrayF; break;
case Graphic3d_BT_RGB: aFormat = Image_Format_RGB; break;
case Graphic3d_BT_RGBA: aFormat = Image_Format_RGBA; break;
case Graphic3d_BT_Depth: aFormat = Image_Format_GrayF; break;
case Graphic3d_BT_RGB_RayTraceHdrLeft: aFormat = Image_Format_RGBF; break;
}
if (!theImage.InitZero (aFormat, Standard_Size(aTargetSize.x()), Standard_Size(aTargetSize.y())))

7
src/ViewerTest/ViewerTest.cxx
View File

@ -1076,9 +1076,10 @@ static Standard_Integer VDump (Draw_Interpretor& theDI,
Image_Format aFormat = Image_Format_UNKNOWN;
switch (aParams.BufferType)
{
case Graphic3d_BT_RGB: aFormat = Image_Format_RGB; break;
case Graphic3d_BT_RGBA: aFormat = Image_Format_RGBA; break;
case Graphic3d_BT_Depth: aFormat = Image_Format_GrayF; break;
case Graphic3d_BT_RGB: aFormat = Image_Format_RGB; break;
case Graphic3d_BT_RGBA: aFormat = Image_Format_RGBA; break;
case Graphic3d_BT_Depth: aFormat = Image_Format_GrayF; break;
case Graphic3d_BT_RGB_RayTraceHdrLeft: aFormat = Image_Format_RGBF; break;
}
switch (aStereoPair)