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

36 commits

Author SHA1 Message Date
Michaël Lemaire e884d7a216 Use pragma once instead of include guards 2016-07-13 12:06:33 +02:00
Michaël Lemaire eeeaa70e8b Fixed emphasis in docstrings 2016-01-06 19:55:49 +01:00
Michaël Lemaire c1d6a3261c Removed global string include in system_global.h 2015-12-30 00:43:35 +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 9cece93ec1 Refactored opengl parts 2015-12-11 01:12:55 +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 9196be4c05 Merge branch 'master' into vegetation 
Conflicts:
	src/render/opengl/OpenGLShaderProgram.cpp
	src/render/opengl/OpenGLShaderProgram.h
	src/render/opengl/opengl_global.h
 2015-12-08 01:28:15 +01:00
Michaël Lemaire f242f55f81 Switched OpenGL to core profile 2015-12-07 23:32:55 +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 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 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 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 20c03f84b7 Added an initial loading screen 2015-09-14 19:25:54 +02:00
Michaël Lemaire a96699dece Added mouse tracking on 3d view for future operations 2015-09-07 01:15:59 +02:00
Michaël Lemaire 87acc42041 Experimental scenery generate/save/load from UI 2015-08-19 20:06:47 +02:00
Michaël Lemaire 9a177352ba Fixed OpenGL camera management 2015-08-18 22:47:18 +02:00
Michaël Lemaire 56dae1e38e Don't copy scenery in the renderer 2015-08-18 22:29:18 +02:00
Michaël Lemaire e96fdd9721 Added pause of opengl renderer while rendering picture 2015-08-18 19:12:54 +02:00
Michaël Lemaire 57b90af132 Added progressive camera change to opengl view 2014-09-18 17:38:37 +02:00
Michaël Lemaire d0a5f19cc5 Added daytime control to QtQuick UI 2014-08-28 19:46:06 +02:00
Michaël Lemaire d909ff380f Fixed opengl drawing in qtquick window 2014-08-27 18:19:48 +02:00
Michaël Lemaire ac5c0fd584 Refactored opengl terrain rendering for future use of shaders 2013-12-23 14:09:52 +01:00
Michaël Lemaire 8098482d50 Retrograded to OpenGL 3.0 functions 2013-12-23 10:26:29 +01:00
Michaël Lemaire 666420bbb2 New OpenGLSharedState class to manage shader variables 2013-12-22 15:04:33 +01:00
Michaël Lemaire 3696adc90b Use opengl shaders for water rendering 2013-12-22 00:41:19 +01:00
Michaël Lemaire 65e5a194ba Use QOpenGLFunctions for gl* calls (except legacy code) 2013-12-22 00:10:18 +01:00
Michaël Lemaire 7b790d2015 Switched opengl skybox to shaders 2013-12-21 23:48:54 +01:00
Michaël Lemaire bd29ee97cf Fixed top-down preview and opengl renderer 2013-12-15 15:18:11 +01:00
Michaël Lemaire 1685efcfbe Fixed opengl explorer 2013-12-15 15:06:43 +01:00
Michaël Lemaire dc679500fa Renaming editing -> interface/desktop 2013-11-14 21:46:47 +01:00
Michaël Lemaire cf75e86be6 Extracted opengl "explorer" in render/opengl library 2013-11-05 11:45:26 +01:00