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

Merge branch 'feat/disable_viewport' into 'master'

Browse Source 
Add script to disable the viewport.

See merge request sheepitrenderfarm/client!207
This commit is contained in:
harlekin
2023-03-27 15:39:09 +00:00
parent 3f54c82580 fa858f9d92
commit 91daf892af
1 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/main/java/com/sheepit/client/Job.java
View File

@@ -202,6 +202,7 @@ import java.util.regex.Pattern;
} }
core_script += ignore_signal_script; core_script += ignore_signal_script;
File disableViewportScript = null;
File script_file = null; File script_file = null;
String[] command1 = getRendererCommand().split(" "); String[] command1 = getRendererCommand().split(" ");
int size_command = command1.length + 2; // + 2 for script int size_command = command1.length + 2; // + 2 for script
@@ -230,11 +231,62 @@ import java.util.regex.Pattern;
for (String arg : command1) { for (String arg : command1) {
switch (arg) { switch (arg) {
case ".c": case ".c":
command.add("-P");
try {
disableViewportScript = File.createTempFile("optimize_viewport_script_", ".py", configuration.getWorkingDirectory());
File file = new File(disableViewportScript.getAbsolutePath());
FileWriter fwriter;
fwriter = new FileWriter(file);
PrintWriter out = new PrintWriter(fwriter);
out.write("import bpy");
out.write("\n");
out.write("from bpy.app.handlers import persistent");
out.write("\n");
out.write("@persistent");
out.write("\n");
out.write("def hide_stuff(dummy):");
out.write("\n");
out.write("#Hide collections in the viewport");
out.write("\n");
out.write(" for col in bpy.data.collections:");
out.write("\n");
out.write("\n col.hide_viewport = True");
out.write("\n");
out.write(" for obj in bpy.data.objects:");
out.write("\n");
out.write(" #Hide objects in the viewport");
out.write("\n");
out.write(" obj.hide_viewport = True");
out.write("\n");
out.write(" #Hide modifier in the viewport");
out.write("\n");
out.write(" for mod in obj.modifiers:");
out.write("\n");
out.write(" mod.show_viewport = False");
out.write("\n");
out.write("bpy.app.handlers.version_update.append(hide_stuff)");
out.write("\n");
out.close();
command.add(disableViewportScript.getAbsolutePath());
}
catch (IOException e) {
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
for (String logline : configuration.filesystemHealthCheck()) {
log.debug(logline);
}
log.error("Job::render exception on script generation, will return UNKNOWN " + e + " stacktrace " + sw.toString());
return Error.Type.UNKNOWN;
}
command.add(getScenePath()); command.add(getScenePath());
command.add("-P"); command.add("-P");
try { try {
script_file = File.createTempFile("script_", "", configuration.getWorkingDirectory()); script_file = File.createTempFile("script_", ".py", configuration.getWorkingDirectory());
File file = new File(script_file.getAbsolutePath()); File file = new File(script_file.getAbsolutePath());
FileWriter txt; FileWriter txt;
txt = new FileWriter(file); txt = new FileWriter(file);
@@ -391,6 +443,9 @@ import java.util.regex.Pattern;
if (script_file != null) { if (script_file != null) {
script_file.delete(); script_file.delete();
} }
if (disableViewportScript != null) {
disableViewportScript.delete();
}
// Once the process is finished (either finished successfully or with an error) move back to // Once the process is finished (either finished successfully or with an error) move back to
// base icon (isolated S with no progress bar) // base icon (isolated S with no progress bar)
@@ -406,7 +461,9 @@ import java.util.regex.Pattern;
if (script_file != null) { if (script_file != null) {
script_file.delete(); script_file.delete();
} }
if (disableViewportScript != null) {
disableViewportScript.delete();
}
if (process.getRenderDuration() == -1) { if (process.getRenderDuration() == -1) {
if (timeStamp == null) { if (timeStamp == null) {
timeStamp = new Date(process.getStartTime()).toInstant(); timeStamp = new Date(process.getStartTime()).toInstant();
@@ -467,6 +524,9 @@ import java.util.regex.Pattern;
if (script_file != null) { if (script_file != null) {
script_file.delete(); script_file.delete();
} }
if (disableViewportScript != null) {
disableViewportScript.delete();
}
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();
err.printStackTrace(new PrintWriter(sw)); err.printStackTrace(new PrintWriter(sw));
for (String logline : configuration.filesystemHealthCheck()) { for (String logline : configuration.filesystemHealthCheck()) {
@@ -485,7 +545,9 @@ import java.util.regex.Pattern;
if (script_file != null) { if (script_file != null) {
script_file.delete(); script_file.delete();
} }
if (disableViewportScript != null) {
disableViewportScript.delete();
}
// find the picture file // find the picture file
final String filename_without_extension = getPrefixOutputImage() + getFrameNumber(); final String filename_without_extension = getPrefixOutputImage() + getFrameNumber();