fix crash and small bug

Author: RevoluPowered

mirror-godot-app/prefabs/autoload/zone/collision_shape_generator/collision_shape_generator.gd

@@ -75,6 +75,9 @@ func generate_shape_for_meshes(body: JBody3D, in_meshes: Array[MeshInstance3D],
 			if is_concave:
 				var tms: ConcavePolygonShape3D = mesh.mesh.create_trimesh_shape()
 				shape = JMeshShape3D.new()
+				if tms == null:
+					push_error("invalid physics shape")
+					continue
 				shape.faces = tms.get_faces()
 			else:
 				var cps: ConvexPolygonShape3D = mesh.mesh.create_convex_shape(false, false)

mirror-godot-app/scripts/net/file_cache.gd

@@ -117,7 +117,7 @@ func try_load_cached_file(cache_key: String) -> Variant:
 	if not FileAccess.file_exists(file_path):
 		return null
 	if Util.path_is_model(file_path):
-		return TMFileUtil.load_gltf_file_as_node(file_path, Zone.is_host())
+		return load_gltf_thread_task(file_path)
 	elif Util.path_is_image(file_path):
 		return Util.load_image(file_path)
 	elif Util.path_is_scene(file_path):
@@ -132,12 +132,13 @@ func try_load_cached_file(cache_key: String) -> Variant:
 var _cached_pairs = {}
 
 func load_gltf_thread_task(cache_key: String) -> Promise:
-	for m in _model_load_queue:
-		if m.key == cache_key:
-			return m.promise
+	if _cached_pairs.has(cache_key):
+		print("Cache found... not loading twice")
+		return _cached_pairs[cache_key].promise
 	var pair = KeyPromisePair.new()
 	pair.key = cache_key
 	pair.promise = Promise.new()
+	_cached_pairs[pair.key] = pair
 
 	if not cached_file_exists(pair.key):
 		pair.promise.set_error("File does not exists, cannot load.")
@@ -146,11 +147,19 @@ func load_gltf_thread_task(cache_key: String) -> Promise:
 	var file_path: String = get_file_path(file_name)
 
 	var task_id = WorkerThreadPool.add_task(func():
-		Thread.set_thread_safety_checks_enabled(false)
+		# future: we'll pack all the assets to .tscn and dependencies
+		# it should be faster than packing / repacking things. maybe even .scn files.
+		# if ResourceLoader.exists(file_path + ".tscn"):
+			# var node = ResourceLoader.load(file_path + ".tscn").instantiate()
+			# call_thread_safe("_cached_file_is_loaded", pair, node)
+			# return
 		var node = TMFileUtil.load_gltf_file_as_node(file_path, Zone.is_host())
+		# var scene: PackedScene = PackedScene.new()
+		# scene.pack(node)
+		# ResourceSaver.save(scene, file_path + ".tscn")
+		# print("Path: ", file_path + ".tscn")
 		call_thread_safe("_cached_file_is_loaded", pair, node)
 	)
-	_cached_pairs[task_id]
 
 
 	return pair.promise