fix(aiv): fix invert y bug

Author: gynt

aivjsons.zip

@@ -2,11 +2,11 @@
 
 file_input_file_output = argparse.ArgumentParser(add_help=False)
 file_input_file_output.add_argument("--input", help="input file", required=True)
-file_input_file_output.add_argument("--output", help="output file")
+file_input_file_output.add_argument("--output", help="output file", required=False)
 
 multiple_file_input_folder_output = argparse.ArgumentParser(add_help=False)
 multiple_file_input_folder_output.add_argument("--input", help="input files", nargs='+', required=True)
-multiple_file_input_folder_output.add_argument("--output", help="ouput folder")
+multiple_file_input_folder_output.add_argument("--output", help="output folder")
 
 main_parser = argparse.ArgumentParser(prog="sourcehold")
 main_parser.add_argument("--debug", action="store_true", default=False, help="debug mode")

sourcehold/tool/argparsers/common.py

@@ -7,9 +7,14 @@
 convert_subparsers = convert_parser.add_subparsers(dest='type', required=True, title='type')
 
 convert_aiv_parser = convert_subparsers.add_parser('aiv', parents=[file_input_file_output])
-convert_aiv_parser.add_argument('--extra', action='store_const', const=True, default=False, help='include properties that have not been parsed as "extra"')
+convert_aiv_parser.add_argument('--extra', action='store_true', default=False, help='include properties that have not been parsed as "extra"')
 convert_aiv_parser.add_argument('--from-format', required=False, default='')
 convert_aiv_parser.add_argument('--to-format', required=False, default='')
+convert_aiv_parser.add_argument('--verify', default='', required=False, help='specify file path to verify file with')
+convert_aiv_parser.add_argument('--from-invert-y', type=bool, default=False)
+convert_aiv_parser.add_argument('--from-invert-x', type=bool, default=False)
+convert_aiv_parser.add_argument('--to-invert-y', type=bool, default=True)
+convert_aiv_parser.add_argument('--to-invert-x', type=bool, default=False)
 
 memory_parser = services_parser.add_parser('memory')
 memory_parser.add_argument('--game', choices=['SHC1.41-latin', "SHCE1.41-latin"], default="SHC1.41-latin")

sourcehold/tool/argparsers/services.py

@@ -1,3 +1,4 @@
+import json
 import pathlib, sys
 
 from sourcehold.tool.convert.aiv.exports import to_json
@@ -15,19 +16,17 @@ def convert_aiv(args):
   inp = args.input
   if inp != '-' and not pathlib.Path(inp).exists():
       raise Exception(f"file does not exist: {inp}")
-  inp_invert_y = False
+  inp_invert_y = args.from_invert_y
+  inp_invert_x = args.from_invert_x
   inp_format = args.from_format
   if not inp_format:
     if inp.endswith(".aiv"):
       inp_format = 'aiv'
     elif inp.endswith(".json"):
       inp_format = "json"
-  else:
-    inp_format_tokens = inp_format.split(",")
-    if 'inverty' in inp_format_tokens:
-      inp_invert_y = True
-  
-  out_invert_y = False
+
+  out_invert_y = args.to_invert_y
+  out_invert_x = args.to_invert_x
   out_skip_keep = False
   out_format = args.to_format
   if not out_format:
@@ -39,6 +38,8 @@ def convert_aiv(args):
     out_format_tokens = out_format.split(",")
     if 'inverty' in out_format_tokens:
       out_invert_y = True
+    if 'invertx' in out_format_tokens:
+      out_invert_x = True
     if 'skipkeep' in out_format_tokens:
       out_skip_keep = True  
   if args.output == None:
@@ -56,17 +57,25 @@ def convert_aiv(args):
 
   if inp_format.startswith('aiv') and out_format.startswith("json"):
 
-    conv = to_json(path = inp, include_extra=args.extra, report=args.debug, invert_y=out_invert_y, skip_keep=out_skip_keep)
+    conv = to_json(path = inp, include_extra=args.extra, report=args.debug, invert_y=out_invert_y, invert_x=out_invert_x, skip_keep=out_skip_keep)
+    if args.verify:
+      target = json.dumps(json.loads(pathlib.Path(args.verify).read_text()), indent=2)
+      target_lines = target.split("\n")
+      conv_lines = conv.split("\n")
+      nlines = min(len(target_lines), len(conv_lines))
+      for li in range(nlines):
+        if target_lines[li] != conv_lines[li]:
+          print(f"Lines differ:\nSource:\n{conv_lines[li]}\nTarget:\n{target_lines[li]}", file=sys.stderr)
     if args.output == "-":
       sys.stdout.write(conv)
       sys.stdout.flush()
     else:
       pathlib.Path(args.output).write_text(conv)
   elif inp_format.startswith('json') and out_format.startswith("aiv"):
     if inp == "-":
