Modify the depth buffer value in TinyRenderer to be consistent as in OpenGL.

This commit is contained in:
yunfeibai 2017-02-08 11:34:38 -08:00
parent 8034a6f7fc
commit ce69f27f32
4 changed files with 27 additions and 2 deletions

View File

@ -36,6 +36,9 @@ struct CommonCameraInterface
virtual void setAspectRatio(float ratio) = 0; virtual void setAspectRatio(float ratio) = 0;
virtual float getAspectRatio() const = 0; virtual float getAspectRatio() const = 0;
virtual float getCameraFrustumFar() const = 0;
virtual float getCameraFrustumNear() const = 0;
}; };
#endif //COMMON_CAMERA_INTERFACE_H #endif //COMMON_CAMERA_INTERFACE_H

View File

@ -383,3 +383,13 @@ float SimpleCamera::getAspectRatio() const
{ {
return m_data->m_aspect; return m_data->m_aspect;
} }
float SimpleCamera::getCameraFrustumFar() const
{
return m_data->m_frustumZFar;
}
float SimpleCamera::getCameraFrustumNear() const
{
return m_data->m_frustumZNear;
}

View File

@ -47,6 +47,9 @@ struct SimpleCamera : public CommonCameraInterface
virtual void setAspectRatio(float ratio); virtual void setAspectRatio(float ratio);
virtual float getAspectRatio() const; virtual float getAspectRatio() const;
virtual float getCameraFrustumFar() const;
virtual float getCameraFrustumNear() const;
}; };
#endif //SIMPLE_CAMERA_H #endif //SIMPLE_CAMERA_H

View File

@ -958,7 +958,16 @@ void TinyRendererVisualShapeConverter::copyCameraImageData(unsigned char* pixels
{ {
if (depthBuffer) if (depthBuffer)
{ {
depthBuffer[i] = m_data->m_depthBuffer[i+startPixelIndex]; float distance = -m_data->m_depthBuffer[i+startPixelIndex];
float farPlane = m_data->m_camera.getCameraFrustumFar();
float nearPlane = m_data->m_camera.getCameraFrustumNear();
btClamp(distance,nearPlane,farPlane);
// the depth buffer value is between 0 and 1
float a = farPlane / (farPlane - nearPlane);
float b = farPlane * nearPlane / (nearPlane - farPlane);
depthBuffer[i] = a + b / distance;
} }
if (segmentationMaskBuffer) if (segmentationMaskBuffer)
{ {