Skip to content

Commit

Permalink
run formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
nmwsharp committed Mar 28, 2024
1 parent 2a6eda7 commit fe9d2a5
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
5 changes: 3 additions & 2 deletions include/polyscope/context.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
#include <polyscope/types.h>
#include <polyscope/weak_handle.h>


#include <glm/glm.hpp>
#include "glm/gtx/dual_quaternion.hpp"
#include "glm/gtx/norm.hpp" // necessary for dual_quaternion below
#include <glm/gtx/dual_quaternion.hpp>
#include <glm/gtx/norm.hpp>

#include <array>
#include <map>
Expand Down
6 changes: 3 additions & 3 deletions include/polyscope/render/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,6 @@ class ShaderProgram {
class Engine {

public:

Engine();
virtual ~Engine();

Expand Down Expand Up @@ -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;
Expand Down
7 changes: 2 additions & 5 deletions include/polyscope/render/opengl/gl_engine_glfw.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ namespace backend_openGL3 {
class GLEngineGLFW : public GLEngine {

public:

GLEngineGLFW();
virtual ~GLEngineGLFW();

Expand All @@ -52,7 +51,7 @@ class GLEngineGLFW : public GLEngine {
void swapDisplayBuffers() override;

// === Windowing and framework things

void makeContextCurrent() override;
void pollEvents() override;

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions include/polyscope/view.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion test/src/camera_view_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit fe9d2a5

Please sign in to comment.