BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
660 Commits 116 Branches 0 Tags
254caf9e5dcc46dc11df9028b3283a84a932c9e9
Commit Graph

136 Commits

Author SHA1 Message Date
viktorljung 254caf9e5d Picking depthbuffer fix 2016-01-21 16:49:20 +01:00
Jace a6548a72b3 Merge remote-tracking branch 'origin/master' into EditorUsefulness 
# Conflicts:
#	include/Engine/Collision/CollidableOctreeSystem.h
#	include/Engine/Collision/CollisionSystem.h
#	include/Engine/Collision/TriggerSystem.h
#	include/Engine/Rendering/RenderSystem.h
#	include/Game/Systems/PlayerSystem.h
#	resources/Schema/Components/Physics.xsd
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp
#	src/Game/Systems/HealthSystem.cpp
#	src/Game/Systems/PlayerSystem.cpp
#	src/Tests/OctTreeTestGameClass.cpp
 2016-01-21 16:16:35 +01:00
Jace 4aa9100c69 Camera::WorldToScreen helper function 2016-01-21 10:29:36 +01:00
Tleety 5d6d0f82b9 Removed some debug code 2016-01-19 16:48:59 +01:00
Tleety a8ffb24040 latest commit fix 2016-01-19 16:08:09 +01:00
Tleety 893ef38237 Removed world from renderer and moved depth-calculation code to modeljob 2016-01-19 15:41:17 +01:00
Tleety 4cafb2fc4c Merge remote-tracking branch 'origin/master' into Forward+ 2016-01-19 12:33:08 +01:00
Tleety 46e17b7e0d Working directional light 2016-01-19 12:32:34 +01:00
Jace 51979d7f0c Changed System to take World through constructor and store it instead, cause it makes more sense. 2016-01-18 23:59:33 +01:00
Jace 3fc44e944c Editor entity reparenting. 2016-01-18 21:20:20 +01:00
Jace d4242bbead Editor entity create and delete. 2016-01-18 19:26:00 +01:00
Tleety 01a164847c Directional light now fully added to all lists. 2016-01-18 15:15:33 +01:00
Tleety 794635b6a1 Added DirectionalLights to renderqueue jobs 2016-01-18 14:58:19 +01:00
Tleety 6f1fd19ac7 Directional lights now being filled into m_LightSources 2016-01-18 14:30:28 +01:00
Tleety 4092f6b4d4 New Lightstruct working. 2016-01-18 14:20:28 +01:00
Jace 4786986abd Rendering pipeline fixes across the board and base work on refactored editor 2016-01-17 06:29:25 +01:00
Jace e34856468a Removed DrawScenePass, since it doesn't seem to be used 2016-01-17 06:27:45 +01:00
Jace b2213dbe9a Merge remote-tracking branch 'origin/master' into PlayerMovement 
# Conflicts:
#	include/Engine/Collision/Collision.h
#	include/Engine/Collision/CollisionSystem.h
#	include/Engine/Collision/TriggerSystem.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CollisionTestLevel.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Collision/Collision.cpp
#	src/Game/Game.cpp
 2016-01-15 20:28:43 +01:00
stiffly 5c45dbdd10 Merge remote-tracking branch 'origin/master' into Sound 
# Conflicts:
#	resources/Schema/Types/Entity.xsd
 2016-01-15 16:25:32 +01:00
Jace ce8dcd3022 Merge pull request #33 from teamfisk/Forward+ 
Forward+
 2016-01-15 16:20:53 +01:00
Tleety 3de853ac8b Frustum culling now works correctly for all resolutions 2016-01-15 15:38:14 +01:00
William Moberg f5ea4d513c ResourceManager::Load never returns null, throws exceptions instead. 2016-01-15 15:25:01 +01:00
stiffly d9dd7f535f When changing camera listener is updated. Also fixed some crashes in RenderSystem when there were no cameras available. 2016-01-15 13:45:08 +01:00
William Moberg 76f90ab031 The main thread is not mutex blocked while child threads load anymore. 2016-01-15 11:29:46 +01:00
Tleety 14bc850fab Merge remote-tracking branch 'origin/master' into Forward+ 2016-01-15 11:02:27 +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
William Moberg 4cf6dcfc14 Merge branch 'master' into AsyncResourceLoad 
# Conflicts:
#	include/Engine/Rendering/RawModel.h
#	src/Engine/Rendering/RenderQueueFactory.cpp
 2016-01-15 10:10:57 +01:00
Jace 567173c565 Merge branch 'master' into PlayerMovement 
# Conflicts:
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Game/Game.cpp
 2016-01-14 18:24:34 +01:00
Jace 5e721325a4 Merge fixes 2016-01-14 18:20:51 +01:00
Jace 627108c6ee Fixes for #30 
# Conflicts:
#	src/Game/Game.cpp
 2016-01-14 18:15:38 +01:00
William Moberg 71047b08ec Async load works, using exceptions for special resources. 2016-01-14 16:27:45 +01:00
viktorljung c99a8685bb Removed Debug scene 2016-01-14 15:40:13 +01:00
viktorljung 143648860b Added world pointer to PickData 2016-01-14 15:32:41 +01:00
viktorljung 96371a08c8 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
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
William Moberg 9f185a1e35 Wrecked the last commit. Async loading works now. 2016-01-13 18:51:45 +01:00
William Moberg a58cc33ed0 WIP, multithreaded loading based on exceptions, very slow probably. 2016-01-13 10:58:31 +01:00
viktorljung 0f17f9a888 Merge remote-tracking branch 'origin/master' into Rendering 
# Conflicts:
#	include/Engine/Editor/EditorSystem.h
#	include/Engine/Rendering/EPicking.h
#	include/Engine/Rendering/Renderer.h
#	include/Game/Game.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Rendering/RawModel.cpp
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp
 2016-01-12 16:13:20 +01:00
viktorljung 2450769190 some cleanup 2016-01-12 11:51:47 +01:00
viktorljung d469fe6e9a Removed picking event and added a pick function to renderer 2016-01-12 11:45:50 +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 fa6dd2dc67 Basic transparancy working. 2016-01-11 17:57:15 +01:00
Tleety 3c5966d174 Now sort models according to depth. 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
viktorljung 3feee7fd35 Changed the structure of how RenderJobs are handled 2016-01-11 17:01:17 +01:00
Jace 39dd27726d MAJOR BREAKING CHANGE: EntityID 0 is now a valid entity. Use EntityID_Invalid as sentry for checks! 
Also contains inseparable editor changes.
 2016-01-11 14:35:41 +01:00
Jace b908a9f9c6 Revert "Forward+" 2016-01-11 13:48:55 +01:00
viktorljung b8db80bc40 Added camera to PickingPass and fixed memory leak 2016-01-11 10:47:39 +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
viktorljung a7b43b06a2 Camera component and RenderQueue changes 2016-01-08 16:21:59 +01:00