Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for COLLADA, FBX and STL formats #1136

Merged
merged 1 commit into from
Nov 14, 2022
Merged

Add support for COLLADA, FBX and STL formats #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Bonsai.Shaders.Rendering/Bonsai.Shaders.Rendering.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Description>Bonsai Shaders Rendering Library containing modules for rendering complex 3D scenes.</Description>
<PackageTags>Bonsai Rx Shaders Rendering Assets Graphics OpenGL</PackageTags>
<TargetFramework>net462</TargetFramework>
<VersionPrefix>0.3.0</VersionPrefix>
<VersionPrefix>0.3.1</VersionPrefix>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AssimpNet" Version="4.1.0" />
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.Shaders.Rendering/SceneConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class SceneConfiguration
/// </summary>
[TypeConverter(typeof(ResourceFileNameConverter))]
[Editor(DesignTypes.OpenFileNameEditor, DesignTypes.UITypeEditor)]
[FileNameFilter("Blender Files (*.blend)|*.blend|OBJ Files (*.obj)|*.obj|All Files|*.*")]
[FileNameFilter("COLLADA Files (*.dae)|*.dae|Blender Files (*.blend)|*.blend|FBX Files (*.fbx)|*.fbx|OBJ Files (*.obj)|*.obj|STL Files (*.stl)|*.stl|All Files|*.*")]
[Description("The name of the file from which to load the scene.")]
public string FileName { get; set; }

Expand Down