From 1a8784b4be35d6fea575daf9700a6cc05519ec94 Mon Sep 17 00:00:00 2001
From: sippeangelo <holmerg.simon@gmail.com>
Date: Fri, 20 Nov 2015 16:06:30 +0100
Subject: [PATCH] Added resource folder for lightweight run-time resources that
 is also relevant to code, eg. shaders and XML schemas

---
 assets                                    |  2 +-
 resources/Schema/Components.xsd           |  6 +++++
 resources/Schema/Components/Test.xml      |  6 +++++
 resources/Schema/Components/Test.xsd      | 21 +++++++++++++++++
 resources/Schema/Components/Transform.xml |  5 ++++
 resources/Schema/Components/Transform.xsd | 23 +++++++++++++++++++
 resources/Schema/Types.xsd                |  6 +++++
 resources/Schema/Types/Entity.xsd         | 28 +++++++++++++++++++++++
 resources/Schema/Types/Quaternion.xsd     |  9 ++++++++
 resources/Schema/Types/Vector.xsd         |  9 ++++++++
 resources/Shaders/.gitkeep                |  0
 tools/deploy.bat                          | 24 ++++++++++++-------
 12 files changed, 130 insertions(+), 9 deletions(-)
 create mode 100644 resources/Schema/Components.xsd
 create mode 100644 resources/Schema/Components/Test.xml
 create mode 100644 resources/Schema/Components/Test.xsd
 create mode 100644 resources/Schema/Components/Transform.xml
 create mode 100644 resources/Schema/Components/Transform.xsd
 create mode 100644 resources/Schema/Types.xsd
 create mode 100644 resources/Schema/Types/Entity.xsd
 create mode 100644 resources/Schema/Types/Quaternion.xsd
 create mode 100644 resources/Schema/Types/Vector.xsd
 create mode 100644 resources/Shaders/.gitkeep

diff --git a/assets b/assets
index 2aa3725d..6b30aa83 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 2aa3725df7b2795a77d189307691c5c7355a00d2
+Subproject commit 6b30aa83cfe6bc7df6453e17dbb63da91100b7ec
diff --git a/resources/Schema/Components.xsd b/resources/Schema/Components.xsd
new file mode 100644
index 00000000..41564706
--- /dev/null
+++ b/resources/Schema/Components.xsd
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="components" elementFormDefault="qualified">
+	<xs:include schemaLocation="Components/Transform.xsd"/>
+	<xs:include schemaLocation="Components/Test.xsd"/>
+</xs:schema>
\ No newline at end of file
diff --git a/resources/Schema/Components/Test.xml b/resources/Schema/Components/Test.xml
new file mode 100644
index 00000000..ccf459fe
--- /dev/null
+++ b/resources/Schema/Components/Test.xml
@@ -0,0 +1,6 @@
+<c:Test>
+	<Integer>1</Integer>
+	<Float>1.333</Float>
+	<Vector X="1.33333" Y="2.33333" Z="3.33333"/>
+	<Quaternion I="1.33333" J="2.33333" K="3.33333"/>
+</c:Test>
\ No newline at end of file
diff --git a/resources/Schema/Components/Test.xsd b/resources/Schema/Components/Test.xsd
new file mode 100644
index 00000000..edd75790
--- /dev/null
+++ b/resources/Schema/Components/Test.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types" xmlns:meta="../Schema.xsd">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="Test">
+		<xs:annotation>
+			<xs:appinfo>
+				<meta:allocation>8</meta:allocation>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Integer" type="xs:integer" minOccurs="0"/>
+				<xs:element name="Float" type="xs:decimal" minOccurs="0"/>
+				<xs:element name="Vector" type="t:Vector" minOccurs="0"/>
+				<xs:element name="Quaternion" type="t:Quaternion" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/resources/Schema/Components/Transform.xml b/resources/Schema/Components/Transform.xml
new file mode 100644
index 00000000..e093c41a
--- /dev/null
+++ b/resources/Schema/Components/Transform.xml
@@ -0,0 +1,5 @@
+<TransformComponent>
+	<Position X="0" Y="0" Z="0"/>
+	<Orientation I="0" J="0" K="0"/>
+	<Scale X="1" Y="1" Z="1"/>
+</TransformComponent>
\ No newline at end of file
diff --git a/resources/Schema/Components/Transform.xsd b/resources/Schema/Components/Transform.xsd
new file mode 100644
index 00000000..aadac90a
--- /dev/null
+++ b/resources/Schema/Components/Transform.xsd
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types" xmlns:meta="../Schema.xsd">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="Transform">
+		<xs:annotation>
+			<xs:documentation>It's a transform thingy!</xs:documentation>
+			<xs:appinfo>
+				<meta:allocation>8</meta:allocation>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Position" type="t:Vector" minOccurs="0">
+					<xs:annotation><xs:documentation>The position vector</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Orientation" type="t:Quaternion" minOccurs="0"/>
+				<xs:element name="Scale" type="t:Vector" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/resources/Schema/Types.xsd b/resources/Schema/Types.xsd
new file mode 100644
index 00000000..0627f435
--- /dev/null
+++ b/resources/Schema/Types.xsd
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="types" elementFormDefault="qualified">
+	<xs:include schemaLocation="Types/Quaternion.xsd"/>
+	<xs:include schemaLocation="Types/Vector.xsd"/>
+</xs:schema>
\ No newline at end of file
diff --git a/resources/Schema/Types/Entity.xsd b/resources/Schema/Types/Entity.xsd
new file mode 100644
index 00000000..f02cbdb8
--- /dev/null
+++ b/resources/Schema/Types/Entity.xsd
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:c="components">
+	<xs:import schemaLocation="Components.xsd" namespace="components"/>
+
+	<xs:element name="Entity">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Components">
+					<xs:complexType>
+						<xs:all>
+							<xs:element ref="c:Transform" minOccurs="0"/>
+							<xs:element ref="c:Test" minOccurs="0"/>
+						</xs:all>
+					</xs:complexType>
+				</xs:element>
+
+				<xs:element name="Children" minOccurs="0">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element ref="Entity" minOccurs="0" maxOccurs="unbounded"/>
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/resources/Schema/Types/Quaternion.xsd b/resources/Schema/Types/Quaternion.xsd
new file mode 100644
index 00000000..5ea8d92d
--- /dev/null
+++ b/resources/Schema/Types/Quaternion.xsd
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="types" elementFormDefault="qualified">
+	<xs:complexType name="Quaternion">
+		<xs:attribute name="I" type="xs:decimal" default="0.0"/>
+		<xs:attribute name="J" type="xs:decimal" default="0.0"/>
+		<xs:attribute name="K" type="xs:decimal" default="0.0"/>
+	</xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/resources/Schema/Types/Vector.xsd b/resources/Schema/Types/Vector.xsd
new file mode 100644
index 00000000..eac523fb
--- /dev/null
+++ b/resources/Schema/Types/Vector.xsd
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="types" elementFormDefault="qualified">
+	<xs:complexType name="Vector">
+		<xs:attribute name="X" type="xs:decimal" default="0.0"/>
+		<xs:attribute name="Y" type="xs:decimal" default="0.0"/>
+		<xs:attribute name="Z" type="xs:decimal" default="0.0"/>
+	</xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/resources/Shaders/.gitkeep b/resources/Shaders/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/tools/deploy.bat b/tools/deploy.bat
index 2715ad1d..b3f51c07 100755
--- a/tools/deploy.bat
+++ b/tools/deploy.bat
@@ -2,26 +2,34 @@
 
 SET DeployLocation=bin\
 
