EntropyDrop commited on
Commit
c184c98
·
1 Parent(s): c7feb78

Add offset_args parameter to mc_render for relative limb offsets

Browse files
Files changed (1) hide show
  1. mc_render.py +41 -2
mc_render.py CHANGED
@@ -402,7 +402,8 @@ def build_minecraft_model(
402
  rot_arm_left: tuple = (0, 0, 0),
403
  rot_leg_right: tuple = (0, 0, 0),
404
  rot_leg_left: tuple = (0, 0, 0),
405
- pos_args: dict = None
 
406
  ) -> list:
407
  """Build the model components."""
408
  scale = 1.0
@@ -422,6 +423,11 @@ def build_minecraft_model(
422
  pos_args = pos_args or {}
423
  positions = {part: pos_args.get(part, def_pos) for part, def_pos in default_positions.items()}
424
 
 
 
 
 
 
425
  pivots = {
426
  'head': (0, 24 * scale, 0),
427
  'right_arm': (-6 * scale, 24 * scale, 0),
@@ -436,6 +442,11 @@ def build_minecraft_model(
436
  offset = np.array(pos_args[part]) - np.array(default_positions[part])
437
  pivots[part] = tuple(np.array(pivots[part]) + offset)
438
 
 
 
 
 
 
439
  def apply_rotation(mesh, angles, pivot):
440
  if not angles or all(a == 0 for a in angles):
441
  return
@@ -586,6 +597,7 @@ def render_skin(
586
  ortho: bool = False,
587
  rot_args: dict = None,
588
  pos_args: dict = None,
 
589
  save_path: str = None,
590
  bg: list = [1, 1, 1],
591
  light = False,
@@ -607,7 +619,18 @@ def render_skin(
607
  if rot_args is None: rot_args = {}
608
 
609
  # Build models
610
- head, body, l_arm, r_arm, l_leg, r_leg, hat, jacket, ls, rs, lp, rp = build_minecraft_model(skin, hl=hl,hl_direction=hl_direction,hl_depth=hl_depth, core_display=core_display, decor_display=decor_display, use_voxels=use_voxels, pos_args=pos_args, **rot_args)
 
 
 
 
 
 
 
 
 
 
 
611
 
612
  # Initialize Plotter
613
  plotter = pv.Plotter(off_screen=off_screen, window_size=output_size)
@@ -795,6 +818,13 @@ def main():
795
  parser.add_argument("--pos-leg-right", type=float, nargs=3, help="Right leg position")
796
  parser.add_argument("--pos-leg-left", type=float, nargs=3, help="Left leg position")
797
 
 
 
 
 
 
 
 
798
  parser.add_argument("--save", type=str, help="Save screenshot to file")
799
  parser.add_argument("--bg", type=float, nargs=3, default=[1/255, 254/255, 1/255], help="Background color (r g b)")
800
  parser.add_argument("--light-pos", type=float, nargs=3, default=[0, 30, 30], help="Initial light position (x y z)")
@@ -819,6 +849,14 @@ def main():
819
  if args.pos_leg_right: pos_args['right_leg'] = tuple(args.pos_leg_right)
820
  if args.pos_leg_left: pos_args['left_leg'] = tuple(args.pos_leg_left)
821
 
 
 
 
 
 
 
 
 
822
  skin = load_skin(args.skin_path)
823
 
824
  render_skin(
@@ -829,6 +867,7 @@ def main():
829
  ortho=args.ortho,
830
  rot_args=rot_args,
831
  pos_args=pos_args,
 
832
  save_path=args.save,
833
  bg=args.bg,
834
  light=args.light,
 
402
  rot_arm_left: tuple = (0, 0, 0),
403
  rot_leg_right: tuple = (0, 0, 0),
404
  rot_leg_left: tuple = (0, 0, 0),
405
+ pos_args: dict = None,
406
+ offset_args: dict = None
407
  ) -> list:
408
  """Build the model components."""
409
  scale = 1.0
 
423
  pos_args = pos_args or {}
424
  positions = {part: pos_args.get(part, def_pos) for part, def_pos in default_positions.items()}
425
 
426
+ offset_args = offset_args or {}
427
+ for part in positions:
428
+ if part in offset_args:
429
+ positions[part] = tuple(np.array(positions[part]) + np.array(offset_args[part]))
430
+
431
  pivots = {
432
  'head': (0, 24 * scale, 0),
433
  'right_arm': (-6 * scale, 24 * scale, 0),
 
442
  offset = np.array(pos_args[part]) - np.array(default_positions[part])
443
  pivots[part] = tuple(np.array(pivots[part]) + offset)
444
 
445
+ # Adjust pivots based on offset override
446
+ for part in pivots:
447
+ if part in offset_args:
448
+ pivots[part] = tuple(np.array(pivots[part]) + np.array(offset_args[part]))
449
+
450
  def apply_rotation(mesh, angles, pivot):
451
  if not angles or all(a == 0 for a in angles):
452
  return
 
597
  ortho: bool = False,
598
  rot_args: dict = None,
599
  pos_args: dict = None,
600
+ offset_args: dict = None,
601
  save_path: str = None,
602
  bg: list = [1, 1, 1],
603
  light = False,
 
619
  if rot_args is None: rot_args = {}
620
 
621
  # Build models
622
+ head, body, l_arm, r_arm, l_leg, r_leg, hat, jacket, ls, rs, lp, rp = build_minecraft_model(
623
+ skin,
624
+ hl=hl,
625
+ hl_direction=hl_direction,
626
+ hl_depth=hl_depth,
627
+ core_display=core_display,
628
+ decor_display=decor_display,
629
+ use_voxels=use_voxels,
630
+ pos_args=pos_args,
631
+ offset_args=offset_args,
632
+ **rot_args
633
+ )
634
 
635
  # Initialize Plotter
636
  plotter = pv.Plotter(off_screen=off_screen, window_size=output_size)
 
818
  parser.add_argument("--pos-leg-right", type=float, nargs=3, help="Right leg position")
819
  parser.add_argument("--pos-leg-left", type=float, nargs=3, help="Left leg position")
820
 
821
+ parser.add_argument("--offset-head", type=float, nargs=3, help="Head offset (x y z)")
822
+ parser.add_argument("--offset-body", type=float, nargs=3, help="Body offset (x y z)")
823
+ parser.add_argument("--offset-arm-right", type=float, nargs=3, help="Right arm offset (x y z)")
824
+ parser.add_argument("--offset-arm-left", type=float, nargs=3, help="Left arm offset (x y z)")
825
+ parser.add_argument("--offset-leg-right", type=float, nargs=3, help="Right leg offset (x y z)")
826
+ parser.add_argument("--offset-leg-left", type=float, nargs=3, help="Left leg offset (x y z)")
827
+
828
  parser.add_argument("--save", type=str, help="Save screenshot to file")
829
  parser.add_argument("--bg", type=float, nargs=3, default=[1/255, 254/255, 1/255], help="Background color (r g b)")
830
  parser.add_argument("--light-pos", type=float, nargs=3, default=[0, 30, 30], help="Initial light position (x y z)")
 
849
  if args.pos_leg_right: pos_args['right_leg'] = tuple(args.pos_leg_right)
850
  if args.pos_leg_left: pos_args['left_leg'] = tuple(args.pos_leg_left)
851
 
852
+ offset_args = {}
853
+ if args.offset_head: offset_args['head'] = tuple(args.offset_head)
854
+ if args.offset_body: offset_args['body'] = tuple(args.offset_body)
855
+ if args.offset_arm_right: offset_args['right_arm'] = tuple(args.offset_arm_right)
856
+ if args.offset_arm_left: offset_args['left_arm'] = tuple(args.offset_arm_left)
857
+ if args.offset_leg_right: offset_args['right_leg'] = tuple(args.offset_leg_right)
858
+ if args.offset_leg_left: offset_args['left_leg'] = tuple(args.offset_leg_left)
859
+
860
  skin = load_skin(args.skin_path)
861
 
862
  render_skin(
 
867
  ortho=args.ortho,
868
  rot_args=rot_args,
869
  pos_args=pos_args,
870
+ offset_args=offset_args,
871
  save_path=args.save,
872
  bg=args.bg,
873
  light=args.light,