-      conv = from_json(f = sys.stdin, report=args.debug, invert_y=inp_invert_y)
+      conv = from_json(f = sys.stdin, report=args.debug, invert_y=inp_invert_y, invert_x=inp_invert_x)
     else:
-      conv = from_json(path = inp, report=args.debug, invert_y=inp_invert_y)
+      conv = from_json(path = inp, report=args.debug, invert_y=inp_invert_y, invert_x=inp_invert_x)
     conv.to_file(args.output)
   else:
     raise NotImplementedError(f"combination of from-format '{inp_format}' and to-format '{out_format}' not implemented")

sourcehold/tool/convert/aiv/__init__.py

@@ -19,9 +19,17 @@
 import json
 
 
+def translate_offset(offset, invert_x, invert_y):
+  x = offset % AIV_WIDTH
+  y = offset // AIV_HEIGHT
+  if invert_x:
+    x = (AIV_WIDTH - 1) - x
+  if invert_y:
+    y = (AIV_HEIGHT - 1) - y
+  return (y * AIV_HEIGHT) + x
 
 
-def to_json(aiv=None, path: str='', f=None, include_extra=False, invert_y=True, skip_keep=False, report=False):
+def to_json(aiv=None, path: str='', f=None, include_extra=False, invert_y=False, invert_x=True, skip_keep=False, report=False):
   if not aiv and not path and not f:
     raise Exception()
   if aiv == None:
