Commit graph

28 commits

Author SHA1 Message Date
dd7baf6db5 Merge branch 'master' into vegetation 2015-11-18 19:41:54 +01:00
6166031c8b Speeded up compile time
Reworked *_global.h heavy inclusions
2015-11-18 19:37:00 +01:00
9a096ec329 Merge branch 'master' into vegetation
Conflicts:
	src/basics/Disk.cpp
	src/basics/Disk.h
	src/basics/SpaceSegment.cpp
	src/definition/DefinitionNode.cpp
	src/definition/DefinitionNode.h
	src/definition/Scenery.cpp
	src/definition/Scenery.h
	src/definition/SurfaceMaterial.cpp
	src/definition/SurfaceMaterial.h
	src/definition/TextureLayerDefinition.cpp
	src/definition/definition_global.h
	src/interface/commandline/tests.cpp
	src/render/opengl/OpenGLRenderer.cpp
	src/render/software/SoftwareCanvasRenderer.cpp
	src/render/software/SoftwareCanvasRenderer.h
	src/render/software/SoftwareRenderer.h
	src/render/software/TerrainRasterizer.cpp
	src/render/software/TerrainRasterizer.h
	src/render/software/TerrainRenderer.h
	src/render/software/software_global.h
2015-11-09 22:38:00 +01:00
88d2a78b70 Enforced coding style using clang-format 2015-11-09 22:30:46 +01:00
68945111d1 Improved vegetation rendering
- Added early check on terrain height range during iteration
- Added test render of vegetation model
- Tweaked basic tree model
2015-11-02 20:14:35 +01:00
48dc1a8f25 Refactored vegetation presence 2015-10-18 22:15:19 +02:00
b430f6037e First draft of vegetation layers (WIP) 2015-10-18 17:26:19 +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
6f2d23d960 Refactored lighting manager 2015-09-25 00:12:31 +02:00
7c7b6043c5 Improved render progress.
A bug was also fixed where some canvas pixels were shaded twice,
leading to a performance loss.
2015-08-23 20:22:37 +02:00
c39ef6adce Restored final picture saving (in constant memory usage) 2014-08-21 12:36:28 +02:00
2aeecdec62 WIP on canvas pixel shading 2014-08-18 12:17:16 +02:00
bc34a2b823 Removed RenderArea and added terrain rasterization to canvas 2014-06-18 22:10:46 +02:00
8099361cc9 WIP on new canvas system 2014-06-10 15:13:16 +02:00
43431aae87 New Canvas software rendering structure (WIP) 2014-06-05 17:12:49 +02:00
eabe68b77d New terrain walker (now used for ray casting) 2013-12-29 14:14:49 +01:00
6589589ad4 Added basic night sky with a plain moon 2013-12-26 15:36:15 +01:00
ec444b7c26 [Broken WIP] Removed legacy Renderer and refactored RenderArea. 2013-12-09 11:59:57 +01:00
74634dfaf1 [Broken WIP] Refactoring terrain, textures and water renderer 2013-12-08 20:54:34 +01:00
fca6f4c96e [WIP] Refactoring lighting 2013-12-08 18:40:16 +01:00
0afeb7707d Refactored TerrainRasterized 2013-12-05 16:44:18 +01:00
9be090b1ff WIP on new clouds renderer 2013-12-04 22:52:18 +01:00
ff27afe675 Refactored cloud renderer (currently not working correctly) 2013-12-01 19:24:53 +01:00
2df3c90ffd Refactored Matrix4 and CameraDefinition 2013-11-14 18:47:03 +01:00
d9f2f3878f Big WIP refactoring (preview + atmosphere renderer) 2013-11-12 21:34:35 +01:00
f1a13516c9 Freeze and disable fluid medium traversal, for master merge of progress 2013-11-11 15:42:11 +01:00
e9751a0e0b WIP on fluid medium traversal 2013-11-09 18:46:34 +01:00