Refactor terrain & water rendering