diff --git a/include/polyscope/context.h b/include/polyscope/context.h index c7077f93..051cbf0a 100644 --- a/include/polyscope/context.h +++ b/include/polyscope/context.h @@ -5,9 +5,10 @@ #include #include + #include -#include "glm/gtx/dual_quaternion.hpp" -#include "glm/gtx/norm.hpp" // necessary for dual_quaternion below +#include +#include #include #include diff --git a/include/polyscope/render/engine.h b/include/polyscope/render/engine.h index ac3b19b2..8c66931a 100644 --- a/include/polyscope/render/engine.h +++ b/include/polyscope/render/engine.h @@ -439,7 +439,6 @@ class ShaderProgram { class Engine { public: - Engine(); virtual ~Engine(); @@ -508,8 +507,9 @@ class Engine { virtual void setClipboardText(std::string text) = 0; // === ImGui - - // NOTE: the imgui backend depends on the window manager (e.g. GLFW), so these must be implemented by the lowest-level concrete engine implementation + + // NOTE: the imgui backend depends on the window manager (e.g. GLFW), so these must be implemented by the lowest-level + // concrete engine implementation virtual void initializeImGui() = 0; virtual void shutdownImGui() = 0; virtual void ImGuiNewFrame() = 0; diff --git a/include/polyscope/render/opengl/gl_engine_glfw.h b/include/polyscope/render/opengl/gl_engine_glfw.h index 59cc24bb..88c38f10 100644 --- a/include/polyscope/render/opengl/gl_engine_glfw.h +++ b/include/polyscope/render/opengl/gl_engine_glfw.h @@ -43,7 +43,6 @@ namespace backend_openGL3 { class GLEngineGLFW : public GLEngine { public: - GLEngineGLFW(); virtual ~GLEngineGLFW(); @@ -52,7 +51,7 @@ class GLEngineGLFW : public GLEngine { void swapDisplayBuffers() override; // === Windowing and framework things - + void makeContextCurrent() override; void pollEvents() override; @@ -73,17 +72,15 @@ class GLEngineGLFW : public GLEngine { // === ImGui - + void initializeImGui() override; void shutdownImGui() override; void ImGuiNewFrame() override; void ImGuiRender() override; protected: - // Internal windowing and engine details GLFWwindow* mainWindow = nullptr; - }; } // namespace backend_openGL3 diff --git a/include/polyscope/view.h b/include/polyscope/view.h index 70e2f68b..aae69d95 100644 --- a/include/polyscope/view.h +++ b/include/polyscope/view.h @@ -16,11 +16,11 @@ #include "glm/gtc/constants.hpp" #include "glm/gtc/matrix_transform.hpp" #include "glm/gtc/type_ptr.hpp" +#include "glm/gtx/dual_quaternion.hpp" +#include "glm/gtx/norm.hpp" // necessary for dual_quaternion below #include "glm/mat4x4.hpp" #include "glm/vec3.hpp" #include "glm/vec4.hpp" -#include "glm/gtx/dual_quaternion.hpp" -#include "glm/gtx/norm.hpp" // necessary for dual_quaternion below namespace polyscope { namespace view { diff --git a/test/src/camera_view_test.cpp b/test/src/camera_view_test.cpp index a1dee683..9cb9893a 100644 --- a/test/src/camera_view_test.cpp +++ b/test/src/camera_view_test.cpp @@ -73,7 +73,8 @@ TEST_F(PolyscopeTest, CameraViewPick) { polyscope::CameraExtrinsics::fromVectors( glm::vec3{2., 2., 2.}, glm::vec3{-1., -1., -1.}, glm::vec3{0., 1., 0.}))); - // This probably doesn't actually click on anything, but it does populate the pick buffers and makes sure that nothing crashes + // This probably doesn't actually click on anything, but it does populate the pick buffers and makes sure that nothing + // crashes polyscope::pick::pickAtScreenCoords(glm::vec2{0.3, 0.8}); polyscope::show(3);