aboutsummaryrefslogtreecommitdiff
path: root/src/main.cc
diff options
context:
space:
mode:
authorAdrian Kummerlaender2018-12-18 21:08:20 +0100
committerAdrian Kummerlaender2018-12-18 21:08:20 +0100
commit6f6073be5de8c8598c4af7f38c90c3f83b5bf1bf (patch)
tree4dabb7259102afe4ddca25293ed3cc77640f95f8 /src/main.cc
parentd58c4cbeb95e25ea08994e4d39f657d078a33782 (diff)
downloadcompustream-6f6073be5de8c8598c4af7f38c90c3f83b5bf1bf.tar
compustream-6f6073be5de8c8598c4af7f38c90c3f83b5bf1bf.tar.gz
compustream-6f6073be5de8c8598c4af7f38c90c3f83b5bf1bf.tar.bz2
compustream-6f6073be5de8c8598c4af7f38c90c3f83b5bf1bf.tar.lz
compustream-6f6073be5de8c8598c4af7f38c90c3f83b5bf1bf.tar.xz
compustream-6f6073be5de8c8598c4af7f38c90c3f83b5bf1bf.tar.zst
compustream-6f6073be5de8c8598c4af7f38c90c3f83b5bf1bf.zip
Hacky mouse-based fluid interaction
Diffstat (limited to 'src/main.cc')
-rw-r--r--src/main.cc16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/main.cc b/src/main.cc
index 51bc650..067af40 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -23,10 +23,10 @@
#include "timer.h"
-constexpr GLuint nX = 128;
-constexpr GLuint nY = 128;
+constexpr GLuint nX = 256;
+constexpr GLuint nY = 256;
-constexpr int lups = 25; // max lattice updates per second
+constexpr int lups = 30; // max lattice updates per second
float getWorldHeight(int window_width, int window_height, float world_width) {
return world_width / window_width * window_height;
@@ -121,6 +121,16 @@ int renderWindow() {
{
auto guard = collide_shader->use();
+
+ const auto m = window.getMouse();
+ collide_shader->setUniform("mouseClicked", std::get<0>(m));
+ collide_shader->setUniform("mouseX", int(
+ float(std::get<1>(m)) / window.getWidth() * world_width + nX/2-1
+ ));
+ collide_shader->setUniform("mouseY", int(
+ float(std::get<2>(m)) / window.getHeight() * world_height + nY/2
+ ));
+
collide_shader->dispatch(nX, nY);
}
{