Update app.py

app.py

@@ -183,7 +183,7 @@ def depth_edges_mask(depth):
     mask = depth_grad > 0.05
     return mask
 
-def pano_depth_to_world_points(depth, scale, offset):
+def pano_depth_to_world_points(depth):
     """
     360 depth to world points
     given 2D depth is an equirectangular projection of a spherical image
@@ -211,9 +211,9 @@ def pano_depth_to_world_points(depth, scale, offset):
             d_lat = lat + j/2 * np.pi / depth.shape[0]
             
             # Convert to cartesian coordinates
-            x = radius * np.cos(d_lon) * np.sin(d_lat) + offset[1] * scale
+            x = radius * np.cos(d_lon) * np.sin(d_lat)
             y = radius * np.cos(d_lat)
-            z = radius * np.sin(d_lon) * np.sin(d_lat) + offset[0] * scale
+            z = radius * np.sin(d_lon) * np.sin(d_lat)
             
             pts = np.stack([x, y, z], axis=1)
             uvs = np.stack([lon, lat], axis=1)
@@ -229,18 +229,17 @@ def pano_depth_to_world_points(depth, scale, offset):
 def rgb2gray(rgb):
     return np.dot(rgb[...,:3], [0.333, 0.333, 0.333])
 
-def get_mesh(image, depth, blur_data, scale, loadall):
+def get_mesh(image, depth, blur_data, loadall):
     global mesh
     if loadall == False:
         mesh = []
 
     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, scale, offset)
+    points = pano_depth_to_world_points(gdepth)
     pts3d = points[0]
     uv = points[1]
     print('radius from depth - ok')
@@ -536,8 +535,17 @@ with gr.Blocks(css=css) as demo:
             <canvas id='cnv_out'/>""")
             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")
+                coords = gr.Textbox(elem_id="coords", value=example_coords, label="Precise coordinates", show_label=False)
+                scale_in = gr.HTML(value="""<label for='scale'>Scale</label><input id='scale' type='range' style='width:256px;height:1em;' value='256' min='0' max='1024' oninput='
+                  if (!BABYLON.Engine.LastCreatedScene.activeCamera.metadata) {
+                    var evt = document.createEvent(\"Event\");
+                    evt.initEvent(\"click\", true, false);
+                    document.getElementById(\"reset_cam\").dispatchEvent(evt);
+                  } 
+                  BABYLON.Engine.LastCreatedScene.getNodes()[document.getElementById(\"fnum\").value+1].position.x = this.value * document.getElementById(\"coords\").value.split(\" \")[document.getElementById(\"fnum\").value].split(\",\")[0];
+                  BABYLON.Engine.LastCreatedScene.getNodes()[document.getElementById(\"fnum\").value+1].position.y = this.value * document.getElementById(\"coords\").value.split(\" \")[document.getElementById(\"fnum\").value].split(\",\")[1];
+                  this.parentNode.childNodes[2].innerText = this.value;
+                '/><span>256</span><input type='number' value='0' id='fnum'/>""")
                 load_all = gr.Checkbox(label="Load all")
             render = gr.Button("Render")
     
@@ -568,16 +576,16 @@ with gr.Blocks(css=css) as demo:
         # Process the video and get the path of the output video
         output_video_path = make_video(uploaded_video,encoder=model_type)
 
-        return output_video_path
+        return locations_str, 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, scale_in, load_all], outputs=[result])
+    submit.click(on_submit, inputs=[input_video, model_type, coords], outputs=[coords, processed_video, processed_zip, output_frame, output_depth])
+    render.click(partial(get_mesh), inputs=[output_frame, output_depth, blur_in, load_all], outputs=[result])
 
     example_files = os.listdir('examples')
     example_files.sort()
     example_files = [os.path.join('examples', filename) for filename in example_files]
     
-    examples = gr.Examples(examples=example_files, inputs=[input_video], outputs=[processed_video, processed_zip, output_frame, output_depth], fn=on_submit, cache_examples=True)
+    examples = gr.Examples(examples=example_files, inputs=[input_video], outputs=[coords, processed_video, processed_zip, output_frame, output_depth], fn=on_submit, cache_examples=True)
     
 
 if __name__ == '__main__':