190607 c1

- Add Pilz.Drawing.Drawing3D.OpenGLFactory
- Fix small bugs in Pilz.UI.PaintingControl

Pilz.Simple3DFileParser/Other/Exceptions.vb

@@ -0,0 +1,14 @@
+Namespace Exceptions
+
+    Public Class MaterialException
+        Inherits Exception
+
+        Public Sub New()
+            MyBase.New
+        End Sub
+        Public Sub New(message As String)
+            MyBase.New(message)
+        End Sub
+    End Class
+
+End Namespace

Pilz.Simple3DFileParser/Other/Extensions.vb

@@ -0,0 +1,26 @@
+Imports System.IO
+Imports System.Runtime.CompilerServices
+
+Friend Module Extensions
+
+    <Extension>
+    Public Function GetPropertyValue(base As Object, propertyName As String) As Object
+        Return base?.GetType.GetProperty(propertyName, Reflection.BindingFlags.Public Or Reflection.BindingFlags.NonPublic Or Reflection.BindingFlags.Instance Or Reflection.BindingFlags.Static)?.GetValue(base)
+    End Function
+
+    <Extension>
+    Public Function IsTheSameAs(base As Bitmap, image As Bitmap) As Boolean
+        If base.Size <> image.Size Then Return False
+
+        For y As Integer = 0 To base.Height - 1
+            For x As Integer = 0 To base.Width - 1
+                Dim p1 As Color = base.GetPixel(x, y)
+                Dim p2 As Color = image.GetPixel(x, y)
+                If p1 <> p2 Then Return False
+            Next
+        Next
+
+        Return True
+    End Function
+
+End Module

Pilz.Simple3DFileParser/Other/LoaderModule.vb

