Notice: If you are member of any public project or group, please make sure that your GitLab username is not the same as the LRZ identifier/Kennung (see https://gitlab.lrz.de/profile/account). Please change your username if necessary. For more information see the section "Public projects / Öffentliche Projekte" at https://doku.lrz.de/display/PUBLIC/GitLab . Thank you!

Commit 59d1c4fb authored by Jakob Weiss's avatar Jakob Weiss

Minor changes in core

- Fixed bug with worldToTexture matrix
- default texture clamping is now CLAMP_TO_BORDER
parent 2123a4af
......@@ -50,8 +50,6 @@ ext/tbb
*LUA_wrap.cxx
# CMake build folders and IDE folders
build/
build14/
build15/
build*/
.vs/
.vscode/
buildClang/
......@@ -67,7 +67,7 @@ namespace campvis {
if (! _textureToWorldTransformation.invert(_worldToTextureTransformation))
cgtAssert(false, "Could not invert texture-to-world matrix. That should not happen!");
_textureToWorldTransformationInvTransp = cgt::transpose(_worldToTextureTransformation);
_worldToTextureTransformation = cgt::transpose(_textureToWorldTransformation);
_worldToTextureTransformationInvTransp = cgt::transpose(_textureToWorldTransformation);
_voxelToWorldTransformation = _customTransformation * cgt::mat4::createTranslation(_offset) * cgt::mat4::createScale(_voxelSize);
if (! _voxelToWorldTransformation.invert(_worldToVoxelTransformation))
......
......@@ -100,7 +100,7 @@ namespace campvis {
_texture->bind();
_texture->uploadTexture(reinterpret_cast<GLubyte*>(wtp._pointer), wtp.getGlFormat(), wtp.getGlDataType());
_texture->setWrapping(cgt::Texture::CLAMP_TO_EDGE);
_texture->setWrapping(cgt::Texture::CLAMP_TO_BORDER);
cgt::TextureUnit::setZeroUnit();
LGL_ERROR;
......
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