Commit graph

90 commits

Author SHA1 Message Date
bdb2a3edb8 Merge branch 'master' into vegetation 2015-11-08 23:33:09 +01:00
d82fc73531 Small optimizations (use reference to avoid object copy) 2015-11-08 23:32:52 +01:00
030be52f6f Merge branch 'master' into vegetation
Conflicts:
	src/definition/definition.pro
	src/render/software/software.pro
2015-10-19 17:40:17 +02:00
ca7bd84308 Simplified project files + lazy init of data files 2015-10-19 01:39:22 +02:00
cd7f30ecae Add ability to disable vegetation rendering
It is disabled in opengl rendering for now
2015-10-18 17:35:42 +02:00
ac1b6a909b Extracted RayCastingResult header to speed-up compiling 2015-10-16 00:28:07 +02:00
b045b731ad Added god rays manager (initial implementation) 2015-09-29 22:31:25 +02:00
8a9c3d4b83 Added /atmosphere/sun_radius property
Also added the tool camera mode to focus on the sun while altering its radius
2015-09-21 23:12:43 +02:00
ec69975146 Fixed uninitialized texture id in opengl
This could cause an invalid operation error at texture binding
2015-09-21 21:01:44 +02:00
6e45fc4c2f Small performance improvement in opengl drawing 2015-09-15 18:18:24 +02:00
20c03f84b7 Added an initial loading screen 2015-09-14 19:25:54 +02:00
2b5b35e3b4 Fixed specular lighting on water not being consistent between opengl and software 2015-09-10 23:41:15 +02:00
6a45c5dba7 Refactored quality control of terrain rendering
Terrain scaling factor was removed for quality consistency
2015-09-10 18:16:57 +02:00
982af74c2d Added /water/reflection property 2015-09-08 01:00:34 +02:00
3cb287dfeb Removed dependency to GLU 2015-09-07 01:20:57 +02:00
a96699dece Added mouse tracking on 3d view for future operations 2015-09-07 01:15:59 +02:00
0cf8b0fcee Fixed opengl humidity rendering 2015-08-26 00:40:10 +02:00
c450774995 Applied atmosphere humidity to opengl renderer 2015-08-25 23:33:47 +02:00
98f0708d3e Fixed OpenGL rendering ratio being discarded on camera move 2015-08-25 00:52:33 +02:00
e8d91e30ac Partially worked around atmosphere artifacts using an offset to ground 2015-08-21 01:19:55 +02:00
28c9c08d74 Added water rendering toggle in opengl 2015-08-21 00:25:34 +02:00
f19433457e More detailed terrain tessellation in opengl renderer 2015-08-20 23:07:09 +02:00
87acc42041 Experimental scenery generate/save/load from UI 2015-08-19 20:06:47 +02:00
3599c3aecf Fixed clouds layers being deleted in scenery by opengl renderer 2015-08-19 19:28:36 +02:00
0058a0a8e3 Switched to RGB material colors
...to avoid otherwise unused HSL conversion, which causes problems
for some RGB values (like Color(1, 0, 0))
2015-08-19 19:14:59 +02:00
100ee0eec1 Fixed underwater terrain detection in opengl renderer 2015-08-19 17:22:14 +02:00
9a177352ba Fixed OpenGL camera management 2015-08-18 22:47:18 +02:00
56dae1e38e Don't copy scenery in the renderer 2015-08-18 22:29:18 +02:00
db0be5204f Switched /atmosphere/daytime to new definition system 2015-08-18 20:31:11 +02:00
e96fdd9721 Added pause of opengl renderer while rendering picture 2015-08-18 19:12:54 +02:00
8fa0d8af29 Added DefinitionWatcher system
Also switched to the new definition system for /terrain/water_height
2015-08-17 22:55:30 +02:00
46e9e73793 Refactored logging system using iostream 2015-08-13 00:33:16 +02:00
44c03e46a9 Tweaked opengl terrain tessellation to speed up rendering 2015-08-12 17:26:17 +02:00
fc15f7d9b8 Added ground texture resetting while changing time of day 2015-07-26 18:30:30 +02:00
261eb5a674 opengl: Replaced temp lighting with sun transmission lighting 2014-11-21 11:40:47 +01:00
f7715b612e Changed some old int-bools to true booleans 2014-11-21 09:45:19 +01:00
57b90af132 Added progressive camera change to opengl view 2014-09-18 17:38:37 +02:00
d0a5f19cc5 Added daytime control to QtQuick UI 2014-08-28 19:46:06 +02:00
d909ff380f Fixed opengl drawing in qtquick window 2014-08-27 18:19:48 +02:00
a610d69f84 opengl: Fixed artifacts on water reflection 2014-01-21 22:31:17 +01:00
e79692bb5d Refactored noise shader 2014-01-21 21:41:15 +01:00
25d9a95141 Water is now always at y=0.0 2014-01-06 20:22:00 +01:00
33c5d89783 Added skybox reflection to water shader 2014-01-05 22:20:15 +01:00
49b7055655 [WIP] Use simple normal map for opengl water 2014-01-05 21:52:09 +01:00
c52eeac71d [WIP] Added the simplex sampler to opengl water shader 2014-01-05 20:37:51 +01:00
98646efb99 Fixed camera reverting in 3d explorer not reverting fov slider 2014-01-04 11:43:40 +01:00
e61dae6f0a Added NoiseState to maintain the noise offsets in clouds 2013-12-31 15:50:28 +01:00
123e434b0a Small adjustements 2013-12-30 17:22:01 +01:00
1131972759 Improved the opengl terrain rendering queue 2013-12-30 16:02:33 +01:00
eb795b0f83 Added camera FOV control (and better initial fov) 2013-12-30 14:59:42 +01:00