Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: simplify renderer script

Browse Source
This commit is contained in:
Mathis Chenuet
2015-03-24 21:41:12 +00:00
committed by Laurent Clouet
parent f58819463f
commit 91f67a99b0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/sheepit/client/Client.java
View File

@@ -512,15 +512,14 @@ public class Client {
protected Error.Type runRenderer(Job ajob) { protected Error.Type runRenderer(Job ajob) {
this.gui.status("Rendering"); this.gui.status("Rendering");
String core_script = ""; String core_script = "import bpy\n" + "bpy.context.user_preferences.system.compute_device_type = \"%s\"\n" + "bpy.context.scene.cycles.device = \"%s\"\n" + "bpy.context.user_preferences.system.compute_device = \"%s\"\n";
if (ajob.getUseGPU() && this.config.getGPUDevice() != null) { if (ajob.getUseGPU() && this.config.getGPUDevice() != null) {
core_script += "import bpy\n" + "bpy.context.user_preferences.system.compute_device_type = \"CUDA\"" + "\n" + "bpy.context.scene.cycles.device = \"GPU\"" + "\n" + "bpy.context.user_preferences.system.compute_device = \"" + this.config.getGPUDevice().getCudaName() + "\"\n"; core_script = String.format(core_script, "CUDA", "GPU", this.config.getGPUDevice().getCudaName());
} }
else { else {
core_script += "import bpy\n" + "bpy.context.user_preferences.system.compute_device_type = \"NONE\"" + "\n" + "bpy.context.scene.cycles.device = \"CPU\"" + "\n"; core_script = String.format(core_script, "NONE", "CPU", "CPU");
} }
int tile_size = this.getTileSize(ajob); core_script += String.format("bpy.context.scene.render.tile_x = %1$d\nbpy.context.scene.render.tile_y = %1$d\n", this.getTileSize(ajob));
core_script += "bpy.context.scene.render.tile_x = " + tile_size + "\n" + "bpy.context.scene.render.tile_y = " + tile_size + "\n";
File script_file = null; File script_file = null;
String command1[] = ajob.getRenderCommand().split(" "); String command1[] = ajob.getRenderCommand().split(" ");
int size_command = command1.length + 2; // + 2 for script int size_command = command1.length + 2; // + 2 for script