Commit Graph

429 Commits

Author SHA1 Message Date
viktorljung aa805f9a41 Merge remote-tracking branch 'origin/master' into Picking 2015-12-10 11:38:35 +01:00
Tleety 9d3313e3ed Calculate frustrum removed from code untill Nvidia isn't shit. 2015-12-10 10:46:27 +01:00
sippeangelo 53ef749736 Fixed absoute positioning, I think... 2015-12-10 10:16:03 +01:00
Tleety de6e74c0b1 Forward+ Debugging commit, dont try it. 2015-12-09 17:36:03 +01:00
sippeangelo 90a79c702f Added crude absolute positioning when rendering 2015-12-09 15:26:49 +01:00
Tleety 393a774140 Framework for Forward+ renderer, Buggy. 2015-12-09 14:50:39 +01:00
sippeangelo 58d827f7d0 Moved world definition to Schema/Entities/Test.xml and removed HardcodedTestWorld 2015-12-09 14:25:41 +01:00
sippeangelo c9b140bd6b Semi-working entity loading from XML files! 2015-12-09 12:29:32 +01:00
Tleety eb9c217eb4 3D picking float value error fixed. 2015-12-09 10:44:06 +01:00
viktorljung c717dd7049 Removed sprite RenderQueue and moved FrameBuffer to rendering instead of rendering/util 2015-12-08 10:37:24 +01:00
viktorljung d556f964e6 merge fixes 2015-12-08 10:15:12 +01:00
viktorljung 9e1a4b83ae Linked picking to entities 2015-12-07 17:26:42 +01:00
viktorljung 9c589a0dc6 Added support for color tinting 2015-12-07 16:33:03 +01:00
viktorljung 1df63aecd5 Added a RenderQueueFactory that produces a RenderQueueCollection for the Renderer to use.
Still needs more work
2015-12-07 16:24:34 +01:00
viktorljung 96a10ada38 fixed so the picking works with the new framebuffer class 2015-12-03 19:20:30 +01:00
viktorljung a82c7c1e3b Merge branch 'Rendering' of github.com:teamfisk/TacticalZ into Rendering
# Conflicts:
#	include/Engine/Rendering/Renderer.h
#	src/Engine/Rendering/Renderer.cpp
2015-12-03 19:06:24 +01:00
viktorljung dc8cc92ec2 Added a GenerateTexture function 2015-12-03 19:04:57 +01:00
viktorljung aaa6b6ef20 Added FrameBuffer wrapper class 2015-12-03 18:32:01 +01:00
Tleety 1c06c06816 Added a ScreenCoords class with some util functions to clean up the Renderer class. 2015-12-03 18:14:52 +01:00
viktorljung 983ca485f5 Picking now returning world position 2015-12-03 14:50:14 +01:00
viktorljung 18b63c7ef3 Added 3D picking of models to renderer 2015-12-02 18:00:11 +01:00
viktorljung 1a963e823e Scale, Rotate and Translate widgets up and working 2015-12-01 17:46:09 +01:00
viktorljung 07d037ae57 Added Fly Camera and Vertex Colors 2015-12-01 15:56:26 +01:00
viktorljung 04d10bf7af Functioning basic renderer for models 2015-12-01 14:07:10 +01:00
viktorljung 1fdf312af4 Set up Renderer base and shader compilation 2015-12-01 10:35:59 +01:00
sippeangelo 793b2f44cc Proper GLFW message handling and pinkness! 2015-11-30 17:28:24 +01:00
sippeangelo 872879c013 Engine puzzle completed 2015-11-30 17:02:24 +01:00
sippeangelo 16eb70dd59 Added Model and related classes 2015-11-24 10:55:54 +01:00
sippeangelo 63674946ca Initial directory structure 2015-11-20 15:01:37 +01:00