This commit is contained in:
parent
26c1d0ff83
commit
7f22c0372b
|
|
@ -99,7 +99,6 @@ void Window::free(float* data) {
|
||||||
|
|
||||||
|
|
||||||
void Window::tick() {
|
void Window::tick() {
|
||||||
std::cout << "tick tick\n";
|
|
||||||
// manually track time diff
|
// manually track time diff
|
||||||
std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
|
std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
|
||||||
float diff = (float) std::chrono::duration_cast<std::chrono::milliseconds>(now - this->last_frame).count();
|
float diff = (float) std::chrono::duration_cast<std::chrono::milliseconds>(now - this->last_frame).count();
|
||||||
|
|
@ -113,7 +112,6 @@ void Window::tick() {
|
||||||
this->widget->dateChanged = false;
|
this->widget->dateChanged = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::cout << "setting tick render\n";
|
|
||||||
// tick render
|
// tick render
|
||||||
glBindFramebuffer(GL_FRAMEBUFFER, 0);
|
glBindFramebuffer(GL_FRAMEBUFFER, 0);
|
||||||
glDisable(GL_DEPTH_TEST);
|
glDisable(GL_DEPTH_TEST);
|
||||||
|
|
@ -141,14 +139,11 @@ void Window::tick() {
|
||||||
glDrawArrays(GL_TRIANGLES, 0, 6); // draw current frame to texture
|
glDrawArrays(GL_TRIANGLES, 0, 6); // draw current frame to texture
|
||||||
|
|
||||||
// render ImGui context
|
// render ImGui context
|
||||||
std::cout << "rendering\n";
|
|
||||||
this->widget->render();
|
this->widget->render();
|
||||||
std::cout << "done rendering\n";
|
|
||||||
|
|
||||||
// check for events
|
// check for events
|
||||||
glfwSwapBuffers(this->window);
|
glfwSwapBuffers(this->window);
|
||||||
glfwPollEvents();
|
glfwPollEvents();
|
||||||
std::cout << "done tick tick\n";
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ static float* d_volume = nullptr;
|
||||||
// * time controls - arbitrary skipping to specified point (would require some changes to gpubuffer) (could have)
|
// * time controls - arbitrary skipping to specified point (would require some changes to gpubuffer) (could have)
|
||||||
|
|
||||||
void getTemperature(std::vector<float>& temperatureData, int idx = 0) {
|
void getTemperature(std::vector<float>& temperatureData, int idx = 0) {
|
||||||
std::string path = "../../../../hurricane-sandy-data/trimmed";
|
std::string path = "data/trimmed";
|
||||||
// std::string path = "data";
|
// std::string path = "data";
|
||||||
std::string variable = "T";
|
std::string variable = "T";
|
||||||
DataReader dataReader(path, variable);
|
DataReader dataReader(path, variable);
|
||||||
|
|
@ -31,7 +31,7 @@ void getTemperature(std::vector<float>& temperatureData, int idx = 0) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void getSpeed(std::vector<float>& speedData, int idx = 0) {
|
void getSpeed(std::vector<float>& speedData, int idx = 0) {
|
||||||
std::string path = "../../../../hurricane-sandy-data/trimmed";
|
std::string path = "data/trimmed";
|
||||||
// std::string path = "data";
|
// std::string path = "data";
|
||||||
std::string varU = "U";
|
std::string varU = "U";
|
||||||
std::string varV = "V";
|
std::string varV = "V";
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue