brett/Zordon
1
0
Fork 0
mirror of https://github.com/blw1138/Zordon.git synced 2025-12-17 16:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add submit job to HTML page

Browse Source
This commit is contained in:
Brett Williams
2022-12-10 16:16:37 -08:00
parent d0b14fc001
commit 10dd5b4295
6 changed files with 276 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
utilities/blender_worker.py
View File

@@ -10,8 +10,8 @@ class BlenderRenderWorker(BaseRenderWorker):
render_engine = 'blender'
supported_extensions = ['.blend']
install_paths = ['/Applications/Blender.app/Contents/MacOS/Blender']
supported_export_formats = ['TGA', 'RAWTGA', 'JPEG', 'IRIS', 'IRIZ', 'AVIRAW', 'AVIJPEG', 'PNG', 'BMP', 'HDR', 'TIFF',
'OPEN_EXR', 'OPEN_EXR_MULTILAYER', 'MPEG', 'CINEON', 'DPX', 'DDS', 'JP2']
supported_export_formats = ['TGA', 'RAWTGA', 'JPEG', 'IRIS', 'IRIZ', 'AVIRAW', 'AVIJPEG', 'PNG', 'BMP', 'HDR',
'TIFF', 'OPEN_EXR', 'OPEN_EXR_MULTILAYER', 'MPEG', 'CINEON', 'DPX', 'DDS', 'JP2']
def __init__(self, input_path, output_path, args=None):
super(BlenderRenderWorker, self).__init__(input_path=input_path, output_path=output_path,
@@ -29,10 +29,9 @@ class BlenderRenderWorker(BaseRenderWorker):
# Scene Info
self.scene_info = get_scene_info(input_path)
self.total_frames = int(self.scene_info.get('frame_end', 0))
self.total_frames = (int(self.scene_info.get('frame_end', 0)) - int(self.scene_info.get('frame_start', 0)) + 1) \
if self.render_all_frames else 1
self.current_frame = int(self.scene_info.get('frame_start', 0))
self.resolution = {'x': int(self.scene_info.get('resolution_x', 0)),
'y': int(self.scene_info.get('resolution_y', 0))}
@classmethod
def version(cls):
@@ -61,6 +60,11 @@ class BlenderRenderWorker(BaseRenderWorker):
# all frames or single
cmd.extend(['-a'] if self.render_all_frames else ['-f', str(self.frame_to_render)])
# Convert raw args from string if available
raw_args = self.args.get('raw', None)
if raw_args:
cmd.extend(raw_args.split(' '))
return cmd
def _parse_stdout(self, line):

9
utilities/ffmpeg_worker.py
View File

@@ -43,9 +43,14 @@ class FFMPEGRenderWorker(BaseRenderWorker):
cmd = [self.renderer_path(), '-y', '-stats', '-i', self.input_path]
if self.args:
cmd.extend(self.args)
cmd.append(self.output_path)
cmd.extend([x for x in self.args if x != 'raw'])
# Convert raw args from string if available
raw_args = self.args.get('raw', None)
print(raw_args)
if raw_args:
cmd.extend(raw_args.split(' '))
cmd.append(self.output_path)
return cmd
def percent_complete(self):