Update app.py

app.py

@@ -252,10 +252,10 @@ def pano_depth_to_world_points(depth):
             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)
+            uvs = np.stack([lon, lat], axis=1)
             
             pts3d = np.concatenate((pts3d, pts), axis=0)
-            #uv = np.concatenate((uv, uvs), axis=0)
+            uv = np.concatenate((uv, uvs), axis=0)
             #print(f'i: {i}, j: {j}')
             j = j+1
         i = i+1
@@ -286,7 +286,7 @@ def get_mesh(image, depth, blur_data, loadall):
     print('depth to gray - ok')
     points = pano_depth_to_world_points(gdepth)
     pts3d = points[0]
-    #uv = points[1]
+    uv = points[1]
     print('radius from depth - ok')
 
     # Create a trimesh mesh from the points
@@ -302,26 +302,26 @@ def get_mesh(image, depth, blur_data, loadall):
     clrs = np.concatenate((clrs, colors), axis=0)
         #i = i+1
 
-    cverts = []
-    i=0
-    j=0
-    while i<len(pcolors):
-        cverts.append([])
-        while j<len(clrs):
-            if (clrs[j] == pcolors[i]).all():
-                cverts[i].append(verts[j])
-                j=j+1
-        mesh.append(trimesh.PointCloud(cverts[i], color=pcolors[i]))
-        mesh[len(mesh)-1].merge_vertices()
-        i=i+1
+    #cverts = []
+    #i=0
+    #j=0
+    #while i<len(pcolors):
+        #cverts.append([])
+        #while j<len(clrs):
+            #if (clrs[j] == pcolors[i]).all():
+                #cverts[i].append(verts[j])
+                #j=j+1
+    mesh.append(trimesh.PointCloud(verts, colors=None))
+    mesh[len(mesh)-1].merge_vertices()
+        #i=i+1
     mesh_n.append(str(fnum))
 
     #triangles = create_triangles(rgba.shape[0], rgba.shape[1])
     #mesh.append(trimesh.Trimesh(vertices=verts, faces=triangles))
-    #rgba_pil =  Image.fromarray(rgba.astype(np.uint8))
-    #material = trimesh.visual.texture.SimpleMaterial(image=rgba_pil)
-    #visuals = trimesh.visual.TextureVisuals(uv=uvs, image=rgba_pil, material=material)
-    #mesh[len(mesh)-1].visual = visuals
+    rgba_pil =  Image.fromarray(rgba.astype(np.uint8))
+    material = trimesh.visual.texture.SimpleMaterial(image=rgba_pil)
+    visuals = trimesh.visual.TextureVisuals(uv=uvs, image=rgba_pil, material=material)
+    mesh[len(mesh)-1].visual = visuals
     #print('triangles - ok')
     
     #ln = []
@@ -449,7 +449,7 @@ def optimize(v, d):
 
         dcolor = []
         for k, f in enumerate(frames):
-            frame = cv2.cvtColor(cv2.imread(frames[k]).astype(np.uint8), cv2.COLOR_BGR2RGB)
+            frame = cv2.imread(frames[k]).astype(np.uint8)
             
             # convert to np.float32
             f = np.float32(frame.reshape((-1,3)))
@@ -495,7 +495,7 @@ def bincount(a):
     a2D = a.reshape(-1,a.shape[-1])
     col_range = (256, 256, 256) # generically : a2D.max(0)+1
     a1D = np.ravel_multi_index(a2D.T, col_range)
-    return np.unravel_index(np.bincount(a1D).argmax(), col_range)
+    return list(reversed(np.unravel_index(np.bincount(a1D).argmax(), col_range)))
 
 def reset_mask():
     global frame_selected