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
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
22c391df54
Initial work on texture arrays
2016-02-26 17:40:35 +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
97fcdb342d
Bloom should now show behind transparent objects.
2016-02-19 14:23:40 +01:00
949ee76f55
Fallow and name fix
2016-02-19 13:52:16 +01:00
bf376f54b6
WIP
...
I think this is now finding the different segments of the cascade
2016-02-18 20:48:39 +01:00
178402e964
cascade shadow wip
2016-02-18 10:08:29 +01:00
6bc7131290
Glow Intencity can now be changed in the model component.
2016-02-16 14:57:21 +01:00
36043010af
wip for shadows
...
they work, but will be shit until we get cascaded.
2016-02-10 20:51:33 +01:00
cb77c1ff97
Working pcf, not optimized
2016-02-10 16:16:41 +01:00
69db32337d
Shado wip
2016-02-10 15:16:58 +01:00
6af167675d
Shadow WIP stage 2
...
- fix cel-shading
2016-02-10 11:48:44 +01:00
ecd823cb9f
Shadow WIP stage 2
...
- Soft shadow
2016-02-09 16:15:11 +01:00
847c539373
Fix viewport
2016-02-09 14:44:12 +01:00
cb7f06573f
Shadows stage 2 WIP
2016-02-09 14:08:57 +01:00
43719f8304
Added texture tiling to shaders (exkluding ExplosinEffects)
2016-02-07 15:27:26 +01:00
Jace
bd2da7bc9f
Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""
...
This reverts commit b56824786c
2016-02-03 16:30:00 +01:00
Jace
b56824786c
Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping"
...
This reverts commit 192de8078224aac6a00d
2016-02-03 16:16:06 +01:00
12a181c1ff
Fixed a bug where normals scaled with model scale. Again.
2016-02-02 16:11:03 +01:00
9c2e459e0c
Deatheffect color now correctly calculated
2016-02-02 10:58:00 +01:00
ed7d00c1d8
Bug where widgets did not get their ambient light now fixed.
2016-02-01 18:19:38 +01:00
53cae25eb2
WIP on widget fuckery
2016-02-01 16:56:55 +01:00
7054822be2
SceneLight component now working
2016-02-01 11:12:03 +01:00
97cbc55223
Some debug features for color corrections and glow strength fix.
2016-01-27 17:21:00 +01:00
44302bb0f3
Specular support. Some edits to EditorTestWorld.xml aswell as some debugmodes for textures in the model component
2016-01-27 15:38:54 +01:00
a954cbbf50
Normal map support
2016-01-27 13:52:27 +01:00
Jace
7e12d00874
Merge branch 'master' into CoolDeathAnimation
...
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 10:43:23 +01:00
44baa47bba
Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
...
# Conflicts:
# include/Engine/Common.h
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/DrawScenePass.h
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
2016-01-25 01:21:15 +01:00
ada1bac2a7
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/RenderSystem.cpp
2016-01-24 20:48:17 +01:00
666f1fd878
Removed temp variables & the "forced" animation in DrawFinalPass
2016-01-24 15:30:20 +01:00
fcba0a28b8
Merge branch 'master' into Menu
2016-01-23 18:27:48 +01:00
5edf5a41f1
Transparency bug fix
2016-01-23 16:45:26 +01:00
aacfc47fb5
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
2016-01-23 15:12:19 +01:00
FakeShemp
Tleety
Teejoon
Ayumiwii
Jace
stiffly
viktorljung
antc13