viktorljung 6fbb962b5e Merge branch 'Rendering' into TextRendering ...

# Conflicts:
#	include/Engine/Rendering/RenderQueue.h
#	include/Engine/Rendering/RenderQueueFactory.h
#	include/Engine/Rendering/Renderer.h
#	include/Engine/Rendering/ShaderProgram.h
#	include/Game/Game.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp

2016-01-15 13:23:42 +01:00

..

Util

Changed Picking colors from vec2 to ivec2. Picking now working for multiple scenes (Solution not perfect in the editor, yet)

2016-01-14 15:26:06 +01:00

BaseTexture.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

Camera.h

Changed Picking colors from vec2 to ivec2. Picking now working for multiple scenes (Solution not perfect in the editor, yet)

2016-01-14 15:26:06 +01:00

DebugCameraInputController.h

Camera Switch event now working, Camera models Rotation still bugged

2015-12-15 15:29:19 +01:00

DrawScenePass.h

Added Transform.h that holds all the AbsoluteTransformation functions. Camera now working better with scenes. Changed Modeljob Matrix to only hold the model matrix instad of all matrix info

2016-01-14 11:12:02 +01:00

DrawScenePassState.h

DrawPass now moved to it's own class to make renderer cleaner.

2015-12-11 14:22:54 +01:00

DummyRenderer.h

Camera component and RenderQueue changes

2016-01-08 16:21:59 +01:00

ESetCamera.h

Camera component and RenderQueue changes

2016-01-08 16:21:59 +01:00

Font.h

Added Font to ResourceManager

2015-12-11 16:53:51 +01:00

FrameBuffer.h

Removed sprite RenderQueue and moved FrameBuffer to rendering instead of rendering/util

2015-12-08 10:37:24 +01:00

Image.h

More CMake bullshit

2015-11-30 11:16:43 +01:00

ImGuiRenderPass.h

Created a RenderState for ImGuiRenderPass

2015-12-14 20:26:04 +01:00

IRenderer.h

Added world pointer to PickData

2016-01-14 15:32:41 +01:00

Model.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

ModelJob.h

Changed Picking colors from vec2 to ivec2. Picking now working for multiple scenes (Solution not perfect in the editor, yet)

2016-01-14 15:26:06 +01:00

PickingPass.h

Changed Picking colors from vec2 to ivec2. Picking now working for multiple scenes (Solution not perfect in the editor, yet)

2016-01-14 15:26:06 +01:00

PickingPassState.h

Fixed a bugg with RenderState.

2015-12-11 16:07:12 +01:00

PNG.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

RawModel.h

Fixed some transparency bugs and started on component based camera

2015-12-14 19:10:00 +01:00

Renderer.h

Merge branch 'Rendering' into TextRendering

2016-01-15 13:23:42 +01:00

RenderJob.h

Changed the structure of how RenderJobs are handled

2016-01-11 17:01:17 +01:00

RenderQueue.h

Merge branch 'Rendering' into TextRendering

2016-01-15 13:23:42 +01:00

RenderState.h

Added BlendEquation and BlendFunc to RenderState, and cleaned it up A LOT

2015-12-14 20:23:29 +01:00

RenderSystem.h

Merge branch 'Rendering' into TextRendering

2016-01-15 13:23:42 +01:00

ShaderProgram.h

ShaderProgram is now a Resource.

2015-12-11 16:53:46 +01:00

Skeleton.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

TextJob.h

Merge branch 'Rendering' into TextRendering

2016-01-15 13:23:42 +01:00

TextRenderer.h

Merge branch 'Rendering' into TextRendering

2016-01-15 13:23:42 +01:00

Texture.h

Added Font to ResourceManager

2015-12-11 16:53:51 +01:00