Pilz.NET/Pilz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

d

Browse Source
This commit is contained in:
Pascal
2020-01-03 14:32:45 +01:00
parent f4bf6c4066
commit a60bb85aa7
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Pilz.Simple3DFileParser/FileParser/AssimpLoader.vb
View File

@@ -37,12 +37,17 @@ Namespace AssimpModule
Public Class AssimpLoader Public Class AssimpLoader
Public Shared Event LoadingAssimpLibs()
Public Shared Event LoadedAssimpLibs()
Public Shared Property PathToAssimpLib32 As String = "Assimp32.dll" Public Shared Property PathToAssimpLib32 As String = "Assimp32.dll"
Public Shared Property PathToAssimpLib64 As String = "Assimp64.dll" Public Shared Property PathToAssimpLib64 As String = "Assimp64.dll"
Friend Shared Sub LoadAssimpLibs() Friend Shared Sub LoadAssimpLibs()
If Not AssimpLibrary.Instance.IsLibraryLoaded Then If Not AssimpLibrary.Instance.IsLibraryLoaded Then
RaiseEvent LoadingAssimpLibs()
AssimpLibrary.Instance.LoadLibrary(PathToAssimpLib32, PathToAssimpLib64) AssimpLibrary.Instance.LoadLibrary(PathToAssimpLib32, PathToAssimpLib64)
RaiseEvent LoadedAssimpLibs()
End If End If
End Sub End Sub
@@ -200,9 +205,9 @@ Namespace AssimpModule
Dim cc As New ConversionContext(ac.ImportFile(fileName, PostProcessPreset.TargetRealTimeMaximumQuality Or PostProcessSteps.Triangulate), UpAxis) Dim cc As New ConversionContext(ac.ImportFile(fileName, PostProcessPreset.TargetRealTimeMaximumQuality Or PostProcessSteps.Triangulate), UpAxis)
Dim newObj = cc.newObj Dim newObj = cc.NewObj
Dim daeMdl = cc.daeMdl Dim daeMdl = cc.DaeMdl
Dim channelIndicies = cc.channelIndicies Dim channelIndicies = cc.ChannelIndicies
For Each et As EmbeddedTexture In daeMdl.Textures For Each et As EmbeddedTexture In daeMdl.Textures
If et.HasCompressedData Then If et.HasCompressedData Then

6
Pilz.Simple3DFileParser/FileParser/Obj.vb
View File

@@ -301,9 +301,9 @@ Namespace ObjModule
Case line.ToLower.StartsWith("kd ") Case line.ToLower.StartsWith("kd ")
Dim splitColor() As String = line.Substring(3).Split(" "c) Dim splitColor() As String = line.Substring(3).Split(" "c)
Dim col As Color = Color.FromArgb( Dim col As Color = Color.FromArgb(
Convert.ToSingle(Math.Round(255 * splitColor(0))), Convert.ToSingle(Math.Round(CInt(splitColor(0)))),
Convert.ToSingle(Math.Round(255 * splitColor(1))), Convert.ToSingle(Math.Round(CInt(splitColor(1)))),
Convert.ToSingle(Math.Round(255 * splitColor(2)))) Convert.ToSingle(Math.Round(CInt(splitColor(2)))))
curMat.Color = col curMat.Color = col
Case line.ToLower.StartsWith("d ") Case line.ToLower.StartsWith("d ")