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

latest commit fix

Browse Source
This commit is contained in:
Tleety
2016-01-19 16:08:09 +01:00
parent 893ef38237
commit a8ffb24040
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Rendering/ModelJob.h
+1
View File
@@ -12,6 +12,7 @@
#include "../Core/ResourceManager.h" #include "../Core/ResourceManager.h"
#include "Camera.h" #include "Camera.h"
#include "../Core/World.h" #include "../Core/World.h"
#include "../Core/Transform.h"
struct ModelJob : RenderJob struct ModelJob : RenderJob
{ {
resources/Schema/Entities/EditorTestWorld.xml
+5 -5
View File
@@ -48,8 +48,8 @@
<c:Camera/> <c:Camera/>
<c:Listener/> <c:Listener/>
<c:Transform> <c:Transform>
<Position X="-3.7727046" Y="4.42466021" Z="5.32631207"/> <Position X="1.36896265" Y="4.4259491" Z="10.6640663"/>
<Orientation X="-0.174533114" Y="-0.62824142" Z="-6.35425181e-07"/> <Orientation X="-0.0349078104" Y="0.157154545" Z="-2.60020244e-07"/>
</c:Transform> </c:Transform>
</Components> </Components>
<Children/> <Children/>
@@ -61,8 +61,8 @@
<Resource>Models/DirectionalLightWidget.obj</Resource> <Resource>Models/DirectionalLightWidget.obj</Resource>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
<Position X="0" Y="1.37382936" Z="0"/> <Position X="2.1529963" Y="6.59221172" Z="0.169116676"/>
<Orientation X="1.4920001" Y="1.96300006" Z="0"/> <Orientation X="4.32000017" Y="4.6340003" Z="0"/>
</c:Transform> </c:Transform>
</Components> </Components>
<Children/> <Children/>
@@ -83,7 +83,7 @@
<Resource>Models/SecondaryWeapon4.fbx</Resource> <Resource>Models/SecondaryWeapon4.fbx</Resource>
</c:Model> </c:Model>
<c:Transform> <c:Transform>
<Position X="-0.545270562" Y="0.859505534" Z="0.188573226"/> <Position X="-0.546139359" Y="0.853016734" Z="0.177482292"/>
<Orientation X="1.47266471" Y="0.524984181" Z="1.243698"/> <Orientation X="1.47266471" Y="0.524984181" Z="1.243698"/>
</c:Transform> </c:Transform>
</Components> </Components>
src/Engine/Rendering/Renderer.cpp
+2 -2
View File
@@ -147,10 +147,10 @@ void Renderer::InitializeTextures()
} }
void Renderer::SortRenderJobsByDepth(RenderScene *scene) void Renderer::SortRenderJobsByDepth(RenderScene &scene)
{ {
//Sort all forward jobs so transparency is good. //Sort all forward jobs so transparency is good.
scene->ForwardJobs.sort(Renderer::DepthSort); scene.ForwardJobs.sort(Renderer::DepthSort);
} }
void Renderer::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) void Renderer::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type)
src/Game/Game.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ Game::Game(int argc, char* argv[])
// Create the renderer // Create the renderer
m_Renderer = new Renderer(m_EventBroker, m_World); m_Renderer = new Renderer(m_EventBroker);
m_Renderer->SetFullscreen(m_Config->Get<bool>("Video.Fullscreen", false)); m_Renderer->SetFullscreen(m_Config->Get<bool>("Video.Fullscreen", false));
m_Renderer->SetVSYNC(m_Config->Get<bool>("Video.VSYNC", false)); m_Renderer->SetVSYNC(m_Config->Get<bool>("Video.VSYNC", false));
m_Renderer->SetResolution(Rectangle::Rectangle( m_Renderer->SetResolution(Rectangle::Rectangle(