|
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 |
|
|
ac1b6a909b
|
Extracted RayCastingResult header to speed-up compiling
|
2015-10-16 00:28:07 +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 |
|
|
8fa0d8af29
|
Added DefinitionWatcher system
Also switched to the new definition system for /terrain/water_height
|
2015-08-17 22:55:30 +02:00 |
|
|
f7715b612e
|
Changed some old int-bools to true booleans
|
2014-11-21 09:45:19 +01:00 |
|
|
25d9a95141
|
Water is now always at y=0.0
|
2014-01-06 20:22:00 +01:00 |
|
|
eabe68b77d
|
New terrain walker (now used for ray casting)
|
2013-12-29 14:14:49 +01:00 |
|
|
3271b7ed5e
|
WIP on restoring clouds rendering
|
2013-12-17 23:45:09 +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 |
|