blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simple Blender render: pass frame range in Blender notation

Browse Source 
Pass the frame range in Blender notation (`n..m`) instead of "printer"
notation (`n-m`).
This commit is contained in:
Sybren A. Stüvel 2022-03-17 13:08:37 +01:00
parent 1bcf4139bf
commit 084712baba
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/manager/job_compilers/job_compilers_test.go
View File

@ -90,7 +90,7 @@ func TestSimpleBlenderRenderHappy(t *testing.T) {
expectCliArgs := []interface{}{ // They are strings, but Goja doesn't know that and will produce an []interface{}. expectCliArgs := []interface{}{ // They are strings, but Goja doesn't know that and will produce an []interface{}.
"--render-output", "/render/sprites/farm_output/promo/square_ellie/square_ellie.lighting_light_breakdown2__intermediate-2006-01-02_090405/######", "--render-output", "/render/sprites/farm_output/promo/square_ellie/square_ellie.lighting_light_breakdown2__intermediate-2006-01-02_090405/######",
"--render-format", settings["format"].(string), "--render-format", settings["format"].(string),
"--render-frame", "1-3", "--render-frame", "1..3",
} }
assert.NotEmpty(t, t0.UUID) assert.NotEmpty(t, t0.UUID)
assert.Equal(t, "render-1-3", t0.Name) assert.Equal(t, "render-1-3", t0.Name)
@ -172,7 +172,7 @@ func TestSimpleBlenderRenderWindowsPaths(t *testing.T) {
// The render output is constructed by the job compiler, and thus transforms to forward slashes. // The render output is constructed by the job compiler, and thus transforms to forward slashes.
"--render-output", "R:/sprites/farm_output/promo/square_ellie/square_ellie.lighting_light_breakdown2__intermediate-2006-01-02_090405/######", "--render-output", "R:/sprites/farm_output/promo/square_ellie/square_ellie.lighting_light_breakdown2__intermediate-2006-01-02_090405/######",
"--render-format", settings["format"].(string), "--render-format", settings["format"].(string),
"--render-frame", "1-3", "--render-frame", "1..3",
} }
assert.NotEmpty(t, t0.UUID) assert.NotEmpty(t, t0.UUID)
assert.Equal(t, "render-1-3", t0.Name) assert.Equal(t, "render-1-3", t0.Name)
@ -227,7 +227,7 @@ func TestSimpleBlenderRenderOutputPathFieldReplacement(t *testing.T) {
expectCliArgs := []interface{}{ // They are strings, but Goja doesn't know that and will produce an []interface{}. expectCliArgs := []interface{}{ // They are strings, but Goja doesn't know that and will produce an []interface{}.
"--render-output", "/root/2006-01-02_090405/jobname__intermediate-2006-01-02_090405/######", "--render-output", "/root/2006-01-02_090405/jobname__intermediate-2006-01-02_090405/######",
"--render-format", sj.Settings.AdditionalProperties["format"].(string), "--render-format", sj.Settings.AdditionalProperties["format"].(string),
"--render-frame", "1-3", "--render-frame", "1..3",
} }
assert.EqualValues(t, AuthoredCommandParameters{ assert.EqualValues(t, AuthoredCommandParameters{
"exe": "{blender}", "exe": "{blender}",

2
internal/manager/job_compilers/scripts/simple_blender_render.js
View File

@ -118,7 +118,7 @@ function authorRenderTasks(settings, renderDir, renderOutput) {
args: [ args: [
"--render-output", path.join(renderDir, path.basename(renderOutput)), "--render-output", path.join(renderDir, path.basename(renderOutput)),
"--render-format", settings.format, "--render-format", settings.format,
"--render-frame", chunk, "--render-frame", chunk.replace("-", ".."), // Convert to Blender frame range notation.
] ]
}); });
task.addCommand(command); task.addCommand(command);