graphics/paysages3d
1
0
Fork 0
Code Releases Activity
844 commits 6 branches 0 tags 71 MiB
Commit graph

29 commits

Author SHA1 Message Date
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 479dcb03ac Added opengl resources deleting at exit (textures, arrays...) 2015-12-10 23:41:42 +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 e346f07c22 Merge branch 'master' into vegetation 
Conflicts:
	src/render/opengl/OpenGLRenderer.cpp
	src/render/opengl/OpenGLRenderer.h
	src/render/opengl/OpenGLShaderProgram.cpp
	src/render/opengl/OpenGLShaderProgram.h
	src/render/opengl/OpenGLSharedState.cpp
 2015-12-04 00:04:07 +01:00
Michaël Lemaire c7e868ef11 Better OpenGL error checking + opengl header refactoring 2015-12-03 23:04:50 +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 b430f6037e First draft of vegetation layers (WIP) 2015-10-18 17:26:19 +02:00
Michaël Lemaire 3fc8b1c98f Added automatic tessellation near camera frustum culling 
This allows the camera nearer the ground
and fixes holes in lower quality renders
 2015-10-08 19:20:44 +02:00
Michaël Lemaire 9b2c60fe16 DefinitionNode.copy now copies children automatically 2015-08-24 01:23:05 +02:00
Michaël Lemaire bbec14d904 Fixed atmosphere saving to file 2015-08-19 22:07:44 +02:00
Michaël Lemaire 87acc42041 Experimental scenery generate/save/load from UI 2015-08-19 20:06:47 +02:00
Michaël Lemaire 1eef1ef429 Start of undo/redo system (added DefinitionDiff) 2015-08-16 23:01:56 +02:00
Michaël Lemaire 6062c755b5 Fixed layers saving/loading 
Global scenery save/load testing was also improved to detect these cases better
 2015-08-13 19:49:16 +02:00
Michaël Lemaire 42d3ae4ceb Renamed BaseDefinition to DefinitionNode 2015-08-12 22:21:10 +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 7d79b6f772 Added scenery save/load testing 2015-08-04 00:00:56 +02:00
Michaël Lemaire 2de920e091 Fixed quick ui camera to stay above ground and water 2015-07-22 18:39:46 +02:00
Michaël Lemaire f7715b612e Changed some old int-bools to true booleans 2014-11-21 09:45:19 +01:00
Michaël Lemaire 25d9a95141 Water is now always at y=0.0 2014-01-06 20:22:00 +01:00
Michaël Lemaire e61dae6f0a Added NoiseState to maintain the noise offsets in clouds 2013-12-31 15:50:28 +01:00
Michaël Lemaire 742b93d3d9 Small fixes to opengl rendering 2013-12-24 15:00:32 +01:00
Michaël Lemaire 806ab74244 Fixed camera definition to avoid going underground in opengl view 2013-12-24 13:30:32 +01:00
Michaël Lemaire 19ac6936b0 Refactored RenderingScenery and STL containers usage 2013-12-10 22:32:58 +01:00
Michaël Lemaire 051766d1d5 Fixed top-down render preview in render form 2013-11-17 23:33:46 +01:00
Michaël Lemaire 9e6838f733 TerrainDefinition and Scenery refactoring 2013-11-17 22:36:18 +01:00