Update app.py

app.py

@@ -208,7 +208,7 @@ def depth_edges_mask(depth):
     mask = depth_grad > 0.05
     return mask
 
-def pano_depth_to_world_points(depth, location, displace):
+def pano_depth_to_world_points(depth, location):
     """
     360 depth to world points
     given 2D depth is an equirectangular projection of a spherical image
@@ -240,9 +240,9 @@ def pano_depth_to_world_points(depth, location, displace):
             d_lat = lat + j/2 * np.pi / depth.shape[0] + location["pitch"] / 180 * np.pi
             
             # Convert to cartesian coordinates
-            x = radius * np.cos(d_lon) * np.sin(d_lat) + location["lat"]*displace
+            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) + location["lng"]*displace
+            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)
@@ -258,7 +258,7 @@ def pano_depth_to_world_points(depth, location, displace):
 def rgb2gray(rgb):
     return np.dot(rgb[...,:3], [0.333, 0.333, 0.333])
 
-def get_mesh(image, depth, blur_data, loadall, displace):
+def get_mesh(image, depth, blur_data, loadall):
     global locations
     global mesh
     global scene
@@ -274,7 +274,7 @@ def get_mesh(image, depth, blur_data, loadall, displace):
     gdepth = rgb2gray(depthc)
     
     print('depth to gray - ok')
-    points = pano_depth_to_world_points(gdepth, locations[fnum], displace)
+    points = pano_depth_to_world_points(gdepth, locations[fnum])
     pts3d = points[0]
     uv = points[1]
     print('radius from depth - ok')
@@ -605,7 +605,13 @@ with gr.Blocks(css=css) as demo:
             with gr.Accordion(label="Blur levels", open=False):
                 blur_in = gr.Textbox(label="Kernel size", show_label=False, value="1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1")
             with gr.Accordion(label="Locations", open=False):
-                offset = gr.HTML(value="""<input type='text' id='kbrd' onkeydown='
+                offset = gr.HTML(value="""<label for='displace'>Displace</label><input id='displace' type='range' style='width:256px;height:1em;' value='0' min='0' max='255' step='1' oninput='
+                try {
+                  var json = JSON.parse(document.getElementById(\"coords\").innerText.slice(6,-1));
+                  BABYLON.Engine.LastCreatedScene.getNodes()[parseInt(document.getElementById(\"fnum\").getElementsByTagName(\"input\")[0].value)+1].position.x = this.value * json[parseInt(document.getElementById(\"fnum\").getElementsByTagName(\"input\")[0].value)].lat;
+                  BABYLON.Engine.LastCreatedScene.getNodes()[parseInt(document.getElementById(\"fnum\").getElementsByTagName(\"input\")[0].value)+1].position.z = this.value * json[parseInt(document.getElementById(\"fnum\").getElementsByTagName(\"input\")[0].value)].lng;
+                } catch(e) {alert(e)}
+                '/><input type='text' id='kbrd' onkeydown='
                 if (BABYLON) {
                   if (!BABYLON.Engine.LastCreatedScene.activeCamera.metadata) {
                     var evt = document.createEvent(\"Event\");
@@ -720,13 +726,13 @@ with gr.Blocks(css=css) as demo:
                 </pre>""")
                 selected = gr.Number(elem_id="fnum", value=0, minimum=0, maximum=256, interactive=False)
                 output_frame.select(fn=select_frame, inputs=[output_mask], outputs=[output_mask, selected])
-                example_coords = """[
+                example_coords = """"root=[
                   {"lat": -2.0593128411405814e-06, "lng": 7.138250595062345e-07, "heading": 152.70303, "pitch": 2.607833999999997}, 
                   {"lat": 1.5397763348801163e-06, "lng": 1.3651150112536925e-06, "heading": 151.12973, "pitch": 2.8672300000000064}, 
                   {"lat": -2.1552188087525792e-05, "lng": 1.5591533522041345e-05, "heading": 151.41025, "pitch": 3.4802200000000028}, 
                   {"lat": -3.0588534016828817e-06, "lng": 3.549113042566887e-06, "heading": 151.93391, "pitch": 2.843050000000005}, 
                   {"lat": 2.513057799546914e-05, "lng": -2.1219586638920873e-05, "heading": 152.95769, "pitch": 4.233024999999998}
-                ]"""
+                ]""""
                 coords = gr.JSON(elem_id="coords", value=example_coords, label="Precise coordinates", show_label=False)      
                 
             html = gr.HTML(value="""<label for='zoom'>Zoom</label><input id='zoom' type='range' style='width:256px;height:1em;' value='0.8' min='0.157' max='1.57' step='0.001' oninput='
@@ -843,7 +849,6 @@ with gr.Blocks(css=css) as demo:
             '/><br/>
             <canvas id='cnv_out'/>""")
             load_all = gr.Checkbox(label="Load all")
-            displace = gr.Slider(label="Displace", value=0, maximum=255, minimum=0, step=1)
             render = gr.Button("Render")
     
     def on_submit(uploaded_video,model_type,coordinates):
@@ -881,7 +886,7 @@ with gr.Blocks(css=css) as demo:
         return output_video_path + (locations,)
 
     submit.click(on_submit, inputs=[input_video, model_type, coords], outputs=[processed_video, processed_zip, output_frame, output_mask, coords])
-    render.click(partial(get_mesh), inputs=[output_frame, output_mask, blur_in, load_all, displace], outputs=[result])
+    render.click(partial(get_mesh), inputs=[output_frame, output_mask, blur_in, load_all], outputs=[result])
 
     example_files = os.listdir('examples')
     example_files.sort()