Hiero: publish with retiming

openpype/hosts/hiero/api/lib.py

@@ -214,7 +214,9 @@ def get_track_items(
  # add all if no track_type is defined
  return_list.append(track_item)
 
- return return_list
+ # return output list but make sure all items are TrackItems
+ return [_i for _i in return_list
+ if type(_i) == hiero.core.TrackItem]
 
 
 def get_track_item_pype_tag(track_item):

openpype/hosts/hiero/otio/hiero_export.py

@@ -198,7 +198,8 @@ def create_otio_markers(otio_item, item):
 def create_otio_clip(track_item):
  clip = track_item.source()
  source_in = track_item.sourceIn()
- duration = track_item.sourceDuration()
+ speed = track_item.playbackSpeed()
+ duration = int(track_item.sourceDuration() / speed)
  fps = utils.get_rate(track_item) or self.project_fps
  name = track_item.name()
 

openpype/hosts/hiero/plugins/publish_old_workflow/extract_clip_effects.py → openpype/hosts/hiero/plugins/publish/extract_clip_effects.py

@@ -52,10 +52,11 @@ def process(self, instance):
  instance.data["representations"] = list()
 
  transfer_data = [
- "handleStart", "handleEnd", "sourceIn", "sourceOut",
- "frameStart", "frameEnd", "sourceInH", "sourceOutH",
- "clipIn", "clipOut", "clipInH", "clipOutH", "asset", "track",
- "version"
+ "handleStart", "handleEnd",
+ "sourceStart", "sourceStartH", "sourceEnd", "sourceEndH",
+ "frameStart", "frameEnd",
+ "clipIn", "clipOut", "clipInH", "clipOutH",
+ "asset", "version"
  ]
 
  # pass data to version

openpype/hosts/hiero/plugins/publish_old_workflow/precollect_clip_effects.py → openpype/hosts/hiero/plugins/publish/precollect_clip_effects.py

@@ -5,8 +5,8 @@
 class PreCollectClipEffects(pyblish.api.InstancePlugin):
  """Collect soft effects instances."""
 
- order = pyblish.api.CollectorOrder - 0.508
- label = "Pre-collect Clip Effects Instances"
+ order = pyblish.api.CollectorOrder - 0.579
+ label = "Precollect Clip Effects Instances"
  families = ["clip"]
 
  def process(self, instance):
@@ -24,29 +24,51 @@ def process(self, instance):
  self.clip_in_h = self.clip_in - self.handle_start
  self.clip_out_h = self.clip_out + self.handle_end
 
- track = instance.data["trackItem"]
+ track_item = instance.data["item"]
+ track = track_item.parent()
  track_index = track.trackIndex()
  tracks_effect_items = instance.context.data.get("tracksEffectItems")
  clip_effect_items = instance.data.get("clipEffectItems")
+ speed = track_item.playbackSpeed()
 
  # add clips effects to track's:
  if clip_effect_items:
  tracks_effect_items[track_index] = clip_effect_items
 
+ retime_effect = None
+
+ if speed != 1:
+ retime_effect = True
+
  # process all effects and devide them to instance
  for _track_index, sub_track_items in tracks_effect_items.items():
  # skip if track index is the same as review track index
  if review and review_track_index == _track_index:
  continue
  for sitem in sub_track_items:
+ effect = None
+ # make sure this subtrack item is relative of track item
+ if ((track_item not in sitem.linkedItems())
+ and (len(sitem.linkedItems()) > 0)):
+ continue
+
  if not (track_index <= _track_index):
  continue
 
- effect = self.add_effect(_track_index, sitem)
+ if "TimeWarp" in sitem.name():
+ retime_effect = True
+ else:
+ effect = self.add_effect(_track_index, sitem)
 
  if effect:
  effects.update(effect)
 
+ # switch retime feature
+ if retime_effect:
+ instance.data["families"] += ["retime"]
+ instance.data["label"] = instance.data[
+ "label"].replace("]", ", retime]")
+
  # skip any without effects
  if not effects:
  return
@@ -112,7 +134,12 @@ def add_effect(self, track_index, sitem):
  node = sitem.node()
  node_serialized = self.node_serialisation(node)
  node_name = sitem.name()
- node_class = re.sub(r"\d+", "", node_name)
+
+ if "_" in node_name:
+ node_class = re.sub(r"(?:_)[_0-9]+", "", node_name) # more numbers
+ else:
+ node_class = re.sub(r"\d+", "", node_name) # one number
+
  # collect timelineIn/Out
  effect_t_in = int(sitem.timelineIn())
  effect_t_out = int(sitem.timelineOut())
@@ -121,6 +148,7 @@ def add_effect(self, track_index, sitem):
  return
 
  self.log.debug("node_name: `{}`".format(node_name))
+ self.log.debug("node_class: `{}`".format(node_class))
 
  return {node_name: {
  "class": node_class,
@@ -155,7 +183,7 @@ def node_serialisation(self, node):
  # grab animation including handles
  knob_anim = [node[knob].getValueAt(i)
  for i in range(
- self.clip_in_h, self.clip_in_h + 1)]
+ self.clip_in_h, self.clip_out_h + 1)]
 
  node_serialized[knob] = knob_anim
  else: