Commit Graph

34 Commits

Author SHA1 Message Date
Ayumiwii 382e00cff4 Randomness fixed
Redundant continue removed
Redundant cross product removed
2016-01-21 15:34:08 +01:00
Ayumiwii 77e1dacb6f Merge 2016-01-19 09:58:52 +01:00
Ayumiwii 37aa1eaa18 Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
# Conflicts:
#	include/Engine/Rendering/DrawScenePass.h
#	include/Engine/Rendering/RenderQueue.h
#	include/Engine/Rendering/RenderQueueFactory.h
#	include/Engine/Rendering/Renderer.h
#	include/Game/Game.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/DrawScenePass.cpp
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp
2016-01-18 16:02:43 +01:00
Ayumiwii 35269315cc Rename the thingie 2016-01-18 13:51:32 +01:00
Ayumiwii 8f8b64f99c First pass that actually work
Not at all done, but it'll have to do for now
2016-01-18 11:50:00 +01:00
Tleety 3de853ac8b Frustum culling now works correctly for all resolutions 2016-01-15 15:38:14 +01:00
Tleety ecf524eb4e Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
#	include/Engine/Rendering/PickingPass.h
#	include/Engine/Rendering/Renderer.h
#	resources/Schema/Entities/Test.xml
#	src/Engine/Rendering/DrawScenePass.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp
2016-01-15 11:01:58 +01:00
viktorljung e7f02f14a0 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
FakeShemp 923589524b Fix the accelaration (possibly)
I haven't tested so I might just have destroyed everything.
2016-01-12 21:25:15 +01:00
Ayumiwii 00eeed2e20 Broken stuff, refactoring 2016-01-12 16:16:42 +01:00
Ayumiwii 0630885d92 Many more things done 2016-01-11 19:59:45 +01:00
Tleety 24ba3ae1f6 WIP, falloff things.
# Conflicts:
#	resources/Schema/Components/PointLight.xsd
#	resources/Shaders/ForwardPlus.frag.glsl
2016-01-11 17:57:15 +01:00
Tleety 0cf8d26557 Revert "Revert "Forward+""
This reverts commit b908a9f9c6.
2016-01-11 17:56:58 +01:00
Jace b908a9f9c6 Revert "Forward+" 2016-01-11 13:48:55 +01:00
Tleety f71bfca142 Fixed cullLights into CullLights 2016-01-11 10:23:22 +01:00
Tleety dbb44fb4e4 Changing cullLights to Culllights, need to do this in 2 commits since Git extensions is fucked. 2016-01-11 10:22:56 +01:00
Ayumiwii 3467315aef Lots of things done 2016-01-08 16:42:59 +01:00
Tleety 069a6756b9 LightcullingPass for forward+ is now separate from Renderer.cpp. 2015-12-18 14:31:16 +01:00
Tleety ab6af30a28 Base classes for decoupled forward+ renderer and a fix where if you had to many lights in a tile(200-300+) the list would fill up before the end of frustums. 2015-12-18 12:02:02 +01:00
viktorljung 6cf7c12d34 Forward+ working 2015-12-18 11:09:54 +01:00
viktorljung 4a817613e3 Forward+ semi working 2015-12-17 17:55:44 +01:00
viktorljung 6a3c14540d fixes 2015-12-17 10:38:13 +01:00
viktorljung 5602b32507 Forward+ Fixes 2015-12-16 13:36:38 +01:00
Tleety 1431bd1a11 DebugChanges 2015-12-15 15:39:23 +01:00
viktorljung fa66e9ff47 Camera Switch event now working, Camera models Rotation still bugged 2015-12-15 15:29:19 +01:00
Tleety 1e370bac13 ForwardPlus base debug commit. 2015-12-15 15:28:37 +01:00
Tleety de6e74c0b1 Forward+ Debugging commit, dont try it. 2015-12-09 17:36:03 +01:00
Tleety 393a774140 Framework for Forward+ renderer, Buggy. 2015-12-09 14:50:39 +01:00
Tleety eb9c217eb4 3D picking float value error fixed. 2015-12-09 10:44:06 +01:00
viktorljung 9c589a0dc6 Added support for color tinting 2015-12-07 16:33:03 +01:00
viktorljung 18b63c7ef3 Added 3D picking of models to renderer 2015-12-02 18:00:11 +01:00
viktorljung 07d037ae57 Added Fly Camera and Vertex Colors 2015-12-01 15:56:26 +01:00
viktorljung 1fdf312af4 Set up Renderer base and shader compilation 2015-12-01 10:35:59 +01:00
sippeangelo 1a8784b4be 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