PipeModelWater now works with terrain as base layer and as obstacle