only rescale vertices once for grid meshing

sogelink-research · Jan 26, 2024 · f27bbb9 · f27bbb9
1 parent c119055
commit f27bbb9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/ctod/core/cog/processor/cog_processor_quantized_mesh_grid.py b/ctod/core/cog/processor/cog_processor_quantized_mesh_grid.py
@@ -53,7 +53,7 @@ def process(self, cog_request: CogRequest) -> tuple:
         cartesian = to_ecef(rescaled, ellipsoid=self.ellipsoid)
         normals = calculate_normals(cartesian, triangles_new) if cog_request.generate_normals else None
 
-        return (vertices_new, triangles_new, normals)
+        return (vertices_new, triangles_new, normals, rescaled)
 
     def _load_settings(self, request: web.RequestHandler):
         """Parse the config

diff --git a/ctod/core/terrain/generator/terrain_generator_quantized_mesh_grid.py b/ctod/core/terrain/generator/terrain_generator_quantized_mesh_grid.py
@@ -34,7 +34,7 @@ def generate(self, terrain_request: TerrainRequest) -> bytes:
             quantized_empty_tile = generate_empty_tile(main_cog.tms, main_cog.z, main_cog.x, main_cog.y)
             return quantized_empty_tile
 
-        vertices, triangles, normals = main_cog.processed_data
+        vertices, triangles, normals, rescaled = main_cog.processed_data
 
         n = terrain_request.get_neighbour_file(Direction.NORTH)
         ne = terrain_request.get_neighbour_file(Direction.NORTHEAST)
@@ -67,9 +67,7 @@ def generate(self, terrain_request: TerrainRequest) -> bytes:
                         ]
                         normals[i] = np.average(np.concatenate((duplicated_normals, normals[i].reshape(1, 3)), axis=0), axis=0)
 
-        # Rescale the vertices to the tile bounds and create quantized mesh
-        rescaled_vertices = rescale_positions(vertices, main_cog.tile_bounds, flip_y=False)
-        quantized = quantize(rescaled_vertices, triangles, normals)
+        quantized = quantize(rescaled, triangles, normals)
 
         return quantized