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

144 commits

Author SHA1 Message Date
Michaël Lemaire dd7baf6db5 Merge branch 'master' into vegetation 2015-11-18 19:41:54 +01:00
Michaël Lemaire 6166031c8b Speeded up compile time 
Reworked *_global.h heavy inclusions
 2015-11-18 19:37:00 +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 030be52f6f Merge branch 'master' into vegetation 
Conflicts:
	src/definition/definition.pro
	src/render/software/software.pro
 2015-10-19 17:40:17 +02:00
Michaël Lemaire ca7bd84308 Simplified project files + lazy init of data files 2015-10-19 01:39:22 +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 ac1b6a909b Extracted RayCastingResult header to speed-up compiling 2015-10-16 00:28:07 +02:00
Michaël Lemaire b045b731ad Added god rays manager (initial implementation) 2015-09-29 22:31:25 +02:00
Michaël Lemaire 8a9c3d4b83 Added /atmosphere/sun_radius property 
Also added the tool camera mode to focus on the sun while altering its radius
 2015-09-21 23:12:43 +02:00
Michaël Lemaire ec69975146 Fixed uninitialized texture id in opengl 
This could cause an invalid operation error at texture binding
 2015-09-21 21:01:44 +02:00
Michaël Lemaire 6e45fc4c2f Small performance improvement in opengl drawing 2015-09-15 18:18:24 +02:00
Michaël Lemaire 20c03f84b7 Added an initial loading screen 2015-09-14 19:25:54 +02:00
Michaël Lemaire 2b5b35e3b4 Fixed specular lighting on water not being consistent between opengl and software 2015-09-10 23:41:15 +02:00
Michaël Lemaire 6a45c5dba7 Refactored quality control of terrain rendering 
Terrain scaling factor was removed for quality consistency
 2015-09-10 18:16:57 +02:00
Michaël Lemaire 982af74c2d Added /water/reflection property 2015-09-08 01:00:34 +02:00
Michaël Lemaire 3cb287dfeb Removed dependency to GLU 2015-09-07 01:20:57 +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 0cf8b0fcee Fixed opengl humidity rendering 2015-08-26 00:40:10 +02:00
Michaël Lemaire c450774995 Applied atmosphere humidity to opengl renderer 2015-08-25 23:33:47 +02:00
Michaël Lemaire 98f0708d3e Fixed OpenGL rendering ratio being discarded on camera move 2015-08-25 00:52:33 +02:00
Michaël Lemaire e8d91e30ac Partially worked around atmosphere artifacts using an offset to ground 2015-08-21 01:19:55 +02:00
Michaël Lemaire 28c9c08d74 Added water rendering toggle in opengl 2015-08-21 00:25:34 +02:00
Michaël Lemaire f19433457e More detailed terrain tessellation in opengl renderer 2015-08-20 23:07:09 +02:00
Michaël Lemaire 87acc42041 Experimental scenery generate/save/load from UI 2015-08-19 20:06:47 +02:00
Michaël Lemaire 3599c3aecf Fixed clouds layers being deleted in scenery by opengl renderer 2015-08-19 19:28:36 +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 100ee0eec1 Fixed underwater terrain detection in opengl renderer 2015-08-19 17:22:14 +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 db0be5204f Switched /atmosphere/daytime to new definition system 2015-08-18 20:31:11 +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 8fa0d8af29 Added DefinitionWatcher system 
Also switched to the new definition system for /terrain/water_height
 2015-08-17 22:55:30 +02:00
