|
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 |
|
|
91cd564c59
|
Added SpaceGridIterator for SpaceSegment
|
2015-10-15 20:01:08 +02:00 |
|
|
b045b731ad
|
Added god rays manager (initial implementation)
|
2015-09-29 22:31:25 +02:00 |
|
|
49564acc3c
|
Fixed build for windows systems
|
2014-03-01 01:34:34 +01:00 |
|
|
f1a13516c9
|
Freeze and disable fluid medium traversal, for master merge of progress
|
2013-11-11 15:42:11 +01:00 |
|