Commit e9796f50 authored by schultezub's avatar schultezub
Browse files

fixed bug #8

git-svn-id: https://camplinux.in.tum.de/svn/campvis/trunk@434 bb408c1c-ae56-11e1-83d9-df6b3e0c105e
parent 0a24f3c1
...@@ -146,7 +146,6 @@ int Texture::calcBpp(GLint internalformat) { ...@@ -146,7 +146,6 @@ int Texture::calcBpp(GLint internalformat) {
case GL_RED: case GL_RED:
case GL_GREEN: case GL_GREEN:
case GL_BLUE: case GL_BLUE:
case GL_ALPHA:
case GL_ALPHA8: case GL_ALPHA8:
case GL_INTENSITY: case GL_INTENSITY:
case GL_LUMINANCE: case GL_LUMINANCE:
...@@ -157,16 +156,20 @@ int Texture::calcBpp(GLint internalformat) { ...@@ -157,16 +156,20 @@ int Texture::calcBpp(GLint internalformat) {
case 2: case 2:
case GL_LUMINANCE_ALPHA: case GL_LUMINANCE_ALPHA:
case GL_INTENSITY16: case GL_INTENSITY16:
case GL_ALPHA16:
case GL_DEPTH_COMPONENT16: case GL_DEPTH_COMPONENT16:
bpp = 2; bpp = 2;
break; break;
case GL_RGB: case GL_RGB:
case GL_RGB8:
case GL_BGR: case GL_BGR:
case GL_DEPTH_COMPONENT24: case GL_DEPTH_COMPONENT24:
bpp = 3; bpp = 3;
break; break;
case GL_ALPHA:
case GL_ALPHA32F_ARB:
case GL_RGBA: case GL_RGBA:
case GL_RGBA8: case GL_RGBA8:
case GL_BGRA: case GL_BGRA:
......
...@@ -106,7 +106,7 @@ namespace campvis { ...@@ -106,7 +106,7 @@ namespace campvis {
// clip proxy geometry against near-plane to support camera in volume // clip proxy geometry against near-plane to support camera in volume
// FIXME: In some cases, the near plane is not rendered correctly... // FIXME: In some cases, the near plane is not rendered correctly...
float nearPlaneDistToOrigin = tgt::dot(p_camera.getValue().getPosition(), -p_camera.getValue().getLook()) - p_camera.getValue().getNearDist() - .001f; float nearPlaneDistToOrigin = tgt::dot(p_camera.getValue().getPosition(), -p_camera.getValue().getLook()) - p_camera.getValue().getNearDist() - .002f;
MeshGeometry clipped = proxyGeometry->clipAgainstPlane(nearPlaneDistToOrigin, -p_camera.getValue().getLook(), true, 0.02f); MeshGeometry clipped = proxyGeometry->clipAgainstPlane(nearPlaneDistToOrigin, -p_camera.getValue().getLook(), true, 0.02f);
// start render setup // start render setup
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment