studio/flamenco
studio/flamenco
12
30
Fork 38
Code Issues 63 Pull Requests 5 Releases Wiki Activity

WIP: Initial version of a single-frame job compiler #104189

Closed
k8ie wants to merge 26 commits from k8ie/flamenco:single-frame into main
pull from: k8ie/flamenco:single-frame
merge into: studio:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 17 Commits 26 Files Changed 1 +13 -9
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 89935c5865 - Show all commits

22
internal/manager/job_compilers/scripts/single_frame_blender_render.js
View File

@ -102,12 +102,12 @@ bpy.context.scene.cycles.use_denoising = False
render.image_settings.file_format = 'OPEN_EXR_MULTILAYER' render.image_settings.file_format = 'OPEN_EXR_MULTILAYER'
render.use_crop_to_border = True render.use_crop_to_border = True
tile_size_normalized = ${settings.tile_size} / 100 tile_size_decimal = ${settings.tile_size} / 100
render.border_min_x = ${tile.column} * tile_size_normalized render.border_min_x = ${tile.column} * tile_size_decimal
render.border_max_x = tile_size_normalized + ${tile.column} * tile_size_normalized render.border_max_x = tile_size_decimal + ${tile.column} * tile_size_decimal
render.border_min_y = ${tile.row} * tile_size_normalized render.border_min_y = ${tile.row} * tile_size_decimal
render.border_max_y = tile_size_normalized + ${tile.row} * tile_size_normalized`; render.border_max_y = tile_size_decimal + ${tile.row} * tile_size_decimal`;
if (settings.use_denoising) { if (settings.use_denoising) {
pythonExpression += ` pythonExpression += `
for layer in bpy.context.scene.view_layers: for layer in bpy.context.scene.view_layers:
@ -168,17 +168,21 @@ bpy_render.image_settings.file_format = 'OPEN_EXR_MULTILAYER'
bpy_render.filepath = basepath + "MERGED" bpy_render.filepath = basepath + "MERGED"
denoising = "${settings.use_denoising}" == "true" denoising = "${settings.use_denoising}" == "true"
tile_size_decimal = ${settings.tile_size} / 100
# Takes the column and row number and creates a translate node with the right coordinates to align a tile # Takes the column and row number and creates a translate node with the right coordinates to align a tile
def create_translate(dimensions): def create_translate(dimensions):
translate_node = node_tree.nodes.new(type='CompositorNodeTranslate') translate_node = node_tree.nodes.new(type='CompositorNodeTranslate')
translate_node.use_relative = True translate_node.use_relative = True
for dimension in dimensions: for dimension in dimensions:
if dimensions[dimension] == 0: if dimensions[dimension] == 0:
translate_node.inputs[dimension].default_value = normalize(${settings.tile_size} / 100 / 2) translate_node.inputs[dimension].default_value = normalize(tile_size_decimal / 2)
elif dimensions[dimension] == row_max and 100 % ${settings.tile_size} != 0:
translate_node.inputs[dimension].default_value = normalize((${settings.tile_size} / 100 + (dimensions[dimension] - 1) * ${settings.tile_size} / 100) + ((100 % ${settings.tile_size}) / 100) / 2)
else: else:
translate_node.inputs[dimension].default_value = normalize((${settings.tile_size} / 100 + (dimensions[dimension] - 1) * ${settings.tile_size} / 100) + (${settings.tile_size} / 100) / 2) if dimensions[dimension] == row_max and 100 % ${settings.tile_size} != 0:
half_this_tile = ((100 % ${settings.tile_size}) / 100) / 2
else:
half_this_tile = (tile_size_decimal) / 2
translate_node.inputs[dimension].default_value = normalize((tile_size_decimal + (dimensions[dimension] - 1) * tile_size_decimal) + half_this_tile)
return translate_node return translate_node
def align_tiles(input): def align_tiles(input):