diff --git a/src/com/sheepit/client/Job.java b/src/com/sheepit/client/Job.java index b954d20..cab9fbf 100644 --- a/src/com/sheepit/client/Job.java +++ b/src/com/sheepit/client/Job.java @@ -21,6 +21,8 @@ package com.sheepit.client; import java.io.File; +import com.sheepit.client.os.OS; + public class Job { private String numFrame; private String sceneMD5; @@ -165,7 +167,7 @@ public class Job { } public String getRendererPath() { - return getRendererDirectory() + File.separator + "rend.exe"; + return getRendererDirectory() + File.separator + OS.getOS().getRenderBinaryPath(); } public String getRendererArchivePath() { diff --git a/src/com/sheepit/client/os/Linux.java b/src/com/sheepit/client/os/Linux.java index cd07cc9..469d8f7 100644 --- a/src/com/sheepit/client/os/Linux.java +++ b/src/com/sheepit/client/os/Linux.java @@ -41,6 +41,11 @@ public class Linux extends OS { return "linux"; } + @Override + public String getRenderBinaryPath() { + return "rend.exe"; + } + @Override public CPU getCPU() { CPU ret = new CPU(); diff --git a/src/com/sheepit/client/os/Mac.java b/src/com/sheepit/client/os/Mac.java index 7c24b4f..ac8ca87 100644 --- a/src/com/sheepit/client/os/Mac.java +++ b/src/com/sheepit/client/os/Mac.java @@ -19,6 +19,7 @@ package com.sheepit.client.os; import java.io.BufferedReader; +import java.io.File; import java.io.IOException; import java.io.InputStreamReader; @@ -39,6 +40,11 @@ public class Mac extends OS { return "mac"; } + @Override + public String getRenderBinaryPath() { + return "Blender" + File.separator + "blender.app" + File.separator + "Contents" + File.separator + "MacOS" + File.separator + "blender"; + } + @Override public CPU getCPU() { CPU ret = new CPU(); diff --git a/src/com/sheepit/client/os/OS.java b/src/com/sheepit/client/os/OS.java index c343f5d..748cc70 100644 --- a/src/com/sheepit/client/os/OS.java +++ b/src/com/sheepit/client/os/OS.java @@ -31,6 +31,8 @@ public abstract class OS { public abstract int getMemory(); + public abstract String getRenderBinaryPath(); + public String getCUDALib() { return null; } diff --git a/src/com/sheepit/client/os/Windows.java b/src/com/sheepit/client/os/Windows.java index fd450f8..779438a 100644 --- a/src/com/sheepit/client/os/Windows.java +++ b/src/com/sheepit/client/os/Windows.java @@ -35,6 +35,11 @@ public class Windows extends OS { return "windows"; } + @Override + public String getRenderBinaryPath() { + return "rend.exe"; + } + @Override public CPU getCPU() { CPU ret = new CPU();