Merge pull request #40 from LogicReinc/dev-1.1.2

Dev 1.1.2
LogicReinc · Jun 5, 2022 · dd9a419 · dd9a419
2 parents 1fbb298 + 9aa2483
commit dd9a419
Show file tree

Hide file tree

Showing 34 changed files with 1,009 additions and 500 deletions.
diff --git a/.data/BlendFarm.Server-1.1.1.1-Linux64.zip b/.data/BlendFarm.Server-1.1.1.1-Linux64.zip
diff --git a/.data/announcements.json b/.data/announcements.json
@@ -1,4 +1,34 @@
 [
+	{
+		"Date": "2022-06-04",
+		"Name": "Version 1.1.2 is out! Animation File Formats, OpenSSL3.x Support",
+		"Segments": [
+			{
+				"Type": "Text",
+				"Text": "V1.1.2 restructures some code, and now allows animations to be rendered to specific file formats (eg. EXR). Some formats will not have previews in app. Besides file formats it also updates the runtime to .NET6, which now should support OpenSSL3.x which some Linux distros decided on changing to"
+			},
+			{
+				"Type": "Image",
+				"Text": "https://raw.githubusercontent.com/LogicReinc/LogicReinc.BlendFarm/dev-1.1.2/.data/v112.JPG"
+			},
+			{
+				"Type": "Text",
+				"Text": "If you find BlendFarm productive, please consider dropping a donation on Patreon!"
+			},
+			{
+				"Type": "Button",
+				"Text": "Open Releases|https://github.com/LogicReinc/LogicReinc.BlendFarm/releases"
+			},
+			{
+				"Type": "Button",
+				"Text": "https://raw.githubusercontent.com/LogicReinc/LogicReinc.BlendFarm/dev-1.0.7/.data/patreon.png|https://www.patreon.com/LogicReinc"
+			},
+			{
+				"Type": "Empty",
+				"Text": ""
+			}
+		]
+	},
 	{
 		"Date": "2022-04-27",
 		"Name": "Version 1.1.1 is out! Animation performance improvements",

diff --git a/.data/v112.JPG b/.data/v112.JPG
diff --git a/LogicReinc.BlendFarm.Client/AssemblyInfo.cs b/LogicReinc.BlendFarm.Client/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: Guid("274bf838-c9be-41e7-a14c-75c8575f1f61")]
 
 
-[assembly: AssemblyVersion("1.1.1.0")]
-[assembly: AssemblyFileVersion("1.1.1.0")] 
+[assembly: AssemblyVersion("1.1.2.0")]
+[assembly: AssemblyFileVersion("1.1.2.0")] 
diff --git a/LogicReinc.BlendFarm.Client/BlendFarmManager.cs b/LogicReinc.BlendFarm.Client/BlendFarmManager.cs
@@ -1,4 +1,5 @@
-using LogicReinc.BlendFarm.Shared;
+using LogicReinc.BlendFarm.Client.Tasks;
+using LogicReinc.BlendFarm.Shared;
 using LogicReinc.BlendFarm.Shared.Communication.RenderNode;
 using System;
 using System.Collections.Generic;
@@ -518,10 +519,10 @@ await Task.WhenAll(Nodes.ToList().Select(async node =>
         /// <summary>
         /// Creates a RenderTask for the currently connected nodes, not yet executed
         /// </summary>
-        public RenderTask GetRenderTask(string file, RenderManagerSettings settings = null, Action<RenderSubTask, Bitmap> onResultUpdated = null, Action<RenderSubTask, Bitmap> onTileReceived = null)
+        public RenderTask GetImageTask(string file, RenderManagerSettings settings = null, Action<RenderSubTask, Image> onResultUpdated = null, Action<RenderSubTask, Image> onTileReceived = null)
         {
             BlendFarmFileSession session = GetOrCreateSession(file);
-            CurrentTask = new RenderTask(Nodes.ToList(), session.SessionID, Version, session.FileID, settings);
+            CurrentTask = RenderTask.GetImageRenderTask(Nodes.ToList(), session.SessionID, Version, session.FileID, settings);
 
             if (onResultUpdated != null)
                 CurrentTask.OnResultUpdated += onResultUpdated;
@@ -531,6 +532,17 @@ public RenderTask GetRenderTask(string file, RenderManagerSettings settings = nu
             return CurrentTask;
         }
 
+        public RenderTask GetAnimationTask(string file, int start, int end,RenderManagerSettings settings = null, Action<RenderSubTask, SubTaskResult> onResult = null)
+        {
+            BlendFarmFileSession session = GetOrCreateSession(file);
+            CurrentTask = new AnimationTask(Nodes.ToList(), session.SessionID, Version, session.FileID, start, end, settings);
+
+            if (onResult != null)
+                ((AnimationTask)CurrentTask).OnFrameResult += onResult;
+
+            return CurrentTask;
+        }
+
         public void SetSelectedSessionID(string sessionID)
         {
             SelectedSessionID = sessionID;
@@ -546,15 +558,19 @@ public void ClearLastTask()
         /// <summary>
         /// Render with provided settings on connected prepared nodes
         /// </summary>
-        public async Task<Bitmap> Render(string file, RenderManagerSettings settings = null, Action<RenderSubTask, Bitmap> onResultUpdated = null, Action<RenderSubTask, Bitmap> onTileReceived = null)
+        public async Task<Image> Render(string file, RenderManagerSettings settings = null, Action<RenderSubTask, Image> onResultUpdated = null, Action<RenderSubTask, Image> onTileReceived = null)
         {
             if (CurrentTask != null)
                 throw new InvalidOperationException("Already rendering..");
             try
             {
-                CurrentTask = GetRenderTask(file, settings, onResultUpdated, onTileReceived);
+                CurrentTask = GetImageTask(file, settings, onResultUpdated, onTileReceived);
+
+                await CurrentTask.Render();
+
+                Image bitmap = ((CurrentTask is IImageTask) ? (IImageTask)CurrentTask : null)?.FinalImage;
 
-                return await CurrentTask.Render();
+                return bitmap;
             }
             finally
             {

diff --git a/LogicReinc.BlendFarm.Client/ImageTypes/DefaultImageConverter.cs b/LogicReinc.BlendFarm.Client/ImageTypes/DefaultImageConverter.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LogicReinc.BlendFarm.Client.ImageTypes
+{
+    public class DefaultImageConverter : IImageConverter
+    {
+        public Image FromStream(Stream str)
+        {
+            return new Bitmap(Bitmap.FromStream(str));
+        }
+    }
+}
diff --git a/LogicReinc.BlendFarm.Client/ImageTypes/IImageConverter.cs b/LogicReinc.BlendFarm.Client/ImageTypes/IImageConverter.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LogicReinc.BlendFarm.Client.ImageTypes
+{
+    public static class ImageConverter
+    {
+        public static DefaultImageConverter Default { get; } = new DefaultImageConverter();
+
+        public static Image Convert(byte[] bytes, string format)
+        {
+            using (MemoryStream str = new MemoryStream(bytes))
+                return Convert(str, format);
+        }
+        public static Image Convert(Stream str, string format)
+        {
+            format = format.ToUpper().Trim();
+            switch (format)
+            {
+                case "":
+                case "BMP":
+                case "PNG":
+                case "JPEG":
+                case "TIFF":
+                    return Default.FromStream(str);
+                default:
+                    return null;
+            }
+        }
+    }
+
+    public interface IImageConverter
+    {
+        Image FromStream(Stream str);
+    }
+}
diff --git a/LogicReinc.BlendFarm.Client/ImageTypes/ImageFormats.cs b/LogicReinc.BlendFarm.Client/ImageTypes/ImageFormats.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace LogicReinc.BlendFarm.Client.ImageTypes
+{
+    public class ImageFormats
+    {
+        public static string[] Formats = new string[] { "BMP", "PNG", "JPEG", "JPEG2000", "TARGA", "TARGA_RAW", "CINEON", "DPX", "OPEN_EXR_MULTILAYER", "OPEN_EXR", "HDR", "TIFF" };
+        public static string[] Extensions => _extensions.Values.ToArray();
+        private static Dictionary<string, string> _extensions = new Dictionary<string, string>()
+        {
+            { "BMP", "bmp" },
+            { "PNG", "png" },
+            { "JPEG", "jpg"},
+            { "JPEG2000", "jpg"},
+            { "TARGA", "tga"},
+            { "TARGA_RAW", "tga" },
+            { "CINEON", "cin" },
+            { "DPX", "dpx" },
+            { "OPEN_EXR_MULTILAYER", "exr"},
+            { "OPEN_EXR", "exr"},
+            { "HDR", "hdr" },
+            { "TIFF", "tif"}
+        };
+
+        public static string GetExtension(String format)
+        {
+            if (_extensions.ContainsKey(format))
+                return _extensions[format];
+            return null;
+        }
+    }
+}
diff --git a/LogicReinc.BlendFarm.Client/RenderManagerSettings.cs b/LogicReinc.BlendFarm.Client/RenderManagerSettings.cs
@@ -69,6 +69,11 @@ public class RenderManagerSettings
         /// </summary>
         public EngineType Engine { get; set; } = EngineType.Cycles;
 
+        /// <summary>
+        /// Format to render to
+        /// </summary>
+        public string RenderFormat { get; set; } = "";
+
         /// <summary>
         /// A sad requirement that works around a problem in Blender.
         /// Blender doesn't properly update before rendering in subsequent tasks in a batch

diff --git a/LogicReinc.BlendFarm.Client/RenderSubTask.cs b/LogicReinc.BlendFarm.Client/RenderSubTask.cs
@@ -1,4 +1,5 @@
-using LogicReinc.BlendFarm.Shared;
+using LogicReinc.BlendFarm.Client.Tasks;
+using LogicReinc.BlendFarm.Shared;
 using LogicReinc.BlendFarm.Shared.Communication.RenderNode;
 using System;
 using System.Collections.Generic;
@@ -112,7 +113,8 @@ public RenderPacketModel ToRenderPacketModel()
                 TaskID = ID,
                 Engine = Parent.Settings.Engine,
                 Workaround = Parent.Settings.BlenderUpdateBugWorkaround,
-                Crop = Crop || Parent.Settings.BlenderUpdateBugWorkaround
+                Crop = Crop || Parent.Settings.BlenderUpdateBugWorkaround,
+                RenderFormat = (Parent is AnimationTask) ? Parent.Settings.RenderFormat : ""
             };
         }
     }