@@ -63,16 +71,16 @@ def to_json(aiv=None, path: str='', f=None, include_extra=False, invert_y=True,
   frames = [None] * step_count # + 1 is already stored in the aiv format
   miscItems = []
 
+  output["pauseDelayAmount"] = pauseDelayAmount
   output["frames"] = frames
   output["miscItems"] = miscItems
-  output["pauseDelayAmount"] = pauseDelayAmount
 
   processed = {}
 
   buildings = 0
   offset = -1
-  for i in x_range():
-    for j in y_range(invert_y=invert_y):
+  for i in y_range(invert_y=False):
+    for j in x_range(invert_x=False):
       offset += 1
 
       if offset in processed:
@@ -110,16 +118,17 @@ def to_json(aiv=None, path: str='', f=None, include_extra=False, invert_y=True,
       if frames[step] is None:
         buildings += 1
         shouldPause = step in pauses
-        frames[step] = {'itemType': buildingType, 'tilePositionOfsets': [offset], 'shouldPause': shouldPause}
+        offset_t = translate_offset(offset, invert_x, invert_y)
+        frames[step] = {'itemType': buildingType, 'tilePositionOfsets': [offset_t], 'shouldPause': shouldPause}
 
   if report:
     print(f"INFO: buildings: {buildings}")
 
   nonbuildings = 0
 
   offset = -1
-  for i in x_range():
-    for j in y_range(invert_y=invert_y):
+  for i in y_range(invert_y=False):
+    for j in x_range(invert_x=False):
       offset += 1
       if offset not in processed:
         # do all the special stuff
@@ -129,20 +138,24 @@ def to_json(aiv=None, path: str='', f=None, include_extra=False, invert_y=True,
         shouldPause = step in pauses
         if frames[step] is None:
           frames[step] = {'itemType': buildingType, 'tilePositionOfsets': [], 'shouldPause': shouldPause}
-        frames[step]['tilePositionOfsets'].append(offset)
+        offset_t = translate_offset(offset, invert_x, invert_y)
+        frames[step]['tilePositionOfsets'].append(offset_t)
         nonbuildings += 1
 
   if report:
     print(f"INFO: walls | pitch | moat: {nonbuildings}")
 
   misc = 0
   for unitType in range(24):
+    number = 0
     for entry in range(10):
       location = units[unitType, entry].item()
       if location == 0:
         continue
+      offset_t = translate_offset(location, invert_x, invert_y)
       misc += 1
-      miscItems.append({'itemType': unitType, 'positionOfset': location, 'number': entry})
+      miscItems.append({ 'positionOfset': offset_t, 'itemType': unitType,'number': number})
+      number += 1
 
   if report:
     print(f"INFO: units | flags | brazier | misc: {misc}")

sourcehold/tool/convert/aiv/exports.py

@@ -8,29 +8,31 @@
 from importlib import resources as impresources
 from sourcehold import resources
 
-mapping_xyinversed_offset = np.zeros(shape=(AIV_WIDTH, AIV_HEIGHT), dtype='uint32')
-mapping_xy_offset = np.zeros(shape=(AIV_WIDTH, AIV_HEIGHT), dtype='uint32')
+# mapping_xyinversed_offset = np.zeros(shape=(AIV_WIDTH, AIV_HEIGHT), dtype='uint32')
+# mapping_xy_offset = np.zeros(shape=(AIV_WIDTH, AIV_HEIGHT), dtype='uint32')
 
-offset = -1
-for x in x_range():
-  for y in y_range(invert_y=False):
-    offset += 1
-    mapping_xy_offset[x, y] = offset
+# offset = -1
+# for x in x_range(invert_x=False):
+#   for y in y_range(invert_y=False):
+#     offset += 1
+#     mapping_xy_offset[x, y] = offset
 
-offset = -1
-for x in x_range():
-  for y in y_range(invert_y=True):
-    offset += 1
-    mapping_xyinversed_offset[x, y] = offset
+# offset = -1
+# for x in x_range(invert_x=False):
+#   for y in y_range(invert_y=True):
+#     offset += 1
+#     mapping_xyinversed_offset[x, y] = offset
 
-def convert_offset(offset, invert_y=False):
-  return (offset // AIV_WIDTH, offset % AIV_HEIGHT if not invert_y else (AIV_HEIGHT - 1) - (offset % AIV_HEIGHT))
+def convert_offset(offset, invert_y=False, invert_x=False):
+  y = offset % AIV_HEIGHT if not invert_y else (AIV_HEIGHT - 1) - (offset % AIV_HEIGHT)
+  x = offset // AIV_WIDTH if not invert_x else ((AIV_WIDTH - 1) - (offset // AIV_WIDTH))
+  return (x, y)
 
-def convert_offsets(offsets, invert_y=False):
+def convert_offsets(offsets, invert_y=False, invert_x=False):
   for loc in offsets:
-    yield convert_offset(loc, invert_y=invert_y)
+    yield convert_offset(loc, invert_y=invert_y, invert_x=invert_x)
 
-def from_json(path: Union[str, None] = None, data: Union[Dict, None] = None, f=None, invert_y = True, report = False):
+def from_json(path: Union[str, None] = None, data: Union[Dict, None] = None, f=None, invert_y = False, invert_x = True, report = False):
   if not path and not data and not f:
     raise Exception()
 
@@ -62,7 +64,7 @@ def from_json(path: Union[str, None] = None, data: Union[Dict, None] = None, f=N
       # Special type
       aivID = convertMapperEnumToAIVEnum(v = mapperID)
       locations = frame['tilePositionOfsets']
-      for x, y in convert_offsets(locations, invert_y=invert_y):
+      for x, y in convert_offsets(locations, invert_y=invert_y, invert_x=invert_x):
         constructions[x, y] = aivID
         steps[x, y] = step
     else:
@@ -74,7 +76,7 @@ def from_json(path: Union[str, None] = None, data: Union[Dict, None] = None, f=N
       if len(frame['tilePositionOfsets']) > 1:
         raise Exception(f'too many locations for a building: {frame["tilePositionOfsets"]}')
       location = frame['tilePositionOfsets'][0]
-      x, y = convert_offset(location, invert_y=invert_y)
+      x, y = convert_offset(location, invert_y=invert_y, invert_x=invert_x)
       constructions[x:(x+size),y:(y+size)] = aivID
       steps[x:(x+size),y:(y+size)] = step
   for miscItem in data['miscItems']:

sourcehold/tool/convert/aiv/imports.py

@@ -824,7 +824,9 @@ def get_units_matrix(data = None):
 
 PAUSE_DELAY_AMOUNT_STRUCT_FORMAT = "<1i"
 
-def x_range():
+def x_range(invert_x=False):
+  if invert_x:
+    return range(AIV_WIDTH-1, -1, -1)
   return range(AIV_WIDTH)
 
 def y_range(invert_y=False):