-ECHO Deploying resources to %DeployLocation%
+ECHO Deploying assets to %DeployLocation%
 :: Asset folders
 RMDIR "%DeployLocation%\Models"
-RMDIR "%DeployLocation%\Textures"
-RMDIR "%DeployLocation%\Sounds"
 MKLINK "%DeployLocation%\Models\" "assets\Models" /J
+RMDIR "%DeployLocation%\Textures"
 MKLINK "%DeployLocation%\Textures\" "assets\Textures\" /J
-MKLINK "%DeployLocation%\Sounds\" "assets\Sounds\" /J
-:: Configuration files
-MKLINK "%DeployLocation%\DefaultConfig.ini" "assets\DefaultConfig.ini" /H
+RMDIR "%DeployLocation%\Audio"
+MKLINK "%DeployLocation%\Audio\" "assets\Audio\" /J
+
+ECHO Deploying resources to %DeployLocation%
+:: Schemas
+RMDIR "%DeployLocation%\Schema"
+MKLINK "%DeployLocation%\Schema\" "resources\Schema" /J
 :: Shaders
 RMDIR /S /Q "%DeployLocation%\Shaders"
 MKDIR "%DeployLocation%\Shaders"
-MKLINK "%DeployLocation%\Shaders\OpenGL\" "src\game\Rendering\OpenGL\Shaders\" /J
-MKLINK "%DeployLocation%\Shaders\DirectX\" "src\game\Rendering\DirectX\Shaders\" /J
+MKLINK "%DeployLocation%\Shaders\" "resources\Shaders" /J
+MKLINK "%DeployLocation%\Shaders\" "resources\Shaders" /J
+:: Configuration files
+MKLINK "%DeployLocation%\DefaultConfig.ini" "resources\DefaultConfig.ini" /H
+
 :: Platform specific binaries
 IF "%~1"=="" GOTO :EOF
 ECHO Deploying %1 binaries to %DeployLocation%
 COPY "deps\bin\%1\x64\*.dll" "%DeployLocation%"
+
 :: Licenses
+::ECHO Copying licenses %DeployLocation%
 ::COPY "libs\assimp-3.1.1\LICENSE" "%ConfigPath%\Assimp License.txt"
 ::COPY "libs\glew-1.11.0\LICENSE.txt" "%ConfigPath%\GLEW License.txt"
 ::COPY "libs\glm-0.9.5.4\copying.txt" "%ConfigPath%\GLM License.txt"