Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed ptrs #42

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −27
Open

fixed ptrs #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Core/Shaders/FeedbackBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
#include "../Utils/Resolution.h"
#include "../Utils/Intrinsics.h"
#include <pangolin/gl/gl.h>
#include <pangolin/display/opengl_render_state.h>
//#include <pangolin/display/opengl_render_state.h>
#include <pangolin/gl/opengl_render_state.h>

/// A feedback buffer holds one vertex per pixel (see uvo)
class FeedbackBuffer {
Expand Down
26 changes: 13 additions & 13 deletions GUI/MainController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,19 +286,19 @@ MainController::MainController(int argc, char* argv[])
throw std::invalid_argument("Unable to parse input toml configuration file.");
}

if (Parse::get().arg(argc, argv, "-d", tmpFloat) > -1) gui->depthCutoff->Ref().Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-i", tmpFloat) > -1) gui->icpWeight->Ref().Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-or", tmpFloat) > -1) gui->outlierCoefficient->Ref().Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-segMinNew", tmpFloat) > -1) gui->minRelSizeNew->Ref().Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-segMaxNew", tmpFloat) > -1) gui->maxRelSizeNew->Ref().Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-crfRGB", tmpFloat) > -1) gui->pairwiseRGBSTD->Ref().Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-crfDepth", tmpFloat) > -1) gui->pairwiseDepthSTD->Ref().Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-crfPos", tmpFloat) > -1) gui->pairwisePosSTD->Ref().Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-crfAppearance", tmpFloat) > -1) gui->pairwiseAppearanceWeight->Ref().Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-crfSmooth", tmpFloat) > -1) gui->pairwiseSmoothnessWeight->Ref().Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-offset", tmpFloat) > -1) gui->modelSpawnOffset->Ref().Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-thNew", tmpFloat) > -1) gui->thresholdNew->Ref().Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-k", tmpFloat) > -1) gui->unaryErrorK->Ref().Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-d", tmpFloat) > -1) gui->depthCutoff->Ref()->Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-i", tmpFloat) > -1) gui->icpWeight->Ref()->Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-or", tmpFloat) > -1) gui->outlierCoefficient->Ref()->Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-segMinNew", tmpFloat) > -1) gui->minRelSizeNew->Ref()->Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-segMaxNew", tmpFloat) > -1) gui->maxRelSizeNew->Ref()->Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-crfRGB", tmpFloat) > -1) gui->pairwiseRGBSTD->Ref()->Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-crfDepth", tmpFloat) > -1) gui->pairwiseDepthSTD->Ref()->Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-crfPos", tmpFloat) > -1) gui->pairwisePosSTD->Ref()->Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-crfAppearance", tmpFloat) > -1) gui->pairwiseAppearanceWeight->Ref()->Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-crfSmooth", tmpFloat) > -1) gui->pairwiseSmoothnessWeight->Ref()->Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-offset", tmpFloat) > -1) gui->modelSpawnOffset->Ref()->Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-thNew", tmpFloat) > -1) gui->thresholdNew->Ref()->Set(tmpFloat);
if (Parse::get().arg(argc, argv, "-k", tmpFloat) > -1) gui->unaryErrorK->Ref()->Set(tmpFloat);

gui->flipColors->Ref().Set(logReader->flipColors);
gui->rgbOnly->Ref().Set(false);
Expand Down
26 changes: 13 additions & 13 deletions GUI/Tools/GUI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,19 +230,19 @@ class GUI {
pangolin::RegisterKeyPressCallback(' ', pangolin::SetVarFunctor<bool>("ui.Reset", true));
}

pangolin::RegisterKeyPressCallback('p', [&]() { pause->Ref().Set(!pause->Get()); });
pangolin::RegisterKeyPressCallback('c', [&]() { drawColors->Ref().Set(!drawColors->Get()); });
pangolin::RegisterKeyPressCallback('l', [&]() { drawLabelColors->Ref().Set(!drawLabelColors->Get()); });
pangolin::RegisterKeyPressCallback('n', [&]() { drawNormals->Ref().Set(!drawNormals->Get()); });
pangolin::RegisterKeyPressCallback('m', [&]() { enableMultiModel->Ref().Set(!enableMultiModel->Get()); });
pangolin::RegisterKeyPressCallback('x', [&]() { drawFxaa->Ref().Set(!drawFxaa->Get()); });
pangolin::RegisterKeyPressCallback('f', [&]() { followPose->Ref().Set(!followPose->Get()); });
pangolin::RegisterKeyPressCallback('q', [&]() { savePoses->Ref().Set(true); });
pangolin::RegisterKeyPressCallback('w', [&]() { saveCloud->Ref().Set(true); });
pangolin::RegisterKeyPressCallback('e', [&]() { saveView->Ref().Set(true); });
pangolin::RegisterKeyPressCallback('g', [&]() { drawGlobalModel->Ref().Set(!drawGlobalModel->Get()); });
pangolin::RegisterKeyPressCallback('o', [&]() { drawObjectModels->Ref().Set(!drawObjectModels->Get()); });
pangolin::RegisterKeyPressCallback('b', [&]() { drawBoundingBoxes->Ref().Set(!drawBoundingBoxes->Get()); });
pangolin::RegisterKeyPressCallback('p', [&]() { pause->Ref()->Set(!pause->Get()); });
pangolin::RegisterKeyPressCallback('c', [&]() { drawColors->Ref()->Set(!drawColors->Get()); });
pangolin::RegisterKeyPressCallback('l', [&]() { drawLabelColors->Ref()->Set(!drawLabelColors->Get()); });
pangolin::RegisterKeyPressCallback('n', [&]() { drawNormals->Ref()->Set(!drawNormals->Get()); });
pangolin::RegisterKeyPressCallback('m', [&]() { enableMultiModel->Ref()->Set(!enableMultiModel->Get()); });
pangolin::RegisterKeyPressCallback('x', [&]() { drawFxaa->Ref()->Set(!drawFxaa->Get()); });
pangolin::RegisterKeyPressCallback('f', [&]() { followPose->Ref()->Set(!followPose->Get()); });
pangolin::RegisterKeyPressCallback('q', [&]() { savePoses->Ref()->Set(true); });
pangolin::RegisterKeyPressCallback('w', [&]() { saveCloud->Ref()->Set(true); });
pangolin::RegisterKeyPressCallback('e', [&]() { saveView->Ref()->Set(true); });
pangolin::RegisterKeyPressCallback('g', [&]() { drawGlobalModel->Ref()->Set(!drawGlobalModel->Get()); });
pangolin::RegisterKeyPressCallback('o', [&]() { drawObjectModels->Ref()->Set(!drawObjectModels->Get()); });
pangolin::RegisterKeyPressCallback('b', [&]() { drawBoundingBoxes->Ref()->Set(!drawBoundingBoxes->Get()); });
#ifdef WITH_FREETYPE_GL_CPP
textRenderer.init();
#endif
Expand Down