@@ -0,0 +1,144 @@
+Imports System.Reflection
+Imports Assimp.Unmanaged
+
+Public Class File3DLoaderModule
+
+    Public Delegate Function LoaderAction(fileName As String, options As LoaderOptions) As Object3D
+    Public Delegate Sub ExporterAction(obj As Object3D, fileName As String)
+
+    Private Shared _LoaderModules As File3DLoaderModule() = Nothing
+    Private Shared _ExporterModules As File3DLoaderModule() = Nothing
+
+    Private ReadOnly method As [Delegate] = Nothing
+    Public ReadOnly Property Name As String
+    Public ReadOnly Property SupportedFormats As IReadOnlyDictionary(Of String, String)
+
+    Public Sub New(name As String, method As LoaderAction, supportedFormats As IReadOnlyDictionary(Of String, String))
+        Me.Name = name
+        Me.method = method
+        Me.SupportedFormats = supportedFormats
+    End Sub
+
+    Public Sub New(name As String, method As ExporterAction, supportedFormats As IReadOnlyDictionary(Of String, String))
+        Me.Name = name
+        Me.method = method
+        Me.SupportedFormats = supportedFormats
+    End Sub
+
+    Public Function InvokeAsync(obj As Object3D, fileName As String) As Task
+        Return Task.Run(Sub() Invoke(obj, fileName))
+    End Function
+
+    Public Sub Invoke(obj As Object3D, fileName As String)
+        method.Method.Invoke(Nothing, {obj, fileName})
+    End Sub
+
+    Public Function InvokeAsync(fileName As String, options As LoaderOptions) As Task(Of Object3D)
+        Return Task.Run(Function() Invoke(fileName, options))
+    End Function
+
+    Public Function Invoke(fileName As String, options As LoaderOptions) As Object3D
+        Return method.Method.Invoke(Nothing, {fileName, options})
+    End Function
+
+    Public Shared ReadOnly Property LoaderModules As File3DLoaderModule()
+        Get
+            If _LoaderModules Is Nothing Then
+                _LoaderModules = GetLoaderModules()
+            End If
+            Return _LoaderModules
+        End Get
+    End Property
+
+    Public Shared ReadOnly Property ExporterModules As File3DLoaderModule()
+        Get
+            If _ExporterModules Is Nothing Then
+                _ExporterModules = GetExporterModules()
+            End If
+            Return _ExporterModules
+        End Get
+    End Property
+
+    Private Shared Function GetLoaderModules() As File3DLoaderModule()
+        Dim list As New List(Of File3DLoaderModule)
+
+        list.Add(New File3DLoaderModule("Simple File Parser",
+                                  AddressOf LoadViaSimpleFileParser,
+                                  New Dictionary(Of String, String) From {{"obj", "OBJ"}}))
+
+        AssimpModule.AssimpLoader.LoadAssimpLibs()
+        Dim exts As New Dictionary(Of String, String)
+        For Each fd As Assimp.ExportFormatDescription In AssimpLibrary.Instance.GetExportFormatDescriptions
+            If Not exts.ContainsKey(fd.FileExtension) Then exts.Add(fd.FileExtension, fd.FormatId & " - " & fd.Description)
+        Next
+
+        list.Add(New File3DLoaderModule("Assimp",
+                                  AddressOf LoadViaAssimp,
+                                  exts))
+
+        list.Add(New File3DLoaderModule("Aspose.3D",
+                                   AddressOf LoadViaAspose3D,
+                                   New Dictionary(Of String, String) From {
+                                   {"obj", "OBJ"},
+                                   {"dae", "DAE"},
+                                   {"fbx", "FBX"},
+                                   {"stl", "STL"},
+                                   {"3ds", "3DS"},
+                                   {"3d", "3D"},
+                                   {"gltf", "glTF"},
+                                   {"drc", "DRC"},
+                                   {"rvm", "RVM"},
+                                   {"pdf", "PDF"},
+                                   {"x", "X"},
+                                   {"jt", "JT"},
+                                   {"dfx", "DFX"},
+                                   {"ply", "PLY"},
+                                   {"3mf", "3MF"},
+                                   {"ase", "ASE"}}))
+
+        Return list.ToArray
+    End Function
+
+    Private Shared Function GetExporterModules() As File3DLoaderModule()
+        Dim list As New List(Of File3DLoaderModule)
+
+        list.Add(New File3DLoaderModule("Simple File Parser",
+                                 AddressOf ExportViaSimpleFileParser,
+                                  New Dictionary(Of String, String) From {{"obj", "OBJ"}}))
+
+        AssimpModule.AssimpLoader.LoadAssimpLibs()
+        Dim exts As New Dictionary(Of String, String)
+        For Each fd As Assimp.ExportFormatDescription In AssimpLibrary.Instance.GetExportFormatDescriptions
+            If Not exts.ContainsKey(fd.FileExtension) Then exts.Add(fd.FileExtension, fd.FormatId & " - " & fd.Description)
+        Next
+
+        list.Add(New File3DLoaderModule("Assimp",
+                                  AddressOf ExportViaAssimp,
+                                  exts))
+
+        Return list.ToArray
+    End Function
+
+    Private Shared Function LoadViaSimpleFileParser(fileName As String, options As LoaderOptions) As Object3D
+        Return ObjModule.ObjFile.FromFile(fileName, options.LoadMaterials, options.UpAxis)
+    End Function
+
+    Private Shared Function LoadViaAssimp(fileName As String, options As LoaderOptions) As Object3D
+        AssimpModule.AssimpLoader.LoadAssimpLibs()
+        Return AssimpModule.AssimpLoader.FromFile(fileName, options.LoadMaterials, options.UpAxis)
+    End Function
+
+    Private Shared Function LoadViaAspose3D(fileName As String, options As LoaderOptions) As Object3D
+        Return Aspose3DModule.Aspose3DLoader.FromFile(fileName, options.LoadMaterials, options.UpAxis)
+    End Function
+
+    Private Shared Sub ExportViaSimpleFileParser(o As Object3D, fileName As String)
+        ObjModule.ObjFile.ToFile(fileName, o)
+    End Sub
+
+    Private Shared Sub ExportViaAssimp(o As Object3D, fileName As String)
+        AssimpModule.AssimpLoader.LoadAssimpLibs()
+        AssimpModule.AssimpLoader.ToFile(fileName, o)
+    End Sub
+
+End Class

Pilz.Simple3DFileParser/Other/LoaderOptions.vb

@@ -0,0 +1,14 @@
+Public Class LoaderOptions
+
+    Public Property LoadMaterials As Boolean = False
+    Public Property UpAxis As UpAxis = False
+
+    Public Sub New()
+    End Sub
+
+    Public Sub New(loadMaterials As Boolean, upAxis As UpAxis)
+        Me.LoadMaterials = loadMaterials
+        Me.UpAxis = upAxis
+    End Sub
+
+End Class