Notice to GitKraken users: A vulnerability has been found in the SSH key generation of GitKraken versions 7.6.0 to 8.0.0 (https://www.gitkraken.com/blog/weak-ssh-key-fix). If you use GitKraken and have generated a SSH key using one of these versions, please remove it both from your local workstation and from your LRZ GitLab profile.

21.10.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 04b29022 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Fixed TrackballCameraProvider::onRenderTargetSizeChanged()

Fixed Cppcheck issue in mprrenderer.cpp
Updated visual regression testing reference images (checked)

refs #141
parent 7cc6cb13
......@@ -558,6 +558,7 @@ void Trackball::timerEvent(TimeEvent* e) {
void Trackball::setWindowRatio(float r) {
getCamera()->setWindowRatio(r);
getCamera()->setRatio(r);
hcam_->update();
}
......
......@@ -158,9 +158,9 @@ namespace campvis {
}
void TrackballCameraProvider::onRenderTargetSizeChanged(const AbstractProperty* prop) {
_trackball->setViewprtSize(_canvasSize->getValue());
float ratio = static_cast<float>(_canvasSize->getValue().x) / static_cast<float>(_canvasSize->getValue().y);
p_aspectRatio.setValue(ratio);
_trackball->setViewprtSize(_canvasSize->getValue());
_trackball->setWindowRatio(ratio);
invalidate(INVALID_RESULT);
}
......
......@@ -94,7 +94,7 @@ namespace campvis {
// Construct the clipping plane in world coordinates
cgt::vec3 n = cgt::normalize(p_planeNormal.getValue());
cgt::vec3 temp(1.0, 0.0, 0.0);
if (abs(cgt::dot(temp, n) > 0.9))
if (abs(cgt::dot(temp, n)) > 0.9)
temp = cgt::vec3(0.0, 1.0, 0.0);
cgt::vec3 inPlaneA = cgt::normalize(cgt::cross(n, temp)) * 0.5f * p_planeSize.getValue();
......
......@@ -102,7 +102,8 @@ protected:
void execute() {
if (_pipeline != nullptr) {
_pipeline->executePipeline();
for (size_t i = 0; i < _pipeline->getProcessors().size(); ++i)
_pipeline->executePipeline();
// write result image
_imageWriter.p_inputImage.setValue(_pipeline->getRenderTargetID());
......
test/visregtests/reference/1/dvrvis.png

1.13 MB | W: | H:

test/visregtests/reference/1/dvrvis.png

1.13 MB | W: | H:

test/visregtests/reference/1/dvrvis.png
test/visregtests/reference/1/dvrvis.png
test/visregtests/reference/1/dvrvis.png
test/visregtests/reference/1/dvrvis.png
  • 2-up
  • Swipe
  • Onion skin
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