Merge branch 'develop' into app/polar

FUSEEProjectTeam · Mar 21, 2024 · 9be1457 · 9be1457
2 parents c968834 + f54a8da
commit 9be1457
Show file tree

Hide file tree

Showing 160 changed files with 1,354 additions and 1,020 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -202,6 +202,19 @@ dotnet_naming_style.begins_with_i.capitalization = pascal_case
 csharp_style_namespace_declarations = block_scoped:silent
 csharp_style_prefer_method_group_conversion = true:silent
 csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_readonly_struct = true:suggestion
+csharp_style_prefer_readonly_struct_member = true:suggestion
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent
+csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
+csharp_style_prefer_utf8_string_literals = true:suggestion
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:suggestion
+csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_style_prefer_pattern_matching = true:silent
 
 [*.{cs,vb}]
 dotnet_style_operator_placement_when_wrapping = beginning_of_line
@@ -211,10 +224,26 @@ end_of_line = crlf
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
-dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_readonly_field = true:suggestion
+dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
+dotnet_style_allow_multiple_blank_lines_experimental = true:silent
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_predefined_type_for_member_access = true:silent
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_namespace_match_folder = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 dotnet_style_object_initializer = true:suggestion
 dotnet_style_collection_initializer = true:suggestion
-dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
-dotnet_style_prefer_conditional_expression_over_assignment = true:silent
-dotnet_style_prefer_conditional_expression_over_return = true:silent
-dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_code_quality_unused_parameters = all:suggestion
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
diff --git a/Examples/Complete/AdvancedUI/Core/AdvancedUI.cs b/Examples/Complete/AdvancedUI/Core/AdvancedUI.cs
@@ -36,7 +36,7 @@ public class AdvancedUI : RenderCanvas
         private SceneInteractionHandler _sih;
         private SceneNode _camNode;
         private Transform _mainCamPivot;
-        private Camera _mainCam = new(ProjectionMethod.Perspective, 0.1f, 1000, M.PiOver4)
+        private readonly Camera _mainCam = new(ProjectionMethod.Perspective, 0.1f, 1000, M.PiOver4)
         {
             BackgroundColor = new float4(0.1f, 0.1f, 0.1f, 1)
         };

diff --git a/Examples/Complete/Integrations/Wpf/Model/FpsModel.cs b/Examples/Complete/Integrations/Wpf/Model/FpsModel.cs
@@ -2,7 +2,7 @@
 
 namespace Fusee.Examples.Integrations.Wpf.Model
 {
-    class FpsModel : INotifyPropertyChanged
+    internal class FpsModel : INotifyPropertyChanged
     {
         private float _fps;
 

diff --git a/Examples/Complete/Integrations/Wpf/Model/VSyncModel.cs b/Examples/Complete/Integrations/Wpf/Model/VSyncModel.cs
@@ -2,7 +2,7 @@
 
 namespace Fusee.Examples.Integrations.Wpf.Model
 {
-    class VSyncModel : INotifyPropertyChanged
+    internal class VSyncModel : INotifyPropertyChanged
     {
         private bool _vsync;
 

diff --git a/Examples/Complete/Integrations/Wpf/ViewModel/MainViewModel.cs b/Examples/Complete/Integrations/Wpf/ViewModel/MainViewModel.cs
@@ -2,7 +2,7 @@
 
 namespace Fusee.Examples.Integrations.Wpf.ViewModel
 {
-    class MainViewModel
+    internal class MainViewModel
     {
         public PositionModel Position { get; set; }
         public FpsModel Fps { get; set; }

diff --git a/Examples/Complete/PickingRayCast/Core/PickingRayCast.cs b/Examples/Complete/PickingRayCast/Core/PickingRayCast.cs
@@ -200,7 +200,7 @@ public override void RenderAFrame()
             Present();
         }
 
-        private SceneContainer CreateScene()
+        private static SceneContainer CreateScene()
         {
             var scene = new SceneContainer
             {

diff --git a/Examples/Complete/PointCloudPotree2/Core/PointCloudPotree2Core.cs b/Examples/Complete/PointCloudPotree2/Core/PointCloudPotree2Core.cs
@@ -60,7 +60,7 @@ public bool ClosingRequested
         private PointCloudComponent _pointCloud;
         private SceneNode _pointCloudNode;
         private SceneNode _camNode;
-        private Potree2Reader _potreeReader;
+        private readonly Potree2Reader _potreeReader;
         private PotreeData _potreeData;
 
         private ScenePicker _picker;