Skip to content

Commit a081124

Browse files
committed
- added missing include
- fixed addKeyFunc in Python interface
1 parent f9e69f0 commit a081124

File tree

6 files changed

+15
-5
lines changed

6 files changed

+15
-5
lines changed

Changelog.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2.12.3
2+
- added missing include
3+
- fixed addKeyFunc in Python interface
4+
15
2.12.2
26
- added a CMake option for each tool so that the build can be disabled/enabled
37

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,10 @@ https://dl.acm.org/doi/10.1145/3355089.3356503
255255
* Zhongyao Yang, Maolin Wu, Shiguang Liu. Helmholtz decomposition-based SPH. Virtual Reality & Intelligent Hardware 3, 2, 2021
256256
https://www.sciencedirect.com/science/article/pii/S2096579621000176
257257
* Min Li, Hongshu Li, Weiliang Meng, Jian Zhu, Gary Zhang. An efficient non-iterative smoothed particle hydrodynamics fluid simulation method with variable smoothing length. Visual Computing for Industry, Biomedicine, and Art 6, 1, 2023
258+
https://vciba.springeropen.com/articles/10.1186/s42492-022-00128-x
258259
* Yalmar Ponce Atencio, Manuel J. Ibarra, Juan José Oré Cerrón, Roberto Quispe Quispe, Richard Flores Condori, Julio Huanca Marín, Mary Huaman Carrión. Particle-Based Physics for Interactive Applications. Lecture Notes in Networks and Systems book series (LNNS,volume 216), 2021
259-
260-
260+
https://link.springer.com/chapter/10.1007/978-981-16-1781-2_38
261+
* Zijie Li, Tianqin Li, Amir Barati Farimani. TPU-GAN: Learning temporal coherence from dynamic point cloud sequences. ICLR 2022
262+
https://openreview.net/forum?id=FEBFJ98FKx
263+
* Muzaffer Akbay, Nicholas Nobles, Victor Zordan, Tamar Shinar. An extended partitioned method for conservative solid-fluid coupling. ACM Transactions on Graphics 37, 4, 2018
264+
https://dl.acm.org/doi/10.1145/3197517.3201345

SPlisHSPlasH/Utilities/SceneParameterObjects.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "SPlisHSPlasH/Common.h"
55
#include <vector>
6+
#include <array>
67
#include "ParameterObject.h"
78

89
namespace Utilities

Simulator/GUI/Simulator_GUI_Base.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace SPH
2626
virtual void cleanup() {}
2727
virtual void run() {}
2828
virtual void stop() {}
29-
virtual void addKeyFunc(char k, std::function<void()> const& func) {}
29+
virtual void addKeyFunc(int key, int modifiers, std::function<void()> const& func) {}
3030

3131
SPH::SimulatorBase * getSimulatorBase() const { return m_simulatorBase; }
3232
};

pySPlisHSPlasH/examples/callbacks.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ def main():
1212
gui = sph.GUI.Simulator_GUI_imgui(base)
1313
base.setGui(gui)
1414

15-
gui.addKeyFunc('k', key_callback)
15+
# 75 -> 'k', 0 -> no modifier
16+
gui.addKeyFunc(75, 0 , key_callback)
1617
base.setTimeStepCB(time_step_callback)
1718

1819
base.run()

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.12.2
1+
2.12.3

0 commit comments

Comments
 (0)