Fiw Google Earth import

Author: eliemichel

blender/MapsModelsImporter/google_maps.py

@@ -37,8 +37,7 @@
 MSG_INCORRECT_RDC = """Invalid RDC capture file. Please make sure that:
 1. You are using the recommended RenderDoc Version for this AddOn
    - RenderDoc Version 1.5 - 1.9 for MapsModelsImporter <= 0.3.2
-   - RenderDoc Version 1.10 for MapsModelsImporter >= 0.3.3
-   - RenderDoc Version 1.11 & 1.12 don't work at the moment (latest MapsModelsImporter is 0.3.5). But it probably will work in a future Version.
+   - RenderDoc Version >= 1.10 for MapsModelsImporter >= 0.3.3
 2. You are importing from Google Maps or Google Earth web
 3. You were MOVING in the 3D view while taking the capture (you can use the "Capture after delay"-button in RenderDoc).
 
@@ -259,7 +258,7 @@ def filesToBlender(context, prefix, max_blocks=200, globalScale=1.0/256.0):
         # Make triangles from triangle strip index buffer
         n = len(indices)
         if constants["DrawCall"]["topology"] == 'TRIANGLE_STRIP':
-            tris = [ [ indices[i+j] for j in [[0,1,2],[0,2,1]][i%2] ] for i in range(n - 2)]
+            tris = [ [ indices[i+j] for j in [[0,1,2],[0,2,1]][i%2] ] for i in range(n - 3)]
             tris = [ t for t in tris if t[0] != t[1] and t[0] != t[2] and t[1] != t[2] ]
         else:
             tris = [ [ indices[3*i+j] for j in range(3) ] for i in range(n//3) ]

blender/MapsModelsImporter/google_maps_rd.py

@@ -132,7 +132,7 @@ def hasUniform(self, draw, uniform):
         constants = self.getVertexShaderConstants(draw)
         return uniform in constants['$Globals']
 
-    def extractRelevantCalls(self, drawcalls, _strategy=0):
+    def extractRelevantCalls(self, drawcalls, _strategy=4):
         """List the drawcalls related to drawing the 3D meshes thank to a ad hoc heuristic
         It may different in RenderDoc UI and in Python module, for some reason
         """
@@ -160,9 +160,12 @@ def extractRelevantCalls(self, drawcalls, _strategy=0):
             last_call = ""
             drawcall_prefix = "DrawIndexed"
             capture_type = "Google Earth"
-            skipped_drawcalls, min_drawcall = self.findDrawcallBatch(drawcalls, first_call, drawcall_prefix, last_call)
-            if not skipped_drawcalls or not self.hasUniform(skipped_drawcalls[0], "_uProjModelviewMatrix"):
-                first_call = "INVALID CASE, SKIP ME"
+            min_drawcall = 0
+            while True:
+                skipped_drawcalls, new_min_drawcall = self.findDrawcallBatch(drawcalls[min_drawcall:], first_call, drawcall_prefix, last_call)
+                if self.hasUniform(skipped_drawcalls[0], "_uMeshToWorldMatrix"):
+                    break
+                min_drawcall += new_min_drawcall
         elif _strategy == 6:
             # Actually sometimes there's only one batch
             first_call = "DrawIndexed"
@@ -181,7 +184,7 @@ def extractRelevantCalls(self, drawcalls, _strategy=0):
             print("Error: Could not find the beginning of the relevant 3D draw calls")
             return [], "none"
 
-        print(f"Trying scrapping strategy #{_strategy}...")
+        print(f"Trying scraping strategy #{_strategy}...")
         relevant_drawcalls, _ = self.findDrawcallBatch(
             drawcalls[min_drawcall:],
             first_call,
@@ -200,13 +203,19 @@ def extractRelevantCalls(self, drawcalls, _strategy=0):
             else:
                 capture_type = "Google Earth"
 
+        if capture_type == "Google Earth":
+            relevant_drawcalls = [
+                call for call in relevant_drawcalls
+                if self.hasUniform(call, "_uMeshToWorldMatrix")
+            ]
+
         return relevant_drawcalls, capture_type
 
     def run(self):
         controller = self.controller
         drawcalls = controller.GetDrawcalls()
         relevant_drawcalls, capture_type = self.extractRelevantCalls(drawcalls)
-        print(f"Scrapping capture from {capture_type}...")
+        print(f"Scraping capture from {capture_type}...")
 
         if MAX_BLOCKS <= 0:
             max_drawcall = len(relevant_drawcalls)