diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index eaa8b07..dd15872 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -24,11 +24,10 @@ Window::Window(unsigned int w, unsigned int h) { } void framebuffer_size_callback(GLFWwindow* window, int w, int h) { - // This function is called by glfw when the window is reized. + // This function is called by glfw when the window is resized. glViewport(0 , 0, w, h); Window* newWin = reinterpret_cast(glfwGetWindowUserPointer(window)); newWin->resize(w, h); - } int Window::init(float* data) { @@ -48,6 +47,7 @@ int Window::init(float* data) { } glfwMakeContextCurrent(this->window); + glfwSetWindowUserPointer(this->window, reinterpret_cast(this)); // init glad(opengl) if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress)) { diff --git a/src/main.cu b/src/main.cu index 39e5c49..6127861 100644 --- a/src/main.cu +++ b/src/main.cu @@ -15,16 +15,11 @@ static float* d_volume = nullptr; -// FIXME: segfaults on window resize - the problem is _not_ in the raycasting function - // TODO: general -// * very similarly - actual code for loading new data as the simulation progresses - right now its effectively a static image loader * pause button once that dataloading is implemented - +// * actual code for loading new data as the simulation progresses - right now its effectively a static image loader // * save frames to file while running program -> then export to gif on close. // * time controls - arbitrary skipping to specified point (would require some changes to gpubuffer) (could have) -// * transfer function -> move the code in raycastkernel to its own class and add silhouette detection here as well. - void getTemperature(std::vector& temperatureData, int idx = 0) { std::string path = "data/trimmed"; // std::string path = "data";