4e6ff16e58
Shadows for animated models and removed spam in console
2016-03-09 22:43:04 +01:00
e25c9ee690
Merge remote-tracking branch 'origin/master' into Shadows
...
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.vert.glsl
# resources/Shaders/ForwardPlusSkinned.vert.glsl
# src/Engine/Rendering/Renderer.cpp
2016-03-09 19:38:55 +01:00
85e63acda0
removed standarduniforms
2016-03-09 17:36:30 +01:00
fad93ca5aa
Merge remote-tracking branch 'origin/master' into RendererBugFixes
...
Conflicts:
include/Engine/Rendering/DrawFinalPass.h
2016-03-09 16:54:26 +01:00
91cad561a4
Some more optimization and fixed sorting of render job objects in RenderSystem
2016-03-09 16:51:24 +01:00
d51bea798a
Merge remote-tracking branch 'origin/Render_Optimization' into RendererBugFixes
2016-03-08 16:20:23 +01:00
155d700a44
WIP
2016-03-08 16:19:56 +01:00
01f29b6d4e
Blur behind buttons/sprites should now be working as intended.
2016-03-08 11:14:09 +01:00
5c0d9070c7
WIP
2016-03-07 23:25:06 +01:00
e494f6a495
Merge branch 'master' into Shadows
2016-03-07 19:46:04 +01:00
2049d630e9
Revert "Revert "Shadows""
...
This reverts commit 73b8bff1f3
2016-03-07 19:45:46 +01:00
47ece6a5bf
Changed shield component to track Active, so it and sprint glow full if they are active.
...
Changed how reflections are calculated with light.
2016-03-07 14:42:50 +01:00
b38ebbe676
Shadows now working on NVIDIA cards too
2016-03-07 14:00:08 +01:00
315eac1af9
try not to assume things.
2016-03-03 15:10:27 +01:00
4ee52b74bf
Fix broken shader in.
2016-03-03 15:04:10 +01:00
73b8bff1f3
Revert "Shadows"
2016-03-03 14:24:43 +01:00
1deb506fb2
Merge pull request #145 from teamfisk/Shadows
...
Shadows
2016-03-03 14:06:48 +01:00
a0f2f2bf5f
Merge remote-tracking branch 'origin/master' into Shadows
2016-03-03 03:30:01 +01:00
7ea26d10ee
Rewritten. Works as a charm now.
2016-03-03 03:28:21 +01:00
28e9ba1208
Merge branch 'master' into Shadows
...
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/FrameBuffer.cpp
# src/Engine/Rendering/Renderer.cpp
2016-03-03 03:00:05 +01:00
Jace
fb9914d08a
Fixed AMD shader compilation error
2016-03-02 19:48:20 +01:00
ef66f3ebe5
Transparancy with shild fix
2016-03-01 23:14:23 +01:00
e23ea78aeb
Merge remote-tracking branch 'origin/master' into Shadows
...
# Conflicts:
# resources/Shaders/ForwardPlus.frag.glsl
2016-03-01 13:04:11 +01:00
77eaa45702
Merge remote-tracking branch 'origin/master' into HEAD
...
Conflicts:
src/Engine/Rendering/CubeMapPass.cpp
src/Engine/Rendering/DrawFinalPass.cpp
2016-03-01 12:11:27 +01:00
eaea645068
Reflectance should now work as an inverse of the specular alpha value.
2016-03-01 11:19:44 +01:00
21bf7f4df3
Glow should now legit be working through transparency.
2016-03-01 11:03:16 +01:00
0908be1e02
Shadows are pretty much done.
2016-02-29 19:45:56 +01:00
2ed5fad699
The shadows are working
2016-02-29 19:17:16 +01:00
70374fa10e
It compiles, but no shadows
2016-02-29 18:20:32 +01:00
20468cba1b
Merge branch 'master' into Shadows
...
# Conflicts:
# assets
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/FrameBuffer.cpp
# src/Engine/Rendering/Renderer.cpp
2016-02-29 18:03:00 +01:00
7749fc5474
Small fixing up
2016-02-28 19:46:50 +01:00
6dd7f1a657
Buggy transparent shadows.
...
Transparent textures might glow.
2016-02-28 18:00:23 +01:00
14b0a64720
begin fixing transparent object's shadows
2016-02-27 18:42:51 +01:00
8647267cad
Make code less dumb, save 7 fps
2016-02-27 18:04:33 +01:00
ecab5de056
Various shadow calculation methods implemented and ready for use.
2016-02-27 16:35:15 +01:00
38d8cdded2
Texture Array is now working. Enjoy your single Bind().
2016-02-27 15:53:28 +01:00
b1a59e0ed2
Includes now use the key #include. Fixed a bug where it would crash if the file is not found. Fixed a bug where null terminators where included from the included file, causing it to stop reading after the first included file.
2016-02-26 17:46:18 +01:00
22c391df54
Initial work on texture arrays
2016-02-26 17:40:35 +01:00
b3038ef713
Includes are now supported in shader with the key #GLSL
2016-02-26 16:33:55 +01:00
f56705d921
You can now change the quality of SSAO by sliding the SSAO Quality
2016-02-26 11:51:20 +01:00
df2e4abb52
WE HAVE WORKING CASCADE SHADOWS
2016-02-25 21:21:38 +01:00
8867e7ac3c
Working shadows, no cascade blend yet
2016-02-25 20:29:41 +01:00
feeff5b164
Debug tool for different CubeMap
...
changed cubemap influence.
2016-02-24 14:47:47 +01:00
607e83134d
Cubemaps working
2016-02-24 14:16:49 +01:00
6f9ce8a0c1
WIP
2016-02-24 13:57:54 +01:00
8d23c531af
Cubemaps kinda functioning, still somthing wierd with the vectors.
2016-02-23 17:17:50 +01:00
91b0ac5fbd
Some groundwork for cubemaps.
2016-02-23 16:00:43 +01:00
4ffb03fdd5
Merge remote-tracking branch 'origin/master' into SmallFixes-Tobias
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
2016-02-23 10:02:53 +01:00
37414ce124
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SSAO
...
Conflicts:
include/Engine/Rendering/Renderer.h
src/Engine/Rendering/Renderer.cpp
2016-02-22 14:51:42 +01:00
adceccf402
SSAO now working. Changed in DrawFinalePass so that th AOTexture is on texture position 0 and only get binded once.
...
Changed so that the picking pass get drawn once in the beginning so that the AO shatde could calculate AO from the depthbuffer generated during pthe pickingpass.
In the ImGUI debugg window there is now sliders to change the behavior of the AO shader. Only the minimum ambient lightning is HardCoded in to the frowardPlus fragmentshaders with a define in the begining.
2016-02-22 14:48:20 +01:00
viktorljung
FakeShemp
Teejoon
Tleety
Jace