BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Picking' into RendererDecoupling

Browse Source 
# Conflicts:
#	include/Engine/Rendering/Renderer.h
#	src/Engine/Rendering/Renderer.cpp
This commit is contained in:
Tleety
2015-12-11 11:21:58 +01:00
parent 91edab34bc bb900c5110
commit 8c563a2d76
39 changed files with 1186 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/DefaultConfig.ini
+1
View File
@@ -1,5 +1,6 @@
[Debug]
LogLevel=1
LoadMap=
[Video]
Fullscreen=false
resources/Schema/Components.xsd
+2
View File
@@ -2,5 +2,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="components" elementFormDefault="qualified">
<xs:include schemaLocation="Components/Transform.xsd"/>
<xs:include schemaLocation="Components/Model.xsd"/>
<xs:include schemaLocation="Components/Test.xsd"/>
<xs:include schemaLocation="Components/RaptorCopter.xsd"/>
</xs:schema>
resources/Schema/Components/Model.xml
+5
View File
@@ -0,0 +1,5 @@
<c:Model>
<Resource></Resource>
<Color R="1" G="1" B="1" A="1"/>
<Visible>true</Visible>
</c:Model>
resources/Schema/Components/Model.xsd
+24
View File
@@ -0,0 +1,24 @@
<?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="Model">
<xs:annotation>
<xs:documentation>A visible model loaded from disk</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:all>
<xs:element name="Resource" type="t:string" minOccurs="0">
<xs:annotation><xs:documentation>Model file</xs:documentation></xs:annotation>
</xs:element>
<xs:element name="Color" type="t:Color" minOccurs="0">
<xs:annotation><xs:documentation>Color tint</xs:documentation></xs:annotation>
</xs:element>
<xs:element name="Visible" type="t:bool" minOccurs="0">
<xs:annotation><xs:documentation>Wether the model is visible or not</xs:documentation></xs:annotation>
</xs:element>
</xs:all>
</xs:complexType>
</xs:element>
</xs:schema>
resources/Schema/Components/RaptorCopter.xml
+4
View File
@@ -0,0 +1,4 @@
<c:RaptorCopter>
<Speed>0</Speed>
<Axis X="0" Y="0" Z="0"/>
</c:RaptorCopter>
resources/Schema/Components/RaptorCopter.xsd
+14
View File
@@ -0,0 +1,14 @@
<?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="RaptorCopter">
<xs:complexType>
<xs:all>
<xs:element name="Speed" type="t:double" minOccurs="0"/>
<xs:element name="Axis" type="t:Vector" minOccurs="0"/>
</xs:all>
</xs:complexType>
</xs:element>
</xs:schema>
resources/Schema/Components/Test.xml
+1 -1
View File
@@ -2,5 +2,5 @@
<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"/>
<Quaternion X="1.33333" Y="2.33333" Z="3.33333" W="4.44444"/>
</c:Test>
resources/Schema/Components/Transform.xml
+3 -3
View File
@@ -1,5 +1,5 @@
<TransformComponent>
<c:Transform>
<Position X="0" Y="0" Z="0"/>
<Orientation I="0" J="0" K="0"/>
<Orientation X="0" Y="0" Z="0" W="0"/>
<Scale X="1" Y="1" Z="1"/>
</TransformComponent>
</c:Transform>
resources/Schema/Components/Transform.xsd
+1 -1
View File
@@ -12,7 +12,7 @@
<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="Orientation" type="t:Vector" minOccurs="0"/>
<xs:element name="Scale" type="t:Vector" minOccurs="0"/>
</xs:all>
</xs:complexType>
resources/Schema/Entities/Test.xml
+106 -10
View File
@@ -3,18 +3,114 @@
<Entity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd" xmlns:c="components">
<Components>
<c:Transform>
<Position X="1.02" Y="3.123123" Z="41.123"/>
<Orientation I="1.234" J="1.234" K="1.234"/>
<Scale X="1.02" Y="3.123123" Z="41.123"/>
<Orientation X="0" Y="0" Z="0"/>
</c:Transform>
<c:Test>
<Integer>12</Integer>
<Double>11.11</Double>
<String>Hello World</String>
</c:Test>
<c:Model>
<Resource>Models/DummyScene.obj</Resource>
</c:Model>
</Components>
<Children>
<xi:include href="OtherEntity.xml"/>
<xi:include href="OtherEntity.xml"/>
<Entity>
<Components>
<c:Transform>
<Position X="-1.5"/>
<Scale X="1" Y="1" Z="1"/>
</c:Transform>
<c:Model>
<Resource>Models/ScaleWidget.obj</Resource>
</c:Model>
</Components>
</Entity>
<Entity>
<Components>
<c:Transform>
<Position X="1.5"/>
</c:Transform>
<c:Model>
<Resource>Models/RotationWidget.obj</Resource>
</c:Model>
</Components>
</Entity>
<Entity>
<Components>
<c:Transform>
<Position X="0" Y="-0"/>
<Scale X="1" Y="1" Z="1"/>
</c:Transform>
<!--<c:Move>
<Speed>1</Speed>
<Direction X="-1"/>
<Rotation Y="3.14"/>
</c:Move>-->
</Components>
<Children>
<Entity>
<Components>
<c:Transform>
<Position X="0" Y="0"/>
<Orientation X="0.0" Y="0" Z="0.0"/>
</c:Transform>
<c:Model>
<Resource>Models/Core/UnitRaptor.obj</Resource>
<Color R="1" G="0.4" B="0.8"/>
</c:Model>
</Components>
<Children>
<Entity>
<Components>
<c:Transform>
<Position X="0" Y="0"/>
<Orientation X="0" Y="0" Z="0"/>
</c:Transform>
<c:RaptorCopter>
<Speed>20</Speed>
<Axis Y="1"/>
</c:RaptorCopter>
</Components>
<Children>
<Entity>
<Components>
<c:Transform>
<Position X="0" Y="0.4"/>
<Scale X="0.1" Y="0.4" Z="0.1"/>
</c:Transform>
<c:Model>
<Resource>Models/Core/UnitCylinder.obj</Resource>
<Color R="1" G="0.4" B="0.8"/>
</c:Model>
</Components>
</Entity>
<Entity>
<Components>
<c:Transform>
<Position X="0" Y="0.6"/>
<Scale X="1.7" Y="0.03" Z="0.1"/>
<Orientation X="0" Y="0" Z="0"/>
</c:Transform>
<c:Model>
<Resource>Models/Core/UnitCube.obj</Resource>
<Color R="1" G="0.4" B="0.8"/>
</c:Model>
</Components>
</Entity>
<Entity>
<Components>
<c:Transform>
<Position X="0" Y="0.6"/>
<Scale X="1.7" Y="0.03" Z="0.1"/>
<Orientation X="0" Y="1.57" Z="0"/>
</c:Transform>
<c:Model>
<Resource>Models/Core/UnitCube.obj</Resource>
<Color R="1" G="0.4" B="0.8"/>
</c:Model>
</Components>
</Entity>
</Children>
</Entity>
</Children>
</Entity>
</Children>
</Entity>
</Children>
</Entity>
resources/Schema/Types.xsd
+4
View File
@@ -3,6 +3,10 @@
<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:include schemaLocation="Types/Color.xsd"/>
<xs:simpleType name="bool">
<xs:restriction base="xs:boolean"></xs:restriction>
</xs:simpleType>
<xs:simpleType name="int">
<xs:restriction base="xs:integer"></xs:restriction>
</xs:simpleType>
resources/Schema/Types/Color.xsd
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="types" elementFormDefault="qualified">
<xs:complexType name="Color">
<xs:attribute name="R" type="xs:decimal" default="0.0"/>
<xs:attribute name="G" type="xs:decimal" default="0.0"/>
<xs:attribute name="B" type="xs:decimal" default="0.0"/>
<xs:attribute name="A" type="xs:decimal" default="1.0"/>
</xs:complexType>
</xs:schema>
resources/Schema/Types/Entity.xsd
+3 -1
View File
@@ -7,11 +7,13 @@
<xs:element name="Entity">
<xs:complexType>
<xs:all>
<xs:element name="Components">
<xs:element name="Components" minOccurs="0">
<xs:complexType>
<xs:all>
<xs:element ref="c:Transform" minOccurs="0"/>
<xs:element ref="c:Model" minOccurs="0"/>
<xs:element ref="c:Test" minOccurs="0"/>
<xs:element ref="c:RaptorCopter" minOccurs="0"/>
</xs:all>
</xs:complexType>
</xs:element>