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

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

Browse Source 
# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	include/Engine/Rendering/RenderQueue.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/QualityAssurance.xml
#	resources/Schema/Entities/RenderingWorld.xml
#	resources/Shaders/Sprite.vert.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/Model.cpp
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp
This commit is contained in:
Tleety
2016-02-10 19:52:42 +01:00
parent 53265bbc90 019e85a425
commit 2cae4e3fb2
134 changed files with 6897 additions and 1540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/RenderingWorld.xml
+20 -5
View File
@@ -20,7 +20,7 @@
<Entity name="Model">
<Components>
<c:Model>
<Resource>Models/Assault.obj</Resource>
<Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
<Color A="1" B="3.92156863" G="3.92156863" R="3.92156863"/>
</c:Model>
<c:Transform>
@@ -35,7 +35,7 @@
<FOV>80</FOV>
</c:Camera>
<c:Model>
<Resource>Models/Camera.mesh</Resource>
<Resource>Models/Widgets/Camera.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="0" Y="1.39121652" Z="-0.043014247"/>
@@ -60,6 +60,7 @@
<c:Model>
<Resource>Models/Core/UnitHexagon.mesh</Resource>
<Color A="0.313725501" B="0.70588237" G="0.70588237" R="0.70588237"/>
<Transparent>true</Transparent>
</c:Model>
<c:Transform>
<Position X="-0.285538822" Y="-0.282350302" Z="-1.52214652e-05"/>
@@ -132,7 +133,7 @@
<Entity>
<Components>
<c:Model>
<Resource>Models/Assault.mesh</Resource>
<Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
<Color A="1" B="3.92156863" G="1" R="1"/>
</c:Model>
<c:Transform>
@@ -308,7 +309,7 @@
<Entity>
<Components>
<c:Model>
<Resource>Models/Assault.mesh</Resource>
<Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
<Color A="1" B="1" G="1" R="3.92156863"/>
</c:Model>
<c:Transform>
@@ -324,7 +325,7 @@
<Intensity>0.10000000149011612</Intensity>
</c:DirectionalLight>
<c:Model>
<Resource>Models/DirectionalLightWidget.mesh</Resource>
<Resource>Models/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
<Color A="1" B="0" G="3.92156863" R="3.92156863"/>
</c:Model>
<c:Transform>
@@ -358,6 +359,20 @@
</Components>
<Children/>
</Entity>
<Entity>
<Components>
<c:Animation>
<AnimationName>Run</AnimationName>
<Time>0.021910293579680166</Time>
<Speed>0.004999999888241291</Speed>
</c:Animation>
<c:Model>
<Resource>Models/SuperTest.mesh</Resource>
</c:Model>
<c:Transform/>
</Components>
<Children/>
</Entity>
</Children>
</Entity>