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

resources/Schema/Components.xsd

@@ -9,6 +9,7 @@
 	<xs:include schemaLocation="Components/Camera.xsd"/>
 	<xs:include schemaLocation="Components/AABB.xsd"/>
 	<xs:include schemaLocation="Components/PointLight.xsd"/>
+	<xs:include schemaLocation="Components/DirectionalLight.xsd"/>
 	<xs:include schemaLocation="Components/Trigger.xsd"/>
 	<xs:include schemaLocation="Components/Health.xsd"/>
 	<xs:include schemaLocation="Components/CapturePoint.xsd"/>

resources/Schema/Components/DirectionalLight.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<DirectionalLight xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DirectionalLight.xsd">
+	<Color R="1" G="1" B="1" A="1"/>
+	<Intensity>0.8</Intensity>
+	<Visible>true</Visible>
+</DirectionalLight>

resources/Schema/Components/DirectionalLight.xsd

@@ -0,0 +1,16 @@
+<?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="DirectionalLight">
+		<xs:annotation>
+			<xs:documentation>A directional light that shines bright like the future.</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Color" type="t:Color" minOccurs="0"/>
+				<xs:element name="Intensity" type="t:double" minOccurs="0"/>
+				<xs:element name="Visible" type="t:bool" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Entities/EditorTestWorld.xml

@@ -13,6 +13,7 @@
         </c:Model>
         <c:Transform>
           <Scale X="100" Y="1" Z="100"/>
+          <Orientation X="0" Y="2.59200001" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -45,9 +46,58 @@
     <Entity>
       <Components>
         <c:Camera/>
+        <c:Listener/>
         <c:Transform>
-          <Position X="5.85247707" Y="3.8454349" Z="-1.14486957"/>
-          <Orientation X="2.51327395" Y="1.23916209" Z="-3.1415925"/>
+          <Position X="1.36896265" Y="4.4259491" Z="10.6640663"/>
+          <Orientation X="-0.0349078141" Y="0.157154545" Z="-2.60252193e-07"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:DirectionalLight/>
+        <c:Model>
+          <Resource>Models/DirectionalLightWidget.obj</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="2.1529963" Y="6.59221172" Z="0.169116676"/>
+          <Orientation X="4.32000017" Y="4.6340003" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>Models/Assault.obj</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-2.00568962" Y="0.527161121" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/SecondaryWeapon.fbx</Resource>
+            </c:Model>
+            <c:Transform>
+              <Position X="-0.546139359" Y="0.853016734" Z="0.177482292"/>
+              <Orientation X="1.47266471" Y="0.524984181" Z="1.243698"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitSphere.obj</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="3.70000029" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>

resources/Schema/Types/Entity.xsd

@@ -28,6 +28,7 @@
 							<xs:element ref="c:SpawnPoint" minOccurs="0"/>
 							<xs:element ref="c:PlayerSpawn" minOccurs="0"/>
 							<xs:element ref="c:Team" minOccurs="0"/>
+							<xs:element ref="c:DirectionalLight" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>