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

Merge

Browse Source
This commit is contained in:
Tleety
2016-03-11 10:20:13 +01:00
parent ab70aed840
commit cd6967b310
5 changed files with 12282 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets
+1 -1
Submodule assets updated: 85d96f6f3d...0ded5cb084
resources/Schema/Entities/CP_Rocky3.xml
+11934
View File
File diff suppressed because it is too large Load Diff
resources/Schema/Entities/FloatingCrystal.xml
+169
View File
@@ -0,0 +1,169 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<Entity name="Origin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
<Components>
<c:Transform/>
</Components>
<Children>
<Entity name="Anchor1">
<Components>
<c:RaptorCopter>
<Speed>0.30000001192092896</Speed>
<Axis X="0" Y="1" Z="0"/>
</c:RaptorCopter>
<c:FloatingEffect>
<Period>30</Period>
<Time>342.91836260588383</Time>
<Axis X="0" Y="1" Z="0"/>
<Amplitude>3.5</Amplitude>
</c:FloatingEffect>
<c:Transform>
<Position X="0" Y="1.47803104" Z="0"/>
<Orientation X="0" Y="220.263962" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity>
<Components>
<c:Model>
<Resource>Models/Props/CapturePoint/CrystalsLayer1.mesh</Resource>
<Color A="1" B="1" G="0.392156869" R="0"/>
<Shadow>false</Shadow>
</c:Model>
<c:Transform/>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
<Entity name="Anchor2">
<Components>
<c:RaptorCopter>
<Speed>0.5</Speed>
<Axis X="0" Y="1" Z="0"/>
</c:RaptorCopter>
<c:FloatingEffect>
<Period>20</Period>
<Time>448.85134971162591</Time>
<Axis X="0" Y="1" Z="0"/>
<Amplitude>3</Amplitude>
</c:FloatingEffect>
<c:Transform>
<Position X="0" Y="1.05921149" Z="0"/>
<Orientation X="0" Y="360.699402" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity>
<Components>
<c:Model>
<Resource>Models/Props/CapturePoint/CrystalsLayer2.mesh</Resource>
<Color A="1" B="1" G="0.392156869" R="0"/>
<Shadow>false</Shadow>
</c:Model>
<c:Transform/>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
<Entity name="Anchor0">
<Components>
<c:RaptorCopter>
<Speed>0.10000000149011612</Speed>
<Axis X="0" Y="-1" Z="0"/>
</c:RaptorCopter>
<c:FloatingEffect>
<Period>10</Period>
<Time>495.36799589902654</Time>
<Axis X="0" Y="1" Z="0"/>
<Amplitude>0.5</Amplitude>
</c:FloatingEffect>
<c:Transform>
<Position X="-0" Y="-0.11458683" Z="-0"/>
<Orientation X="0" Y="-68.9721527" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity>
<Components>
<c:Model>
<Resource>Models/Props/CapturePoint/CenterCrystal.mesh</Resource>
<Color A="1" B="1" G="0.392156869" R="0"/>
<Shadow>false</Shadow>
</c:Model>
<c:Transform/>
</Components>
<Children/>
</Entity>
<Entity name="LightOrigin1">
<Components>
<c:RaptorCopter>
<Speed>1</Speed>
<Axis X="0.400000006" Y="1" Z="0"/>
</c:RaptorCopter>
<c:Transform>
<Orientation X="16.781414" Y="41.9535484" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity>
<Components>
<c:PointLight>
<Color A="1" B="1" G="0.588235319" R="0"/>
<Radius>4.5</Radius>
<Falloff>0.5</Falloff>
</c:PointLight>
<c:Transform>
<Position X="1.1234858" Y="0.720658064" Z="3.40589333"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity>
<Components>
<c:PointLight>
<Color A="1" B="1" G="0.588235319" R="0"/>
<Radius>4.5</Radius>
<Falloff>0.5</Falloff>
</c:PointLight>
<c:Transform>
<Position X="0.4723185" Y="0" Z="-4.12240839"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity>
<Components>
<c:PointLight>
<Color A="1" B="1" G="0.588235319" R="0"/>
<Radius>4.5</Radius>
<Falloff>0.5</Falloff>
</c:PointLight>
<c:Transform>
<Position X="-2.91954184" Y="1.54033804" Z="-0.0577439293"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity>
<Components>
<c:PointLight>
<Color A="1" B="1" G="0.588235319" R="0"/>
<Radius>4.5</Radius>
<Falloff>0.5</Falloff>
</c:PointLight>
<c:Transform>
<Position X="1.48998797" Y="-3.06706786" Z="-1.78805089"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
</Children>
</Entity>
</Children>
</Entity>
resources/Schema/Entities/FloatingCrystal_Blue.xml
+171
View File
@@ -0,0 +1,171 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<Entity name="Origin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
<Components>
<c:Transform>
<Position X="0" Y="7.3052454" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity name="Anchor0">
<Components>
<c:RaptorCopter>
<Speed>0.20000000298023224</Speed>
<Axis X="0" Y="-1" Z="0"/>
</c:RaptorCopter>
<c:FloatingEffect>
<Period>10</Period>
<Time>1323.7395571102679</Time>
<Axis X="0" Y="1" Z="0"/>
<Amplitude>0.5</Amplitude>
</c:FloatingEffect>
<c:Transform>
<Position X="0" Y="0.355862439" Z="0"/>
<Orientation X="0" Y="-363.932587" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity>
<Components>
<c:Model>
<Resource>Models/Props/CapturePoint/CenterCrystalBlue.mesh</Resource>
<Color A="1" B="0" G="0" R="0"/>
<Shadow>false</Shadow>
</c:Model>
<c:Transform/>
</Components>
<Children/>
</Entity>
<Entity name="LightOrigin1">
<Components>
<c:RaptorCopter>
<Speed>1</Speed>
<Axis X="0.400000006" Y="1" Z="0"/>
</c:RaptorCopter>
<c:Transform>
<Orientation X="348.130463" Y="870.325134" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity>
<Components>
<c:PointLight>
<Color A="1" B="1" G="1" R="0"/>
<Radius>4.5</Radius>
<Falloff>0.5</Falloff>
</c:PointLight>
<c:Transform>
<Position X="1.1234858" Y="0.720658064" Z="3.40589333"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity>
<Components>
<c:PointLight>
<Color A="1" B="1" G="1" R="0"/>
<Radius>4.5</Radius>
<Falloff>0.5</Falloff>
</c:PointLight>
<c:Transform>
<Position X="0.4723185" Y="0" Z="-4.12240839"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity>
<Components>
<c:PointLight>
<Color A="1" B="1" G="1" R="0"/>
<Radius>4.5</Radius>
<Falloff>0.5</Falloff>
</c:PointLight>
<c:Transform>
<Position X="-2.91954184" Y="1.54033804" Z="-0.0577439293"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity>
<Components>
<c:PointLight>
<Color A="1" B="1" G="1" R="0"/>
<Radius>4.5</Radius>
<Falloff>0.5</Falloff>
</c:PointLight>
<c:Transform>
<Position X="1.48998797" Y="-3.06706786" Z="-1.78805089"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
</Children>
</Entity>
<Entity name="Anchor1">
<Components>
<c:RaptorCopter>
<Speed>0.5</Speed>
<Axis X="0" Y="1" Z="0"/>
</c:RaptorCopter>
<c:FloatingEffect>
<Period>30</Period>
<Time>1171.2899238171258</Time>
<Axis X="0" Y="1" Z="0"/>
<Amplitude>3.5</Amplitude>
</c:FloatingEffect>
<c:Transform>
<Position X="0" Y="0.93411696" Z="0"/>
<Orientation X="0" Y="1483.0957" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity>
<Components>
<c:Model>
<Resource>Models/Props/CapturePoint/CrystalsLayer1Blue.mesh</Resource>
<Color A="1" B="0" G="0" R="0"/>
<Shadow>false</Shadow>
</c:Model>
<c:Transform/>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
<Entity name="Anchor2">
<Components>
<c:RaptorCopter>
<Speed>0.5</Speed>
<Axis X="0" Y="1" Z="0"/>
</c:RaptorCopter>
<c:FloatingEffect>
<Period>20</Period>
<Time>1277.2229109228683</Time>
<Axis X="0" Y="1" Z="0"/>
<Amplitude>3</Amplitude>
</c:FloatingEffect>
<c:Transform>
<Position X="-0" Y="-2.29767179" Z="-0"/>
<Orientation X="0" Y="2074.16089" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity>
<Components>
<c:Model>
<Resource>Models/Props/CapturePoint/CrystalsLayer2Blue.mesh</Resource>
<Color A="1" B="0" G="0" R="0"/>
<Shadow>false</Shadow>
</c:Model>
<c:Transform/>
</Components>
<Children/>
</Entity>
</Children>
</Entity>
</Children>
</Entity>
src/Engine/Rendering/BlurHUD.cpp
+7 -5
View File
@@ -227,9 +227,7 @@ void BlurHUD::FillStencil(RenderScene& scene)
m_FillDepthStencilProgram->Bind();
GLuint shaderHandle = m_FillDepthStencilProgram->GetHandle();
glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ViewMatrix()));
glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
glm::mat4 VP = scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix();
for (auto& job : scene.Jobs.SpriteJob) {
auto spriteJob = std::dynamic_pointer_cast<SpriteJob>(job);
@@ -239,7 +237,10 @@ void BlurHUD::FillStencil(RenderScene& scene)
if (!spriteJob->BlurBackground) {
continue;
}
glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(spriteJob->Matrix));
glm::mat4 MVP = VP * spriteJob->Matrix;
glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(MVP));
glBindVertexArray(spriteJob->Model->VAO);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, spriteJob->Model->ElementBuffer);
@@ -255,7 +256,8 @@ void BlurHUD::FillStencil(RenderScene& scene)
if(!spriteJob->BlurBackground) {
continue;
}
glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(spriteJob->Matrix));
glm::mat4 MVP = VP * spriteJob->Matrix;
glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(MVP));
glBindVertexArray(spriteJob->Model->VAO);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, spriteJob->Model->ElementBuffer);