 Michaël Lemaire
|
4347d7f454
|
Removed unused definition members
|
2015-12-31 01:29:59 +01:00 |
|
|
Michaël Lemaire
|
4a710c0977
|
Merge branch 'master' into vegetation
Conflicts:
src/interface/commandline/tests.cpp
src/render/opengl/OpenGLPart.h
src/render/opengl/OpenGLRenderer.cpp
src/render/opengl/OpenGLRenderer.h
src/render/opengl/OpenGLShaderProgram.h
src/render/opengl/OpenGLSharedState.h
src/render/software/SoftwareCanvasRenderer.h
|
2015-12-13 17:16:26 +01:00 |
|
|
Michaël Lemaire
|
7d4989b670
|
using namespace std
|
2015-12-11 00:36:50 +01:00 |
|
|
Michaël Lemaire
|
c5950f810f
|
Merge branch 'master' into vegetation
Conflicts:
src/definition/Scenery.cpp
src/interface/commandline/tests.cpp
|
2015-12-10 19:48:42 +01:00 |
|
|
Michaël Lemaire
|
2d6c0f34c3
|
Using c++ random generators instead of cstdlib one
|
2015-12-10 19:40:39 +01:00 |
|
|
Michaël Lemaire
|
8cf2881a73
|
Merge branch 'master' into vegetation
|
2015-11-20 01:10:06 +01:00 |
|
|
Michaël Lemaire
|
2b65f1d26a
|
Refactored layers system to work better as DefinitionNode
It now features undo/redo of layer creation and removal
|
2015-11-20 01:07:31 +01:00 |
|
|
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
|
48dc1a8f25
|
Refactored vegetation presence
|
2015-10-18 22:15:19 +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
|
fde385a51a
|
Fixed initial textures definition
|
2015-08-19 18:14:15 +02:00 |
|
|
Michaël Lemaire
|
1eef1ef429
|
Start of undo/redo system (added DefinitionDiff)
|
2015-08-16 23:01:56 +02:00 |
|
|
Michaël Lemaire
|
42d3ae4ceb
|
Renamed BaseDefinition to DefinitionNode
|
2015-08-12 22:21:10 +02:00 |
|
|
Michaël Lemaire
|
6f8e0c3cfd
|
Fixed some memory issues
|
2015-08-12 19:29:28 +02:00 |
|
|
Michaël Lemaire
|
26fb112da1
|
Added name to all BaseDefinition and toString representation
Also fixed deletion of children in the definition tree,
to handle dynamic and static destructor calls.
|
2015-08-12 17:02:27 +02:00 |
|
|
Michaël Lemaire
|
efcbeecf3e
|
Added speed factor in camera control
|
2015-07-22 21:30:56 +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
|
88517af86f
|
Removed old C-Api from Color
|
2013-12-11 10:24:35 +01:00 |
|
|
Michaël Lemaire
|
541f1e065f
|
Fixed layer names not being saved/loaded or copied
|
2013-11-17 22:47:27 +01:00 |
|
|
Michaël Lemaire
|
9e6838f733
|
TerrainDefinition and Scenery refactoring
|
2013-11-17 22:36:18 +01:00 |
|
|
Michaël Lemaire
|
fa5c0041af
|
Refactored TexturesDefinition, getting rid of legacy layers
|
2013-11-16 19:12:42 +01:00 |
|