use hull data from manifest if available

Author: adi1998

deppth2/texpacking.py

@@ -71,6 +71,7 @@ def build_atlases_hades(source_dir, target_dir, deppth2_pack=True, include_hulls
     hulls = {}
     namemap = {}
     scaleRatioMap = {}
+    manifestHulls = {}
 
     temp_dir = tempfile.mkdtemp()
     temp_name_mapping = {}
@@ -87,6 +88,7 @@ def build_atlases_hades(source_dir, target_dir, deppth2_pack=True, include_hulls
         namemap[rel_path] = str(file_path)
 
         scaleRatioMap[rel_path] = get_scale_ratio(file_path)
+        manifestHulls[rel_path] = get_hull_from_manifest(file_path)
 
     # Create temporary images with unique names for PyTexturePacker to not override when creating the json file
     for rel_path, original_path in namemap.items():
@@ -120,7 +122,7 @@ def build_atlases_hades(source_dir, target_dir, deppth2_pack=True, include_hulls
         with open(f'{basename}{index}.json', 'w') as f:
             json.dump(original_data, f, indent=2)
 
-        atlases.append(transform_atlas(target_dir, basename, f'{basename}{index}.json', namemap, hulls, source_dir, manifest_paths, scaleRatioMap=scaleRatioMap))
+        atlases.append(transform_atlas(target_dir, basename, f'{basename}{index}.json', namemap, hulls, source_dir, manifest_paths, scaleRatioMap=scaleRatioMap, manifestHulls=manifestHulls))
         os.remove(f'{basename}{index}.json')
         index += 1
 
@@ -161,7 +163,15 @@ def get_scale_ratio(path):
         return image_manifest.get("scaleRatio", default_scale)
     return default_scale
 
-@requires('scipy.spatial')
+def get_hull_from_manifest(path):
+    default_hull = []
+    image_manifest_path = os.path.splitext(path)[0] + ".json"
+    if os.path.exists(image_manifest_path):
+        with open(image_manifest_path, 'r') as f:
+            image_manifest = json.load(f)
+        return image_manifest.get("hull", default_hull)
+    return default_hull
+
 def get_hull_points(path):
     try:
         import scipy.spatial
@@ -200,7 +210,7 @@ def find_files(source_dir):
         file_list.append(path)
     return file_list
 
-def transform_atlas(target_dir, basename, filename, namemap, hulls={}, source_dir='', manifest_paths=[], scaleRatioMap = {}):
+def transform_atlas(target_dir, basename, filename, namemap, hulls={}, source_dir='', manifest_paths=[], scaleRatioMap = {}, manifestHulls = []):
     with open(filename) as f:
         ptp_atlas = json.load(f)
         frames = ptp_atlas['frames']
@@ -231,6 +241,8 @@ def transform_atlas(target_dir, basename, filename, namemap, hulls={}, source_di
             subatlas['isMip'] = False
             subatlas['isAlpha8'] = False
             subatlas['hull'] = transform_hull(hulls.get(texture_name, []), subatlas['topLeft'], (subatlas['rect']['width'], subatlas['rect']['height']))
+            if len(subatlas['hull']) == 0:
+                subatlas['hull'] = manifestHulls.get(texture_name, [])
             atlas.subAtlases.append(subatlas)
 
     atlas.export_file(f'{os.path.splitext(filename)[0]}.atlas.json')