Michaël Lemaire 46e9e73793 Refactored logging system using iostream 2015-08-13 00:33:16 +02:00
Michaël Lemaire 44c03e46a9 Tweaked opengl terrain tessellation to speed up rendering 2015-08-12 17:26:17 +02:00
Michaël Lemaire fc15f7d9b8 Added ground texture resetting while changing time of day 2015-07-26 18:30:30 +02:00
Michaël Lemaire 261eb5a674 opengl: Replaced temp lighting with sun transmission lighting 2014-11-21 11:40:47 +01:00
Michaël Lemaire f7715b612e Changed some old int-bools to true booleans 2014-11-21 09:45:19 +01: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 a610d69f84 opengl: Fixed artifacts on water reflection 2014-01-21 22:31:17 +01:00
Michaël Lemaire e79692bb5d Refactored noise shader 2014-01-21 21:41:15 +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 33c5d89783 Added skybox reflection to water shader 2014-01-05 22:20:15 +01:00
Michaël Lemaire 49b7055655 [WIP] Use simple normal map for opengl water 2014-01-05 21:52:09 +01:00
Michaël Lemaire c52eeac71d [WIP] Added the simplex sampler to opengl water shader 2014-01-05 20:37:51 +01:00
Michaël Lemaire 98646efb99 Fixed camera reverting in 3d explorer not reverting fov slider 2014-01-04 11:43:40 +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 123e434b0a Small adjustements 2013-12-30 17:22:01 +01:00
Michaël Lemaire 1131972759 Improved the opengl terrain rendering queue 2013-12-30 16:02:33 +01:00
Michaël Lemaire eb795b0f83 Added camera FOV control (and better initial fov) 2013-12-30 14:59:42 +01:00
Michaël Lemaire 220fe89b05 Use the new terrain walker for improved shadows 2013-12-29 18:18:18 +01:00
Michaël Lemaire 938242a7de Optimization for moon lighting 2013-12-26 19:03:19 +01:00
Michaël Lemaire de79f912c3 Moved small things from WidgetExplorer to OpenGLRenderer 2013-12-24 16:36:45 +01:00
Michaël Lemaire 742b93d3d9 Small fixes to opengl rendering 2013-12-24 15:00:32 +01:00
Michaël Lemaire 3d54ce974a Added view distance blending in opengl renderer 2013-12-24 13:22:34 +01:00
Michaël Lemaire 74e707a989 Fixed water color in opengl rendering 2013-12-24 11:48:06 +01:00
Michaël Lemaire bf47e058ee Rendering terrain chunks with new shader system 2013-12-24 11:44:39 +01:00
Michaël Lemaire f97823604e Introduced VertexArray object to handle terrain vertex data 
This will be used later with opengl vertex arrays
 2013-12-23 17:24:05 +01: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 39789aea3f Allow shaders source code to be split in several files (and thus included) 2013-12-22 18:47:24 +01:00
Michaël Lemaire 992089f0ef Added textures to OpenGLSharedState 2013-12-22 18:05:11 +01:00
Michaël Lemaire 645bada91b Added camera to OpenGLSharedState 2013-12-22 17:30:48 +01:00
Michaël Lemaire 666420bbb2 New OpenGLSharedState class to manage shader variables 2013-12-22 15:04:33 +01:00
Michaël Lemaire 994dcb5f44 Add aerial perspective to water shader 2013-12-22 01:17:57 +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 6b5a652d5c Fixed several renderer problems due to scenery sharing 2013-12-15 18:44: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 879f88fd20 Removed old C-api for Vector3 2013-12-11 11:32:10 +01:00
Michaël Lemaire 88517af86f Removed old C-Api from Color 2013-12-11 10:24:35 +01:00
Michaël Lemaire 84608a66a8 Fully removed 'rendering' library 2013-12-11 10:17:36 +01:00
Michaël Lemaire 09c6ce6e58 Fixed explorer and renderer 2013-12-10 23:06:57 +01:00
Michaël Lemaire 2aed1f07ae [Broken WIP] Refactored textures, pictures and cache 2013-12-09 22:16:00 +01:00
Michaël Lemaire ec444b7c26 [Broken WIP] Removed legacy Renderer and refactored RenderArea. 2013-12-09 11:59:57 +01:00
Michaël Lemaire 79080c756f Removed old euclid.h/c 2013-11-20 17:09:55 +01:00
Michaël Lemaire a108682b4d Refactored ColorProfile 2013-11-19 12:51:26 +01:00
Michaël Lemaire 9e6838f733 TerrainDefinition and Scenery refactoring 2013-11-17 22:36:18 +01:00
Michaël Lemaire 5506158363 Fixed camera above ground checking in opengl renderer 2013-11-16 00:39:17 +01:00
Michaël Lemaire dc679500fa Renaming editing -> interface/desktop 2013-11-14 21:46:47 +01:00
Michaël Lemaire c1fd52b0db Ensure camera is above ground and water 2013-11-14 21:05:12 +01:00
Michaël Lemaire 2df3c90ffd Refactored Matrix4 and CameraDefinition 2013-11-14 18:47:03 +01:00
Michaël Lemaire 67105775b6 The default scenery for a SoftwareRenderer is now a default scenery (not the global one) 2013-11-13 23:36:52 +01:00
Michaël Lemaire 5be3231ab9 Refactoring color 2013-11-13 20:07:35 +01:00
Michaël Lemaire d9f2f3878f Big WIP refactoring (preview + atmosphere renderer) 2013-11-12 21:34:35 +01:00
Michaël Lemaire a48213453a Ajout de common.pri 2013-11-09 18:56:56 +01:00
Michaël Lemaire 5c2bc4b31e Refactoring for c++ 2013-11-07 09:37:11 +01:00
Michaël Lemaire cf75e86be6 Extracted opengl "explorer" in render/opengl library 2013-11-05 11:45:26 +01:00