Merge remote-tracking branch 'origin/master' into CapturePointTake

# Conflicts: # src/Game/Game.cpp # src/Tests/ResourceManagerTest.cpp
2016-01-15 11:24:20 +01:00
parent c8fe6853c0 627108c6ee
commit 8f257b9a58
45 changed files with 822 additions and 779 deletions
@@ -0,0 +1,6 @@
+<c:Camera>
+	<Name>cam</Name>
+	<FOV>60.0</FOV>
+	<NearClip>0.01</NearClip>
+	<FarClip>5000</FarClip>
+</c:Camera>
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="Camera">
+		<xs:annotation>
+			<xs:documentation>It's a camera thingy!</xs:documentation>
+		</xs:annotation>
+		<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="NearClip" type="t:double" minOccurs="0"/>
+				<xs:element name="FarClip" type="t:double" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>