 Michaël Lemaire
|
3b27d3be3e
|
Refactored textures renderer
|
2016-01-10 14:27:32 +01:00 |
|
|
Michaël Lemaire
|
e9fcd6b2a5
|
Fixed int/double old-style casts
|
2015-12-17 01:13:20 +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
|
9d7a7a0ff7
|
Added vegetation impostors to OpenGL renderer
This is currently an unoptimized and broken version, to be improved
|
2015-11-25 23:15:58 +01:00 |
|
|
Michaël Lemaire
|
01992a0019
|
Fixed vegetation definition, due to layers refactoring in master
|
2015-11-20 01:16:48 +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
|
2560fe2c53
|
Fixed holes in vegetation rendering
|
2015-11-02 23:00:02 +01:00 |
|
|
Michaël Lemaire
|
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 |
|
|
Michaël Lemaire
|
cd006e1093
|
Fixed vegetation renderer being randomly enabled
|
2015-10-19 19:14:45 +02:00 |
|
|
Michaël Lemaire
|
48dc1a8f25
|
Refactored vegetation presence
|
2015-10-18 22:15:19 +02:00 |
|
|
Michaël Lemaire
|
cd7f30ecae
|
Add ability to disable vegetation rendering
It is disabled in opengl rendering for now
|
2015-10-18 17:35:42 +02:00 |
|
|
Michaël Lemaire
|
b430f6037e
|
First draft of vegetation layers (WIP)
|
2015-10-18 17:26:19 +02:00 |
|