Re-added water height field tracing