Merge fixes

This commit is contained in:
2016-01-14 18:20:51 +01:00
parent 3a4f378ac5
commit 5e721325a4
10 changed files with 85 additions and 79 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
<c:Camera>
<Name>cam</Name>
<FOV>60.0</FOV>
<FOV>45</FOV>
<NearClip>0.01</NearClip>
<FarClip>5000</FarClip>
</c:Camera>
+3 -1
View File
@@ -10,7 +10,9 @@
<xs:complexType>
<xs:all>
<xs:element name="Name" type="t:string" minOccurs="0"/>
<xs:element name="FOV" type="t:double" minOccurs="0"/>
<xs:element name="FOV" type="t:double" minOccurs="0">
<xs:annotation><xs:documentation>Vertical Field of View in degrees</xs:documentation></xs:annotation>
</xs:element>
<xs:element name="NearClip" type="t:double" minOccurs="0"/>
<xs:element name="FarClip" type="t:double" minOccurs="0"/>
</xs:all>