Update app.py

app.py

@@ -182,7 +182,7 @@ def depth_edges_mask(depth):
     mask = depth_grad > 0.05
     return mask
 
-def pano_depth_to_world_points(depth, scale):
+def pano_depth_to_world_points(depth, scale, offset):
     """
     360 depth to world points
     given 2D depth is an equirectangular projection of a spherical image
@@ -192,7 +192,7 @@ def pano_depth_to_world_points(depth, scale):
     """
 
     # Convert depth to radius
-    radius = (255 - depth.flatten()) * scale
+    radius = (255 - depth.flatten())
 
     lon = np.linspace(0, np.pi*2, depth.shape[1])
     lat = np.linspace(0, np.pi, depth.shape[0])
@@ -210,9 +210,9 @@ def pano_depth_to_world_points(depth, scale):
             d_lat = lat + j/2 * np.pi / depth.shape[0]
             
             # Convert to cartesian coordinates
-            x = radius * np.cos(d_lon) * np.sin(d_lat)
+            x = radius * np.cos(d_lon) * np.sin(d_lat) + offset[1] * scale
             y = radius * np.cos(d_lat)
-            z = radius * np.sin(d_lon) * np.sin(d_lat)
+            z = radius * np.sin(d_lon) * np.sin(d_lat) + offset[0] * scale
             
             pts = np.stack([x, y, z], axis=1)
             uvs = np.stack([lon, lat], axis=1)
@@ -228,13 +228,14 @@ def pano_depth_to_world_points(depth, scale):
 def rgb2gray(rgb):
     return np.dot(rgb[...,:3], [0.333, 0.333, 0.333])
 
-def get_mesh(image, depth, blur_data):
+def get_mesh(image, depth, blur_data, scale):
     fnum = frame_selected
+    offset = locations[fnum]
     blur_img = blur_image(image[fnum][0], depth[fnum][0], blur_data)
     
     gdepth = rgb2gray(depth[fnum][0])
     print('depth to gray - ok')
-    points = pano_depth_to_world_points(gdepth, 1)
+    points = pano_depth_to_world_points(gdepth, scale, offset)
     pts3d = points[0]
     uv = points[1]
     print('radius from depth - ok')
@@ -530,6 +531,7 @@ with gr.Blocks(css=css) as demo:
             example_coords = '50.07379596793083,14.437146122950555 50.073799567020004,14.437146774240507 50.07377647505558,14.437161000659017 50.07379496839027,14.437148958238538 50.073823157821664,14.437124189538856'
             with gr.Accordion(label="Locations", open=False):
                 coords = gr.Textbox(value=example_coords, label="Precise coordinates", show_label=False)
+                scale_in = gr.Slider(value=255, minimum=1, maximum=1023, label="Scale")
             render = gr.Button("Render")
     
     def on_submit(uploaded_video,model_type,coordinates):
@@ -562,7 +564,7 @@ with gr.Blocks(css=css) as demo:
         return output_video_path
 
     submit.click(on_submit, inputs=[input_video, model_type, coords], outputs=[processed_video, processed_zip, output_frame, output_depth])
-    render.click(partial(get_mesh), inputs=[output_frame, output_depth, blur_in], outputs=[result])
+    render.click(partial(get_mesh), inputs=[output_frame, output_depth, blur_in, scale_in], outputs=[result])
 
     example_files = os.listdir('examples')
     example_files.sort()