Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 0 deletions deps/MarchingCubeCpp/include/MarchingCube/MC.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
#include <cmath>

// Added by nsharp: use glm instead of internal vector class
#ifndef GLM_ENABLE_EXPERIMENTAL
#define GLM_ENABLE_EXPERIMENTAL
#endif
#include <glm/glm.hpp>
#include <glm/gtx/norm.hpp>

Expand Down
1 change: 1 addition & 0 deletions deps/stb/stb_impl.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#define STB_IMAGE_STATIC
#define STB_IMAGE_IMPLEMENTATION
#include "stb_image.h"

Expand Down
5 changes: 4 additions & 1 deletion include/polyscope/check_invalid_values.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
#include <polyscope/options.h>

#include <cmath>
#ifndef GLM_ENABLE_EXPERIMENTAL
#define GLM_ENABLE_EXPERIMENTAL
#endif
#include <glm/glm.hpp>
#include <glm/gtx/compatibility.hpp>
#include <type_traits>
Expand All @@ -24,4 +27,4 @@ void checkInvalidValues(std::string name, const std::vector<T>& data) {
}
}

} // namespace polyscope
} // namespace polyscope
3 changes: 3 additions & 0 deletions include/polyscope/context.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
#include <polyscope/types.h>
#include <polyscope/weak_handle.h>

#ifndef GLM_ENABLE_EXPERIMENTAL
#define GLM_ENABLE_EXPERIMENTAL
#endif
#include <glm/glm.hpp>
#include <glm/gtx/dual_quaternion.hpp>
#include <glm/gtx/norm.hpp>
Expand Down
5 changes: 4 additions & 1 deletion include/polyscope/elementary_geometry.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
#include <complex>
#include <tuple>

#ifndef GLM_ENABLE_EXPERIMENTAL
#define GLM_ENABLE_EXPERIMENTAL
#endif
#include <glm/glm.hpp>

namespace polyscope {
Expand All @@ -18,4 +21,4 @@ glm::vec3 projectToPlane(glm::vec3 queryP, glm::vec3 planeNormal, glm::vec3 poin
// Compute the signed area of triangle ABC which lies in the plane give by normal
float signedTriangleArea(glm::vec3 normal, glm::vec3 pA, glm::vec3 pB, glm::vec3 pC);

} // namespace polyscope
} // namespace polyscope
5 changes: 4 additions & 1 deletion include/polyscope/numeric_helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
#pragma once

#include <cmath>
#ifndef GLM_ENABLE_EXPERIMENTAL
#define GLM_ENABLE_EXPERIMENTAL
#endif
#include <glm/glm.hpp>
#include <glm/gtx/compatibility.hpp>
#include <type_traits>
Expand Down Expand Up @@ -124,4 +127,4 @@ inline bool allComponentsFinite<std::array<glm::vec3, 4>>(const std::array<glm::
}


} // namespace polyscope
} // namespace polyscope
3 changes: 3 additions & 0 deletions include/polyscope/utilities.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#include <tuple>


#ifndef GLM_ENABLE_EXPERIMENTAL
#define GLM_ENABLE_EXPERIMENTAL
#endif
#include <glm/glm.hpp>


Expand Down
5 changes: 4 additions & 1 deletion src/elementary_geometry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
#include <cmath>
#include <vector>

#ifndef GLM_ENABLE_EXPERIMENTAL
#define GLM_ENABLE_EXPERIMENTAL
#endif
#include <glm/gtx/norm.hpp>

namespace polyscope {
Expand All @@ -32,4 +35,4 @@ float signedTriangleArea(glm::vec3 normal, glm::vec3 pA, glm::vec3 pB, glm::vec3
return sign * area;
}

} // namespace polyscope
} // namespace polyscope
6 changes: 0 additions & 6 deletions src/render/opengl/gl_engine_glfw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,8 @@ void GLEngineGLFW::configureImGui() {
ImGuiIO& io = ImGui::GetIO();
io.Fonts->Clear();

// these are necessary if different fonts are loaded in the callback
// (don't totally understand why, allegedly it may change in the future)
ImGui_ImplOpenGL3_DestroyFontsTexture();

ImFontAtlas* _unused;
std::tie(_unused, regularFont, monoFont) = options::prepareImGuiFontsCallback();

ImGui_ImplOpenGL3_CreateFontsTexture();
}


Expand Down
3 changes: 3 additions & 0 deletions src/transformation_gizmo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

#include "polyscope/polyscope.h"

#ifndef GLM_ENABLE_EXPERIMENTAL
#define GLM_ENABLE_EXPERIMENTAL
#endif
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtx/transform.hpp>

Expand Down