[BMSPT-283] added nullable Orthogonal and Perspective camera in Visinfo

bimspot · Sep 6, 2024 · 7c099c7 · 7c099c7
1 parent 93499c1
commit 7c099c7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/bcf-toolkit.sln.DotSettings.user b/bcf-toolkit.sln.DotSettings.user
@@ -1,7 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/Environment/Highlighting/HighlightingSourceSnapshotLocation/@EntryValue">/Users/balintbende/Library/Caches/JetBrains/Rider2024.1/resharper-host/temp/Rider/vAny/CoverageData/_bcf-toolkit.-1315391344/Snapshot/snapshot.utdcvr</s:String>
-
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=ce6cac48_002Dfd40_002D4399_002Da762_002D627e588909fc/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=5c6b8aad_002D6497_002D435b_002D9344_002D7fb70eae79ba/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
   &lt;Solution /&gt;
 &lt;/SessionState&gt;</s:String>
 
@@ -76,6 +75,8 @@
 
 
 
+
+
 
 
 

diff --git a/src/bcf-toolkit/Model/Bcf21/VisInfo.cs b/src/bcf-toolkit/Model/Bcf21/VisInfo.cs
@@ -621,10 +621,12 @@ public partial class VisualizationInfo
         public Components Components { get; set; }
 
         [System.Xml.Serialization.XmlElementAttribute("OrthogonalCamera")]
-        public OrthogonalCamera OrthogonalCamera { get; set; }
+#nullable enable
+        public OrthogonalCamera? OrthogonalCamera { get; set; }
 
         [System.Xml.Serialization.XmlElementAttribute("PerspectiveCamera")]
-        public PerspectiveCamera PerspectiveCamera { get; set; }
+        public PerspectiveCamera? PerspectiveCamera { get; set; }
+#nullable disable
 
         [System.Xml.Serialization.XmlIgnoreAttribute()]
         private System.Collections.ObjectModel.Collection<Line> _lines;

diff --git a/src/bcf-toolkit/Model/Bcf30/Visinfo.cs b/src/bcf-toolkit/Model/Bcf30/Visinfo.cs
@@ -684,11 +684,13 @@ public partial class VisualizationInfo
         [System.Xml.Serialization.XmlElementAttribute("Components")]
         public Components Components { get; set; }
 
+#nullable enable
         [System.Xml.Serialization.XmlElementAttribute("OrthogonalCamera")]
-        public OrthogonalCamera OrthogonalCamera { get; set; }
+        public OrthogonalCamera? OrthogonalCamera { get; set; }
 
         [System.Xml.Serialization.XmlElementAttribute("PerspectiveCamera")]
-        public PerspectiveCamera PerspectiveCamera { get; set; }
+        public PerspectiveCamera? PerspectiveCamera { get; set; }
+#nullable disable
 
         [System.Xml.Serialization.XmlIgnoreAttribute()]
         private System.Collections.ObjectModel.Collection<Line> _lines;

diff --git a/src/tests/Converter/Bcf30/ConverterTests.cs b/src/tests/Converter/Bcf30/ConverterTests.cs
@@ -49,6 +49,9 @@ public void BcfToJsonSampleFilesTest() {
     _converter.BcfToJson(
       "Resources/Bcf/v3.0/SingleInvisibleWall.bcfzip",
       "Resources/output/json/v3.0/SingleInvisibleWall");
+    _converter.BcfToJson(
+      "Resources/Bcf/v3.0/SingleVisibleWall.bcfzip",
+      "Resources/output/json/v3.0/SingleVisibleWall");
     _converter.BcfToJson(
       "Resources/Bcf/v3.0/TestBcf30.bcfzip",
       "Resources/output/json/v3.0/TestBcf30");

diff --git a/src/tests/Resources/Bcf/v3.0/SingleVisibleWall.bcfzip b/src/tests/Resources/Bcf/v3.0/SingleVisibleWall.bcfzip