 Michaël Lemaire
|
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 |
|
|
Michaël Lemaire
|
88d2a78b70
|
Enforced coding style using clang-format
|
2015-11-09 22:30:46 +01:00 |
|
|
Michaël Lemaire
|
bdb2a3edb8
|
Merge branch 'master' into vegetation
|
2015-11-08 23:33:09 +01:00 |
|
|
Michaël Lemaire
|
d82fc73531
|
Small optimizations (use reference to avoid object copy)
|
2015-11-08 23:32:52 +01:00 |
|
|
Michaël Lemaire
|
b430f6037e
|
First draft of vegetation layers (WIP)
|
2015-10-18 17:26:19 +02:00 |
|
|
Michaël Lemaire
|
cafa9b4c74
|
Added missing SurfaceMaterial::copy
|
2015-10-15 20:28:05 +02:00 |
|
|
Michaël Lemaire
|
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 |
|
|
Michaël Lemaire
|
a9a6134633
|
Fixed material dialog validation and made material hardness to work
|
2013-12-25 19:45:56 +01:00 |
|
|
Michaël Lemaire
|
5be3231ab9
|
Refactoring color
|
2013-11-13 20:07:35 +01:00 |
|