Teejoon 8151e9a9a4 Merge branch 'master' into DDS ...

Conflicts:
	assets
	include/Engine/Core/ResourceManager.h
	include/Engine/Rendering/Image.h
	include/Engine/Rendering/TextureSprite.h
	resources/Schema/Entities/MovementTest.xml
	resources/Shaders/ForwardPlus.frag.glsl
	resources/Shaders/ForwardPlusShieldCheck.frag.glsl
	src/Engine/Rendering/CubeMapPass.cpp
	src/Engine/Rendering/Texture.cpp
	src/Game/Game.cpp

2016-03-14 02:51:45 +01:00

..

Util

Fixed so that we could use DTX5nm as normal map

2016-03-10 19:57:01 +01:00

.gitkeep

Added resource folder for lightweight run-time resources that is also relevant to code, eg. shaders and XML schemas

2015-11-20 16:06:30 +01:00

BasicForward.frag.glsl

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

BasicForward.vert.glsl

Importing custom mesh without material.

2016-01-18 19:37:55 +01:00

CombineGaussianTexture.frag.glsl

Some merge fixes and some sprite fixes.

2016-03-10 15:36:33 +01:00

CombineGaussianTexture.vert.glsl

Blur is now looking like real blur

2016-03-10 13:07:41 +01:00

CombineTexture.frag.glsl

Blur behind buttons/sprites should now be working as intended.

2016-03-08 11:14:09 +01:00

CombineTexture.vert.glsl

WIP

2016-03-07 23:25:06 +01:00

CullLights.comp.glsl

WIP

2016-01-18 17:57:45 +01:00

DrawColorCorrection.frag.glsl

Transparancy with shild fix

2016-03-01 23:14:23 +01:00

DrawColorCorrection.vert.glsl

Bloom effect added, will have to see if it needs improving. Also added HDR colors and gamma correction.

2016-01-21 12:02:28 +01:00

DrawScreenQuad.frag.glsl

Added 3D picking of models to renderer

2015-12-02 18:00:11 +01:00

DrawScreenQuad.vert.glsl

Added 3D picking of models to renderer

2015-12-02 18:00:11 +01:00

ExplosionEffect.frag.glsl

Moved ViewSpacePosition calculation from fragmenst shader to vertexshader

2016-03-13 00:08:49 +01:00

ExplosionEffect.geom.glsl

Moved ViewSpacePosition calculation from fragmenst shader to vertexshader

2016-03-13 00:08:49 +01:00

ExplosionEffect.vert.glsl

Merge

2016-01-19 09:58:52 +01:00

FillDepthBuffer.frag.glsl

Defender shield should now be working

2016-02-08 11:47:35 +01:00

FillDepthBuffer.vert.glsl

WIP

2016-03-08 16:19:56 +01:00

FillDepthBufferSkinned.vert.glsl

WIP

2016-03-08 16:19:56 +01:00

ForwardPlus.frag.glsl

Merge branch 'master' into DDS

2016-03-14 02:51:45 +01:00

ForwardPlus.vert.glsl

Moved ViewSpacePosition calculation from fragmenst shader to vertexshader

2016-03-13 00:08:49 +01:00

ForwardPlusShieldCheck.frag.glsl

Merge branch 'master' into DDS

2016-03-14 02:51:45 +01:00

ForwardPlusSkinned.vert.glsl

Animation optimization

2016-03-13 19:01:30 +01:00

ForwardPlusSplatMap.frag.glsl

Revert "Revert "Shadows""

2016-03-07 19:45:46 +01:00

ForwardPlusSplatMapRGB.frag.glsl

Merge branch 'master' into DDS

2016-03-14 02:51:45 +01:00

ForwardPlusSplatMapRGBShieldCheck.frag.glsl

Merge branch 'master' into DDS

2016-03-14 02:51:45 +01:00

Gaussian_horiz.frag.glsl

WIP, trying to get blur to work with mipmaps

2016-03-10 12:18:06 +01:00

Gaussian_horiz.vert.glsl

Bloom effect added, will have to see if it needs improving. Also added HDR colors and gamma correction.

2016-01-21 12:02:28 +01:00

Gaussian_vert.frag.glsl

WIP, trying to get blur to work with mipmaps

2016-03-10 12:18:06 +01:00

Gaussian_vert.vert.glsl

Bloom effect added, will have to see if it needs improving. Also added HDR colors and gamma correction.

2016-01-21 12:02:28 +01:00

GridFrustum.comp.glsl

Frustum culling now works correctly for all resolutions

2016-01-15 15:38:14 +01:00

Picking.frag.glsl

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

Picking.vert.glsl

Some more optimization and fixed sorting of render job objects in RenderSystem

2016-03-09 16:51:24 +01:00

PickingSkinned.vert.glsl

Animation optimization

2016-03-13 19:01:30 +01:00

Shadow.frag.glsl

Revert "Revert "Shadows""

2016-03-07 19:45:46 +01:00

Shadow.vert.glsl

MSAA is now working

2016-03-12 22:22:53 +01:00

ShadowSkinned.vert.glsl

Animation optimization

2016-03-13 19:01:30 +01:00

ShieldStencil.frag.glsl

Defender shield should now be working

2016-02-08 11:47:35 +01:00

ShieldStencil.vert.glsl

Some state stuff, some draw stuff, some QA map stuff

2016-02-03 18:09:44 +01:00

ShieldStencilSkinned.vert.glsl

Merge fixes

2016-02-10 13:44:47 +01:00

Sprite.frag.glsl

Player HUD should now be ok, color of health still shit tho

2016-03-12 14:37:26 +01:00

Sprite.vert.glsl

WIP

2016-03-08 16:19:56 +01:00

SpriteShieldCheck.frag.glsl

Transparancy with shild fix

2016-03-01 23:14:23 +01:00

SSAO.frag.glsl

You can now change the quality of SSAO by sliding the SSAO Quality

2016-02-26 11:51:20 +01:00

SSAO.vert.glsl

You can now change the quality of SSAO by sliding the SSAO Quality

2016-02-26 11:51:20 +01:00

SSAOViewSpaceZ.frag.glsl

You can now change the quality of SSAO by sliding the SSAO Quality

2016-02-26 11:51:20 +01:00

Text.frag.glsl

Text fixed

2016-01-23 18:17:20 +01:00

Text.vert.glsl

Text renderer up and working, needs more work to be compatible with the ResourceManager and the Entity Component system

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