merge WaterModel from the other branch; clear canvas on every frame